bug 修复

src/main/java/com/fdkankan/fusion/entity/CaseEntity.java

@@ -59,6 +59,4 @@ public class CaseEntity implements Serializable {
     @TableField("tm_project_id")
     private String tmProjectId;
 
-    @TableField("dept_id")
-    private String deptId;
 }

src/main/java/com/fdkankan/fusion/entity/TmProject.java

@@ -130,7 +130,7 @@ public class TmProject implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -148,15 +148,14 @@ public class TmProject implements Serializable {
     /**
      * 编辑时间
      */
-    @TableField("edit_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
     private Date editTime;
 
     /**
      * 最新更新时间
      */
     @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -196,4 +195,9 @@ public class TmProject implements Serializable {
         }
         return statusDesc;
     }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getEditTime() {
+        return updateTime;
+    }
 }

src/main/java/com/fdkankan/fusion/service/ITmUserService.java

@@ -50,4 +50,6 @@ public interface ITmUserService extends IService<TmUser> {
     List<TmUser> getLikeNickName(String searchKey);
 
     HashMap<String, TmUser> getByCamera(List<TmCamera> records);
+
+    List<TmUser> getByDeptIds(List<String> deptIds);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -62,7 +62,12 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         if(deptIds.size() <=0){
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
-        wrapper.in(CaseEntity::getDeptId,deptIds);
+        List<TmUser> userList = tmUserService.getByDeptIds(deptIds);
+        List<String> userNameList = userList.stream().map(TmUser::getUserName).collect(Collectors.toList());
+        if(userNameList.size()<=0){
+            return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
+        }
+        wrapper.in(CaseEntity::getUserName,userNameList);
         //wrapper.eq(CaseEntity::getUserName,userName);
         wrapper.eq(CaseEntity::getType,0);
         wrapper.orderByDesc(CaseEntity::getCreateTime);
@@ -170,8 +175,6 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         if(param.getCaseId() == null){
             caseEntity = new CaseEntity();
             caseEntity.setUserName(userName);
-            TmUser tmUser = tmUserService.getByUserName(userName);
-            caseEntity.setDeptId(tmUser.getDeptId());
         }else {
             caseEntity = this.getById(param.getCaseId());
         }

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -82,10 +82,12 @@ public class SceneService implements ISceneService {
         if(StringUtils.isNotBlank(tokenValue)){
             tmCameraList = tmCameraService.getByDeptIds();
             List<String> snCodes = tmCameraList.stream().map(TmCamera::getCameraSn).collect(Collectors.toList());
-            if(CollectionUtil.isEmpty(snCodes)){
+            if(CollectionUtil.isEmpty(snCodes) && CollectionUtil.isEmpty(param.getNumList())){
                 snCodes = Arrays.asList("no_snCode");
             }
-            param.setSnCodes(snCodes);
+            if(CollectionUtil.isNotEmpty(snCodes)){
+                param.setSnCodes(snCodes);
+            }
         }
         List<SceneVo> sceneVoList = new ArrayList<>();
         long total = 0;

src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -259,6 +259,7 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         TmUser tmUser = tmUserService.getLoginUser();
         tmProject.setEditorId(tmUser.getId());
         tmProject.setEditorName(tmUser.getNickName());
+        tmProject.setUpdateTime(null);
         this.updateById(tmProject);
     }
 

src/main/java/com/fdkankan/fusion/service/impl/TmUserServiceImpl.java

@@ -244,6 +244,13 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         if(CollectionUtil.isNotEmpty(cameras)){
             tmCameraService.unBind(cameras);
         }
+        String redisKey = String.format(RedisKeyUtil.fusionLoginUser,param.getId());
+        if(redisUtil.hasKey(redisKey)){
+            FdkkLoginVo fdkkLoginVo = JSONObject.parseObject(redisUtil.get(redisKey), FdkkLoginVo.class);
+            redisUtil.del(String.format(RedisKeyUtil.fusionLoginToken,fdkkLoginVo.getToken()));
+            redisUtil.del(String.format(RedisKeyUtil.fdToken,fdkkLoginVo.getFdToken()));
+            redisUtil.del(redisKey);
+        }
         this.removeById(param.getId());
     }
 
@@ -349,4 +356,11 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         }
         return map;
     }
+
+    @Override
+    public List<TmUser> getByDeptIds(List<String> deptIds) {
+        LambdaQueryWrapper<TmUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(TmUser::getDeptId,deptIds);
+        return this.list(wrapper);
+    }
 }