修改了token获取userId

tall/src/main/java/com/ccsens/tall/service/ExcelService.java

@@ -717,7 +717,7 @@ public class ExcelService implements IExcelService {
                     taskDeliver.setIsFinal(0);
                     taskDeliverService.saveDeliver(taskDeliver);
                 }
-                //设备挂载暂不处理
+                //TODO 设备挂载暂不处理
 
                 //没有开始时间默认项目开始时间
                 if (StrUtil.isNotEmpty(beginTime)) {

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -931,27 +931,27 @@ public class ProTaskDetailService implements IProTaskDetailService {
                         taskDetail.setDelayTime(updateTaskInfo.getDelayTime());
                     }
                     //时间
-//                    if(ObjectUtil.isNotNull(updateTaskInfo.getBeginTime())
-//                            && ObjectUtil.isNotNull(updateTaskInfo.getEndTime())
-//                            && updateTaskInfo.getBeginTime() >= updateTaskInfo.getEndTime()){
-//                        throw new BaseException(CodeEnum.TIME_ERROR_BEGIN);
-//                    }
                     boolean isUpdateTime = false;
-                    if(ObjectUtil.isNotNull(updateTaskInfo.getBeginTime())){
-                        taskDetail.setBeginTime(updateTaskInfo.getBeginTime());
-                        isUpdateTime = true;
-                    }
-                    if(ObjectUtil.isNotNull(updateTaskInfo.getEndTime())){
-                        taskDetail.setEndTime(updateTaskInfo.getEndTime());
-                        isUpdateTime = true;
-                    }
-                    if(StrUtil.isNotEmpty(updateTaskInfo.getCycle())){
-                        taskDetail.setCycle(updateTaskInfo.getCycle());
-                        isUpdateTime = true;
-                    }
-                    //时间赋完值后，检查开始时间是否小于结束时间。（赋值前判断太麻烦）
-
+                    //一级任务没有时间，不能修改
+                    if(taskDetail.getLevel() != 1 && taskDetail.getLevel() != 0) {
+                        if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime())) {
+                            taskDetail.setBeginTime(updateTaskInfo.getBeginTime());
+                            isUpdateTime = true;
+                        }
+                        if (ObjectUtil.isNotNull(updateTaskInfo.getEndTime())) {
+                            taskDetail.setEndTime(updateTaskInfo.getEndTime());
+                            isUpdateTime = true;
+                        }
+                        if (StrUtil.isNotEmpty(updateTaskInfo.getCycle())) {
+                            taskDetail.setCycle(updateTaskInfo.getCycle());
+                            isUpdateTime = true;
+                        }
 
+                        //时间赋完值后，检查开始时间是否小于结束时间。（赋值前判断太麻烦）
+                        if (taskDetail.getBeginTime() >= taskDetail.getEndTime()){
+                            throw new BaseException(CodeEnum.TIME_ERROR_BEGIN);
+                        }
+                    }
                     //若时间相关被修改，删掉旧的subTime，根据新时间重新生成
                     if(isUpdateTime){
                         //删掉旧的subTime
@@ -974,6 +974,28 @@ public class ProTaskDetailService implements IProTaskDetailService {
         }
         return normalTask;
     }
+//    private void changeTime(ProTaskDetail taskDetail,Long beginTime,Long endTime,SysProject project){
+//        if(beginTime >= project.getBeginTime() || endTime <= project.getEndTime()){
+//            throw new BaseException(CodeEnum.TIME_ERROR_PROJECT);
+//        }
+//        if(taskDetail.getLevel() == 2){
+//            ProTaskDetailExample detailExample = new ProTaskDetailExample();
+//            detailExample.createCriteria().andParentIdEqualTo(taskDetail.getId());
+//            List<ProTaskDetail> detailList = taskDetailDao.selectByExample(detailExample);
+//            if(CollectionUtil.isNotEmpty(detailList)){
+//
+//            }else {
+//                if (ObjectUtil.isNotNull(beginTime)) {
+//                    taskDetail.setBeginTime(beginTime);
+//                }
+//                if (ObjectUtil.isNotNull(endTime)) {
+//                    taskDetail.setEndTime(endTime);
+//                }
+//            }
+//        }else if(taskDetail.getLevel() == 3){
+//
+//        }
+//    }
     private void partTaskSubTime(ProTaskDetail taskDetail){
         //cycle为空或者组任务，只加一条数据
         if (StrUtil.isEmpty(taskDetail.getCycle()) || taskDetail.getHasGroup() == 1) {

tall/src/main/java/com/ccsens/tall/web/UserController.java

@@ -230,7 +230,7 @@ public class UserController {
         // 验证token是否存在
         String tokenStr = token;
         if (tokenStr == null || !tokenStr.startsWith(WebConstant.HEADER_KEY_TOKEN_PREFIX)) {
-            throw new BaseException(CodeEnum.NOT_LOGIN);
+            return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
         }
         String userToken = tokenStr.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());
 
@@ -239,16 +239,16 @@ public class UserController {
         try {
             claims = JwtUtil.parseJWT(userToken, WebConstant.JWT_ACCESS_TOKEN_SECERT);
         }catch(Exception e){
-            throw new BaseException(CodeEnum.NOT_LOGIN);
+            return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
         }
         //验证用户存根
         if(userService.tokenNotExistInCache(Long.valueOf(claims.getSubject()))){
-            throw new BaseException(CodeEnum.NOT_LOGIN);
+            return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
         }
         //验证用户是否禁用
         SysUser user = userService.getUserById(Long.valueOf(claims.getSubject()));
         if(user.getRecStatus() == WebConstant.REC_STATUS.Disabled.value){
-            throw new BaseException(CodeEnum.NOT_LOGIN);
+            return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
         }
 
         tokenToUserId.setId(Long.valueOf(claims.getSubject()));

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -64,7 +64,8 @@ public enum CodeEnum {
     POSITION_NOT_3(50, "对不起，您尚未选择职务，请重新选择。", true),
 
     REPEAT_PROJECT_NAME(51,"项目名不能重复，请修改后重试",true),
-    TIME_ERROR_BEGIN(52,"时间异常，开始时间不能大于结束时间",true)
+    TIME_ERROR_BEGIN(52,"时间异常，开始时间不能大于结束时间",true),
+    TIME_ERROR_PROJECT(53,"时间异常，时间不在项目范围内",true)
     ;
 
     public CodeEnum addMsg(String msg){