track客户管理

src/main/java/security/interceptor/AuthorizationInterceptor.java

@@ -39,7 +39,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
 
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         //放开登录
-        /*if (request.getRequestURL().indexOf("login/login") != -1){
+        if (request.getRequestURL().indexOf("login/login") != -1){
             return true;
         }
         //从header中得到token
@@ -61,8 +61,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
             }
             return true;
         }
-        return false;*/
-        return true;
+        return false;
     }
 
     private String getCookieToken(Cookie[] cookies, String name){

src/main/java/track/controller/TrackAccountController.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
 import tkio.service.TkioAccountService;
+import track.service.TrackAccountService;
 import util.ResultModel;
 
 /**
@@ -19,7 +20,7 @@ import util.ResultModel;
 public class TrackAccountController {
 
     @Autowired
-    TkioAccountService tkioAccountService;
+    TrackAccountService tkioAccountService;
 
     //客户列表
     @RequestMapping(value = "/findAll", method = RequestMethod.GET)
@@ -68,14 +69,6 @@ public class TrackAccountController {
         return ResultModel.OK(tkioAccountService.findFunTimes(accountId,startDate,endDate));
     }
 
-    //功能使用查询
-    @RequestMapping(value = "/find/pv/{accountId}", method = RequestMethod.GET)
-    @ResponseBody
-    public ResultModel pv(@CurrentAccount User loginAccount, @RequestParam String startDate,
-                                  @RequestParam String endDate,  @PathVariable Long accountId) {
-
-        return ResultModel.OK(tkioAccountService.findPv(accountId,startDate,endDate));
-    }
 
     //到期提醒查询
     @RequestMapping(value = "/find/reminder/{accountId}", method = RequestMethod.GET)

src/main/java/track/service/impl/TrackAccountServiceImpl.java

@@ -132,6 +132,7 @@ public class TrackAccountServiceImpl implements TrackAccountService{
         Map<String, Integer> result = new HashMap<>();
         List<Account> accountList = accountRepository.findByParent(account);
         List<Long> idList = new ArrayList<>();
+        idList.add(account);
         for(Account ac : accountList){
             idList.add(ac.getId());
         }

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -2,6 +2,7 @@ common\model\BackVisit.class
 security\TokenManager.class
 tkio\controller\TkioAccountController.class
 tkio\model\UserLog.class
+track\controller\TrackAccountController.class
 dmp\model\TagCrawlerAppsWandoujia.class
 util\ValidateUtil.class
 tkio\repository\CampaignRepository.class
@@ -9,16 +10,19 @@ util\HttpClientUtil.class
 common\model\Auth.class
 tkio\repository\AccountRepository.class
 common\model\Menu.class
+track\repository\TrackAppRepository.class
 exception\GlobalExceptionAdvice.class
 tkio\model\Campaign.class
 security\RedisTokenManager.class
 tkio\model\Account.class
 security\AbstractTokenManager.class
+track\repository\TrackAccountRepository.class
 common\model\UserLog.class
 security\exception\MethodNotSupportException.class
 tkio\repository\SalesManLeaderRepository.class
 tkio\model\RoleAuth.class
 common\service\impl\AppServiceImpl$1.class
+track\model\Account.class
 common\controller\UserController.class
 exception\TipException.class
 common\context\AppUtils.class
@@ -26,6 +30,7 @@ util\RedisUtilNew.class
 tkio\task\SyncAppDataTask.class
 common\model\User.class
 tkio\repository\IsNotifiedRepository.class
+track\repository\TrackChannelRepository.class
 tkio\service\impl\TkioAccountServiceImpl.class
 util\DateUtil.class
 common\model\AppCategory.class
@@ -49,8 +54,11 @@ common\model\City.class
 common\service\impl\AppServiceImpl.class
 common\repository\ReminderRepository.class
 util\StringUtil.class
+track\model\Channel.class
+track\model\Campaign.class
 security\interceptor\AuthorizationInterceptor.class
 security\annotation\CurrentAccount.class
+track\model\App.class
 common\model\AppInfo.class
 common\service\impl\UserServiceImpl.class
 util\IP.class
@@ -59,6 +67,7 @@ tkio\model\RoleAuthDetail.class
 util\CharacterUtils.class
 tkio\repository\PackageTypeRepository.class
 util\Constant.class
+common\repository\TrackAccount4WebRepository.class
 common\repository\BackVisitRepository.class
 common\repository\RoleTypeRepository.class
 tkio\service\AccountFlowRestrictService.class
@@ -66,6 +75,7 @@ util\UserLogThread.class
 tkio\model\DataAuth.class
 common\model\KeyValue.class
 common\repository\UserRepository.class
+track\repository\TrackCampaignRepository.class
 util\ResultModel.class
 dic\RoleEnum.class
 util\CipherUtil.class
@@ -73,6 +83,7 @@ common\controller\UserLogController.class
 tkio\model\App.class
 security\resolvers\LoginUserMethodArgumentsResolver.class
 tkio\service\TkioAccountService.class
+common\model\TrackAccount4Web.class
 common\model\RoleType.class
 tkio\task\AccountTask.class
 security\annotation\Authorization.class
@@ -84,10 +95,12 @@ common\service\MenuService.class
 common\repository\AppCategoryRepository.class
 tkio\repository\AppRepository.class
 common\service\impl\UserLogServiceImpl.class
+track\service\impl\TrackAccountServiceImpl.class
 dmp\repository\TagCrawlerAppsWandoujiaRepository.class
 security\RedisLoginStatusManagerImpl.class
 tkio\model\AccountRestrict4Web.class
 dic\OperateObjectTypeEnum.class
+track\service\TrackAccountService.class
 common\service\UserService.class
 common\service\AppService.class
 common\service\UserLogService.class
@@ -102,4 +115,5 @@ common\model\Email.class
 security\cors\CorsFilter.class
 util\ResultStatus.class
 tkio\model\IsNotified.class
+track\task\AccountTask.class
 tkio\model\Auth.class