Browse Source

删除项目日志完善

lyhzzz 3 năm trước cách đây
mục cha
commit
3328713680

+ 1 - 4
src/main/java/com/fdkankan/site/controller/ProjectController.java

@@ -63,10 +63,7 @@ public class ProjectController extends BaseController {
     @PostMapping("/del")
     public ResultData del(@RequestBody Project param){
         VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
-        projectService.removeById(param.getProjectId());
-        projectNumService.delByProjectId(param.getProjectId());
-        projectTeamService.delByProjectId(param.getProjectId());
-        projectBimService.delByProjectId(param.getProjectId());
+        projectService.delProject(param.getProjectId(),getToken());
         return ResultData.ok();
     }
 

+ 1 - 1
src/main/java/com/fdkankan/site/service/IProjectBimService.java

@@ -19,5 +19,5 @@ public interface IProjectBimService extends IService<ProjectBim> {
 
     void updateBimName(ProjectBim projectBim);
 
-    void delByProjectId(Integer projectId);
+    void delByProjectId(Integer projectId,String token);
 }

+ 1 - 1
src/main/java/com/fdkankan/site/service/IProjectNumService.java

@@ -37,7 +37,7 @@ public interface IProjectNumService extends IService<ProjectNum> {
 
     Set<String> getNumList();
 
-    void delByProjectId(Integer projectId);
+    void delByProjectId(Integer projectId,String token);
 
     List<ProjectNum> getByNum(String num);
 }

+ 2 - 0
src/main/java/com/fdkankan/site/service/IProjectService.java

@@ -51,4 +51,6 @@ public interface IProjectService extends IService<Project> {
     void updatePanos(Project project);
 
     HashMap<Integer, Project> getAndDelByIds(Set<Integer> projectIds);
+
+    void delProject(Integer projectId, String token);
 }

+ 14 - 1
src/main/java/com/fdkankan/site/service/impl/ProjectBimServiceImpl.java

@@ -6,13 +6,17 @@ import com.fdkankan.site.common.ResultCode;
 import com.fdkankan.site.common.util.VUtils;
 import com.fdkankan.site.entity.Project;
 import com.fdkankan.site.entity.ProjectBim;
+import com.fdkankan.site.entity.ProjectNum;
 import com.fdkankan.site.mapper.IProjectBimMapper;
 import com.fdkankan.site.service.IProjectBimService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.site.service.IProjectLogService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -25,6 +29,9 @@ import java.util.List;
 @Service
 public class ProjectBimServiceImpl extends ServiceImpl<IProjectBimMapper, ProjectBim> implements IProjectBimService {
 
+    @Autowired
+    IProjectLogService projectLogService;
+
     @Override
     public List<ProjectBim> getByProjectId(Integer projectId) {
         LambdaQueryWrapper<ProjectBim> wrapper = new LambdaQueryWrapper<>();
@@ -46,9 +53,15 @@ public class ProjectBimServiceImpl extends ServiceImpl<IProjectBimMapper, Projec
     }
 
     @Override
-    public void delByProjectId(Integer projectId) {
+    public void delByProjectId(Integer projectId,String token) {
         LambdaQueryWrapper<ProjectBim> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProjectBim::getProjectId,projectId);
         this.remove(wrapper);
+        List<ProjectBim> list = this.list(wrapper);
+        if(list.size() <=0){
+            return;
+        }
+        this.remove(wrapper);
+        projectLogService.addLog(projectId,"删除项目->删除BIM:"+list.get(0).getBimName(),token,null);
     }
 }

+ 9 - 1
src/main/java/com/fdkankan/site/service/impl/ProjectNumServiceImpl.java

@@ -36,6 +36,8 @@ public class ProjectNumServiceImpl extends ServiceImpl<IProjectNumMapper, Projec
 
     @Autowired
     IProjectTeamService projectTeamService;
+    @Autowired
+    IProjectLogService projectLogService;
 
     @Override
     public List<ProjectNum> getListByProjectIds(Set<Integer> projectIds) {
@@ -123,10 +125,16 @@ public class ProjectNumServiceImpl extends ServiceImpl<IProjectNumMapper, Projec
     }
 
     @Override
-    public void delByProjectId(Integer projectId) {
+    public void delByProjectId(Integer projectId,String token) {
         LambdaQueryWrapper<ProjectNum> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProjectNum::getProjectId,projectId);
+        List<ProjectNum> list = this.list(wrapper);
+        if(list.size() <=0){
+            return;
+        }
+        List<String> numList = list.stream().map(ProjectNum::getNum).collect(Collectors.toList());
         this.remove(wrapper);
+        projectLogService.addLog(projectId,"删除项目->删除场景:",token,numList);
     }
 
     @Override

+ 13 - 0
src/main/java/com/fdkankan/site/service/impl/ProjectServiceImpl.java

@@ -320,4 +320,17 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         }
         this.update(wrapper);
     }
+
+    @Override
+    public void delProject(Integer projectId, String token) {
+        Project project = this.getById(projectId);
+        if(project == null){
+            throw new BusinessException(ResultCode.PROJECT_NOT_EXIST);
+        }
+        projectNumService.delByProjectId(projectId,token);
+        projectTeamService.delByProjectId(projectId);
+        projectBimService.delByProjectId(projectId,token);
+        this.removeById(projectId);
+        projectLogService.addLog(project.getProjectId(),"删除项目:"+project.getProjectName(),token,null);
+    }
 }