1

src/main/java/com/fdkankan/fusion/controller/TestController.java

@@ -4,16 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dtflys.forest.annotation.Post;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.ShellUtil;
-import com.fdkankan.fusion.entity.CaseEntity;
-import com.fdkankan.fusion.entity.CaseNumEntity;
-import com.fdkankan.fusion.entity.FusionMeter;
-import com.fdkankan.fusion.entity.TmProject;
+import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.service.*;
 import com.fdkankan.redis.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Case;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.xml.transform.Result;
 import java.util.List;
 import java.util.concurrent.ThreadPoolExecutor;
 
@@ -75,5 +74,32 @@ public class TestController {
         return ResultData.ok();
     }
 
+    @Autowired
+    IModelService modelService;
+
+    @GetMapping("/updateModelDeptId")
+    public ResultData updateModelDeptId(){
+        List<Model> list = modelService.list();
+        for (Model model : list) {
+            if(model.getType() == 3){
+                TmUser byUserName = tmUserService.getByUserName(model.getUserName());
+                model.setDeptId(byUserName.getDeptId());
+                modelService.updateById(model);
+            }
+        }
+        return ResultData.ok();
+    }
 
+    @GetMapping("/updateCaseDeptId")
+    public ResultData updateCaseDeptId(){
+        List<CaseEntity> list = caseService.list();
+        for (CaseEntity casee : list) {
+            if(casee.getType() == 0){
+                TmUser byUserName = tmUserService.getByUserName(casee.getUserName());
+                casee.setDeptId(byUserName.getDeptId());
+                caseService.updateById(casee);
+            }
+        }
+        return ResultData.ok();
+    }
 }

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

@@ -59,4 +59,7 @@ 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/Model.java

@@ -83,5 +83,9 @@ public class Model implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("dept_id")
+    private String deptId;
 
+    @TableField(exist = false)
+    private String deptName;
 }

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

@@ -64,12 +64,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         if(deptIds.size() <=0){
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
-        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.in(CaseEntity::getDeptId,deptIds);
         //wrapper.eq(CaseEntity::getUserName,userName);
         wrapper.eq(CaseEntity::getType,0);
         wrapper.orderByDesc(CaseEntity::getCreateTime);
@@ -176,6 +171,8 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         CaseEntity caseEntity ;
         if(param.getCaseId() == null){
             caseEntity = new CaseEntity();
+            TmUser tmUser = tmUserService.getByUserName(userName);
+            caseEntity.setDeptId(tmUser.getDeptId());
             caseEntity.setUserName(userName);
         }else {
             caseEntity = this.getById(param.getCaseId());

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

@@ -95,10 +95,12 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         //获取文件后缀名
         String modelName = fileName.substring(0,fileName.lastIndexOf("."));
 
+        TmUser tmUser = tmUserService.getLoginUser();
         Model model = new Model();
         model.setModelTitle(modelName);
         model.setModelSize(FileWriterUtil.setFileSize(file.getSize()));
         model.setUserName(username);
+        model.setDeptId(tmUser.getDeptId());
         this.save(model);
         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"0");
 
@@ -275,12 +277,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         if(deptIds.size() <=0){
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
-        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(Model::getUserName,userNameList);
+        wrapper.in(Model::getDeptId,deptIds);
         wrapper.eq(Model::getType,3);
         wrapper.notIn(Model::getCreateStatus,-2);
         if(param.getStatus()!=null){    //参数2为成功，数据库中成功为1
@@ -291,10 +288,18 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         }
         wrapper.orderByDesc(Model::getCreateTime);
         Page<Model> page = this.page(new Page<>(param.getPageNum(),param.getPageSize()),wrapper);
+        Set<String> deptIdset = page.getRecords().stream().map(Model::getDeptId).collect(Collectors.toSet());
+        HashMap<String, TmDepartment> mapByDept = tmDepartmentService.getMapByDeptIds(deptIdset);
         for (Model model : page.getRecords()) {
             if(model.getType() == 3 && StringUtils.isEmpty(model.getNum())) {
                 model.setNum(model.getModelId().toString());
             }
+            if(StringUtils.isNotBlank(model.getDeptId())){
+                TmDepartment tmDepartment = mapByDept.get(model.getDeptId());
+                if(tmDepartment != null){
+                    model.setDeptName(tmDepartment.getName());
+                }
+            }
         }
         return PageInfo.PageInfo(page);
     }