zhanghao 4 месяцев назад
Родитель
Сommit
1d2abc1ef4

+ 1 - 26
project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildA.java → project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildOfficeController.java

@@ -3,18 +3,16 @@ package com.project.zcustom.controller.build;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.smart.IPlatBuildingService;
-import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/large/first")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class PlatBuildA extends BaseController {
+public class PlatBuildOfficeController extends BaseController {
 
     @Autowired
     private IPlatBuildingService platBuildingService;
@@ -91,27 +89,4 @@ public class PlatBuildA extends BaseController {
         return AjaxResult.success("查询成功", platBuildingService.waterYear());
     }
 
-    /**
-     * 巡更次数统计(近6月)
-     */
-    @GetMapping("/frequency")
-    public AjaxResult frequency() {
-        return AjaxResult.success("查询成功", platBuildingService.frequency());
-    }
-
-    /**
-     * 巡更及时率
-     */
-    @GetMapping("/patrol")
-    public AjaxResult patrol() {
-        return AjaxResult.success("查询成功", platBuildingService.patrol());
-    }
-
-    /**
-     * 巡更点统计
-     */
-    @GetMapping("/patrolPoint")
-    public AjaxResult patrolPoint() {
-        return AjaxResult.success("查询成功", platBuildingService.patrolPoint());
-    }
 }

+ 43 - 0
project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildProtectController.java

@@ -0,0 +1,43 @@
+package com.project.zcustom.controller.build;
+
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.zcustom.service.smart.IPlatBuildingService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/large/second")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatBuildProtectController extends BaseController {
+
+    @Autowired
+    private IPlatBuildingService platBuildingService;
+
+    /**
+     * 巡更次数统计(近6月)
+     */
+    @GetMapping("/frequency")
+    public AjaxResult frequency() {
+        return AjaxResult.success("查询成功", platBuildingService.frequency());
+    }
+
+    /**
+     * 巡更及时率
+     */
+    @GetMapping("/patrol")
+    public AjaxResult patrol() {
+        return AjaxResult.success("查询成功", platBuildingService.patrol());
+    }
+
+    /**
+     * 巡更点统计
+     */
+    @GetMapping("/patrolPoint")
+    public AjaxResult patrolPoint() {
+        return AjaxResult.success("查询成功", platBuildingService.patrolPoint());
+    }
+}

+ 19 - 5
project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectC.java → project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -2,19 +2,17 @@ package com.project.zcustom.controller.engineering;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
+import com.project.zcustom.domain.unit.LargeIssue;
 import com.project.zcustom.service.unit.ILargeIssueService;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/large/three")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class PlatProjectC extends BaseController {
+public class PlatProjectCheckController extends BaseController {
 
     private final ILargeProjectService largeProjectService;
 
@@ -51,4 +49,20 @@ public class PlatProjectC extends BaseController {
     public AjaxResult getIssueListLastWeek() {
         return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek());
     }
+
+    /**
+     * 问题列表
+     * */
+    @GetMapping("/issueList")
+    public AjaxResult issueList(LargeIssue entity) {
+        return AjaxResult.success("查询成功", largeIssueService.selectList(entity));
+    }
+
+    /**
+     * 更改问题状态
+     * */
+    @PostMapping("changeIssueStatus")
+    public AjaxResult changeIssueStatus(@RequestBody LargeIssue entity) {
+        return toAjax(largeIssueService.updateById(entity));
+    }
 }

+ 0 - 33
project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectD.java

@@ -1,33 +0,0 @@
-package com.project.zcustom.controller.engineering;
-
-import com.project.common.core.controller.BaseController;
-import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.domain.unit.LargeIssue;
-import com.project.zcustom.service.unit.ILargeIssueService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("/large/four")
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class PlatProjectD extends BaseController {
-
-    private final ILargeIssueService largeIssueService;
-
-    /**
-     * 问题列表
-     * */
-    @GetMapping("/issueList")
-    public AjaxResult issueList(LargeIssue entity) {
-        return AjaxResult.success("查询成功", largeIssueService.selectList(entity));
-    }
-
-    /**
-     * 更改问题状态
-     * */
-    @PostMapping("changeIssueStatus")
-    public AjaxResult changeIssueStatus(@RequestBody LargeIssue entity) {
-        return toAjax(largeIssueService.updateById(entity));
-    }
-}

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectB.java → project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectMonitorController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/large/two")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class PlatProjectB extends BaseController {
+public class PlatProjectMonitorController extends BaseController {
 
     private final ILargeUnitService largeUnitService;
 

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectA.java → project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectProductionController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/large/one")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class PlatProjectA extends BaseController {
+public class PlatProjectProductionController extends BaseController {
 
     private final ILargeProjectService largeProjectService;