Reiskuchen 5 years ago
parent
commit
609d2f3d2a

+ 33 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -1,13 +1,17 @@
 package com.management.platform.controller;
 
 
+import com.management.platform.service.ProjectService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 吴涛涛
@@ -16,6 +20,34 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/project")
 public class ProjectController {
+    @Autowired
+    private ProjectService projectService;
 
+    /**
+     * 获取项目列表
+     */
+    @RequestMapping("/getProjectList")
+    public HttpRespMsg getProjectList() {
+        return projectService.getProjectList();
+    }
+
+    /**
+     * 添加或编辑项目
+     * id 要编辑项目的id 可填
+     * name 项目的名称
+     */
+    @RequestMapping("/editProject")
+    public HttpRespMsg editProject(Integer id, @RequestParam String name) {
+        return projectService.editProject(id, name);
+    }
+
+    /**
+     * 删除项目
+     * id 要删除的项目的id
+     */
+    @RequestMapping("/deleteProject")
+    public HttpRespMsg deleteProject(@RequestParam Integer id) {
+        return projectService.deleteProject(id);
+    }
 }
 

+ 6 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -2,15 +2,20 @@ package com.management.platform.service;
 
 import com.management.platform.entity.Project;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.util.HttpRespMsg;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 吴涛涛
  * @since 2020-01-03
  */
 public interface ProjectService extends IService<Project> {
+    HttpRespMsg getProjectList();
 
+    HttpRespMsg editProject(Integer id, String name);
+
+    HttpRespMsg deleteProject(Integer id);
 }

+ 49 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1,14 +1,20 @@
 package com.management.platform.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Project;
+import com.management.platform.entity.Report;
 import com.management.platform.mapper.ProjectMapper;
+import com.management.platform.mapper.ReportMapper;
 import com.management.platform.service.ProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -16,5 +22,47 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
+    @Resource
+    private ProjectMapper projectMapper;
+    @Resource
+    private ReportMapper reportMapper;
+
+    @Override
+    public HttpRespMsg getProjectList() {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        httpRespMsg.data = projectMapper.selectList(new QueryWrapper<>());
+        return httpRespMsg;
+    }
+
+    @Override
+    public HttpRespMsg editProject(Integer id, String name) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        if (id == null) {
+            //新增项目
+            if (name == null) {
+                httpRespMsg.setError("请填写项目名称");
+            } else {
+                if (projectMapper.insert(new Project().setProjectName(name)) == 0) {
+                    httpRespMsg.setError("操作失败");
+                }
+            }
+        } else {
+            //修改项目
+            if (projectMapper.updateById(new Project().setProjectName(name).setId(id)) == 0) {
+                httpRespMsg.setError("操作失败");
+            }
+        }
+        return httpRespMsg;
+    }
 
+    @Override
+    public HttpRespMsg deleteProject(Integer id) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        if (reportMapper.selectCount(new QueryWrapper<Report>().eq("project_id", id)) > 0) {
+            httpRespMsg.setError("项目存在相关报告 无法删除");
+        } else if (projectMapper.deleteById(id) == 0) {
+            httpRespMsg.setError("操作失败");
+        }
+        return httpRespMsg;
+    }
 }

+ 3 - 6
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -59,14 +59,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if (report.getCreatorId() == null || report.getProjectId() == null) {
                 httpRespMsg.setError("请填写完整信息");
             } else {
-                Integer impactedRows = reportMapper.insert(report);
-                if (impactedRows == 0) {
+                if (reportMapper.insert(report) == 0) {
                     httpRespMsg.setError("操作失败");
                 }
             }
         } else {
-            Integer impactedRows = reportMapper.updateById(report);
-            if (impactedRows == 0) {
+            if (reportMapper.updateById(report) == 0) {
                 httpRespMsg.setError("操作失败");
             }
         }
@@ -77,8 +75,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Override
     public HttpRespMsg deleteReport(Integer reportId) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        Integer impactedRows = reportMapper.deleteById(reportId);
-        if (impactedRows == 0) {
+        if (reportMapper.deleteById(reportId) == 0) {
             httpRespMsg.setError("操作失败");
         }
         return httpRespMsg;