Переглянути джерело

接口文件位置调整及部分接口更新---

zhanghao 3 місяців тому
батько
коміт
558f693b9a
37 змінених файлів з 63 додано та 66 видалено
  1. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java
  2. 6 6
      project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectProductionController.java
  3. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCameraController.java
  4. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeEmailController.java
  5. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeIssueController.java
  6. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePlanController.java
  7. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeProjectController.java
  8. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitController.java
  9. 1 1
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeBuilding.java
  10. 1 1
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCamera.java
  11. 1 1
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeIssue.java
  12. 1 1
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargePlan.java
  13. 5 1
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeProject.java
  14. 1 2
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeUnit.java
  15. 1 2
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/ManagerEmail.java
  16. 1 1
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeCameraMapper.java
  17. 1 1
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeIssueMapper.java
  18. 1 1
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargePlanMapper.java
  19. 3 3
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeProjectMapper.java
  20. 1 1
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeUnitMapper.java
  21. 1 3
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/PlatBuildingMapper.java
  22. 0 3
      project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatBuildingService.java
  23. 1 2
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeCameraService.java
  24. 1 1
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeIssueService.java
  25. 1 1
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargePlanService.java
  26. 3 3
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeProjectService.java
  27. 1 2
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeUnitService.java
  28. 1 2
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeCameraServiceImpl.java
  29. 1 1
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeIssueServiceImpl.java
  30. 1 1
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargePlanServiceImpl.java
  31. 5 5
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeProjectServiceImpl.java
  32. 1 1
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeUnitServiceImpl.java
  33. 2 2
      project-zcustom/src/main/java/com/project/zcustom/tools/DataTools.java
  34. 1 1
      project-zcustom/src/main/resources/mapper/zcustom/unit/LargeCameraMapper.xml
  35. 1 1
      project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml
  36. 10 7
      project-zcustom/src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml
  37. 1 1
      project-zcustom/src/main/resources/mapper/zcustom/unit/LargeUnitMapper.xml

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -2,7 +2,7 @@ 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.domain.addional.LargeIssue;
 import com.project.zcustom.service.unit.ILargeIssueService;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;

+ 6 - 6
project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectProductionController.java

@@ -20,16 +20,16 @@ public class PlatProjectProductionController extends BaseController {
     /**
      * 已接入项目数量(在建)
      */
-    @GetMapping("/getProjectNumX/{subdivision}")
-    public AjaxResult getProjectNumX(@PathVariable String subdivision) {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNumX(subdivision));
+    @GetMapping("/getProjectNumX")
+    public AjaxResult getProjectNumX() {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumX());
     }
 
     /**
      * 已接入项目数量(施工)
      */
-    @GetMapping("/getProjectNumY/{subdivision}")
-    public AjaxResult getProjectNumY(@PathVariable String subdivision) {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNumY(subdivision));
+    @GetMapping("/getProjectNumY")
+    public AjaxResult getProjectNumY() {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumY());
     }
 }

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCameraController.java

@@ -5,7 +5,7 @@ import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.unit.LargeCamera;
+import com.project.zcustom.domain.addional.LargeCamera;
 import com.project.zcustom.service.unit.ILargeCameraService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeEmailController.java

@@ -1,7 +1,7 @@
 package com.project.zcustom.controller.unit;
 
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.domain.unit.ManagerEmail;
+import com.project.zcustom.domain.addional.ManagerEmail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeIssueController.java

@@ -5,7 +5,7 @@ import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.unit.LargeIssue;
+import com.project.zcustom.domain.addional.LargeIssue;
 import com.project.zcustom.service.unit.ILargeIssueService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePlanController.java

@@ -5,7 +5,7 @@ import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.unit.LargePlan;
+import com.project.zcustom.domain.addional.LargePlan;
 import com.project.zcustom.service.unit.ILargePlanService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeProjectController.java

@@ -5,7 +5,7 @@ import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.unit.LargeProject;
+import com.project.zcustom.domain.addional.LargeProject;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitController.java

@@ -5,7 +5,7 @@ import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.unit.LargeUnit;
+import com.project.zcustom.domain.addional.LargeUnit;
 import com.project.zcustom.service.unit.ILargeUnitService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeBuilding.java → project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeBuilding.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.domain.unit;
+package com.project.zcustom.domain.addional;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeCamera.java → project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCamera.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.domain.unit;
+package com.project.zcustom.domain.addional;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeIssue.java → project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeIssue.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.domain.unit;
+package com.project.zcustom.domain.addional;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargePlan.java → project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargePlan.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.domain.unit;
+package com.project.zcustom.domain.addional;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

+ 5 - 1
project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeProject.java → project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeProject.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.domain.unit;
+package com.project.zcustom.domain.addional;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -66,4 +66,8 @@ public class LargeProject extends CustomBaseEntity {
     @TableField(exist = false)
     private Long cameraNum;
 
+    private String subdivision;
+
+    private Long num;
+
 }

+ 1 - 2
project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeUnit.java → project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeUnit.java

@@ -1,10 +1,9 @@
-package com.project.zcustom.domain.unit;
+package com.project.zcustom.domain.addional;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 2
project-zcustom/src/main/java/com/project/zcustom/domain/unit/ManagerEmail.java → project-zcustom/src/main/java/com/project/zcustom/domain/addional/ManagerEmail.java

@@ -1,9 +1,8 @@
-package com.project.zcustom.domain.unit;
+package com.project.zcustom.domain.addional;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.io.Serializable;
 

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeCameraMapper.java

@@ -2,7 +2,7 @@ package com.project.zcustom.mapper.unit;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.project.zcustom.domain.unit.LargeCamera;
+import com.project.zcustom.domain.addional.LargeCamera;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeIssueMapper.java

@@ -2,7 +2,7 @@ package com.project.zcustom.mapper.unit;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.project.zcustom.domain.unit.LargeIssue;
+import com.project.zcustom.domain.addional.LargeIssue;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargePlanMapper.java

@@ -3,7 +3,7 @@ package com.project.zcustom.mapper.unit;
 import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.project.zcustom.domain.unit.LargePlan;
+import com.project.zcustom.domain.addional.LargePlan;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;

+ 3 - 3
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeProjectMapper.java

@@ -2,7 +2,7 @@ package com.project.zcustom.mapper.unit;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.project.zcustom.domain.unit.LargeProject;
+import com.project.zcustom.domain.addional.LargeProject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
@@ -62,9 +62,9 @@ public interface LargeProjectMapper extends BaseMapper<LargeProject>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeProject> deleteWrapper);
 
-    public int getProjectNumX(String subdivision);
+    public List<LargeProject> getProjectNumX();
 
-    public int getProjectNumY(String subdivision);
+    public List<LargeProject> getProjectNumY();
 
     public List<LargeProject> getCameraNumList(String unitCode);
 

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeUnitMapper.java

@@ -2,7 +2,7 @@ package com.project.zcustom.mapper.unit;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.project.zcustom.domain.unit.LargeUnit;
+import com.project.zcustom.domain.addional.LargeUnit;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;

+ 1 - 3
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/PlatBuildingMapper.java

@@ -1,8 +1,6 @@
 package com.project.zcustom.mapper.unit;
 
-import com.project.zcustom.domain.unit.LargeBuilding;
-
-import java.util.List;
+import com.project.zcustom.domain.addional.LargeBuilding;
 
 public interface PlatBuildingMapper {
     public int getCount();

+ 0 - 3
project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatBuildingService.java

@@ -1,8 +1,5 @@
 package com.project.zcustom.service.smart;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.unit.LargeBuilding;
-
 import java.util.List;
 import java.util.Map;
 

+ 1 - 2
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeCameraService.java

@@ -1,11 +1,10 @@
 package com.project.zcustom.service.unit;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.unit.LargeCamera;
+import com.project.zcustom.domain.addional.LargeCamera;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.project.zcustom.domain.unit.LargeUnit;
 
 import java.util.List;
 

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeIssueService.java

@@ -1,7 +1,7 @@
 package com.project.zcustom.service.unit;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.unit.LargeIssue;
+import com.project.zcustom.domain.addional.LargeIssue;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargePlanService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.common.core.domain.search.PageParamVo;
-import com.project.zcustom.domain.unit.LargePlan;
+import com.project.zcustom.domain.addional.LargePlan;
 
 import java.util.Date;
 import java.util.List;

+ 3 - 3
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeProjectService.java

@@ -1,7 +1,7 @@
 package com.project.zcustom.service.unit;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.unit.LargeProject;
+import com.project.zcustom.domain.addional.LargeProject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -87,9 +87,9 @@ public interface ILargeProjectService extends IService<LargeProject> {
      */
     public void reallyDeleteLargeProject(LambdaQueryWrapper<LargeProject> lqw);
 
-    public int getProjectNumX(String subdivision);
+    public List<LargeProject> getProjectNumX();
 
-    public int getProjectNumY(String subdivision);
+    public List<LargeProject> getProjectNumY();
 
     public List<LargeProject> getCameraNumList(String unitCode);
 

+ 1 - 2
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeUnitService.java

@@ -1,8 +1,7 @@
 package com.project.zcustom.service.unit;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.domain.unit.LargeUnit;
+import com.project.zcustom.domain.addional.LargeUnit;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

+ 1 - 2
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeCameraServiceImpl.java

@@ -1,7 +1,6 @@
 package com.project.zcustom.service.unit.impl;
 
-import com.project.zcustom.domain.unit.LargeCamera;
-import com.project.zcustom.domain.unit.LargeUnit;
+import com.project.zcustom.domain.addional.LargeCamera;
 import com.project.zcustom.mapper.unit.LargeCameraMapper;
 import com.project.zcustom.service.unit.ILargeCameraService;
 import com.project.common.core.domain.search.PageParamVo;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeIssueServiceImpl.java

@@ -1,6 +1,6 @@
 package com.project.zcustom.service.unit.impl;
 
-import com.project.zcustom.domain.unit.LargeIssue;
+import com.project.zcustom.domain.addional.LargeIssue;
 import com.project.zcustom.mapper.unit.LargeIssueMapper;
 import com.project.zcustom.service.unit.ILargeIssueService;
 import com.project.common.core.domain.search.PageParamVo;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargePlanServiceImpl.java

@@ -1,6 +1,6 @@
 package com.project.zcustom.service.unit.impl;
 
-import com.project.zcustom.domain.unit.LargePlan;
+import com.project.zcustom.domain.addional.LargePlan;
 import com.project.zcustom.mapper.unit.LargePlanMapper;
 import com.project.zcustom.service.unit.ILargePlanService;
 import com.project.common.core.domain.search.PageParamVo;

+ 5 - 5
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeProjectServiceImpl.java

@@ -1,6 +1,6 @@
 package com.project.zcustom.service.unit.impl;
 
-import com.project.zcustom.domain.unit.LargeProject;
+import com.project.zcustom.domain.addional.LargeProject;
 import com.project.zcustom.mapper.unit.LargeProjectMapper;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import com.project.common.core.domain.search.PageParamVo;
@@ -169,11 +169,11 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
-    public int getProjectNumX(String subdivision) {
-        return largeProjectMapper.getProjectNumX(subdivision);
+    public List<LargeProject> getProjectNumX() {
+        return largeProjectMapper.getProjectNumX();
     }
-    public int getProjectNumY(String subdivision) {
-        return largeProjectMapper.getProjectNumY(subdivision);
+    public List<LargeProject> getProjectNumY() {
+        return largeProjectMapper.getProjectNumY();
     }
 
     public List<LargeProject> getCameraNumList(String unitCode){

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeUnitServiceImpl.java

@@ -1,6 +1,6 @@
 package com.project.zcustom.service.unit.impl;
 
-import com.project.zcustom.domain.unit.LargeUnit;
+import com.project.zcustom.domain.addional.LargeUnit;
 import com.project.zcustom.mapper.unit.LargeUnitMapper;
 import com.project.zcustom.service.unit.ILargeUnitService;
 import com.project.common.core.domain.search.PageParamVo;

+ 2 - 2
project-zcustom/src/main/java/com/project/zcustom/tools/DataTools.java

@@ -7,7 +7,7 @@ import com.project.common.enums.EmployeeTypeEnum;
 import com.project.common.utils.StringUtils;
 import com.project.common.utils.http.HttpUtils;
 import com.project.zcustom.domain.plat.PlatApiRecord;
-import com.project.zcustom.domain.unit.LargeBuilding;
+import com.project.zcustom.domain.addional.LargeBuilding;
 import com.project.zcustom.mapper.unit.PlatBuildingMapper;
 import com.project.zcustom.service.access.IPlatAccessService;
 import com.project.zcustom.service.basics.IPlatBasicsService;
@@ -114,7 +114,7 @@ public class DataTools {
         largeBuilding.setJsonFrequency(repeat(ApiUrlConfig.getJsonFrequency(), null));
         largeBuilding.setJsonPatrol(repeat(ApiUrlConfig.getJsonPatrol(), null));
         largeBuilding.setJsonPatrolPoint(repeat(ApiUrlConfig.getJsonPatrolPoint(), null));
-        largeBuilding.setJsonPowerWaterMonth((repeat(ApiUrlConfig.getJsonPowerWaterMonth(), String.valueOf(LocalDate.now().getMonthValue()))));
+        largeBuilding.setJsonPowerWaterMonth((repeat(ApiUrlConfig.getJsonPowerWaterMonth(), null)));
         largeBuilding.setJsonAir(repeat(ApiUrlConfig.getJsonAir(), null));
         largeBuilding.setJsonTarget(repeat(ApiUrlConfig.getJsonTarget(), null));
         largeBuilding.setJsonUseElectricity(repeat(ApiUrlConfig.getJsonUseElectricity(), null));

+ 1 - 1
project-zcustom/src/main/resources/mapper/zcustom/unit/LargeCameraMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.zcustom.mapper.unit.LargeCameraMapper">
 
-    <resultMap type="com.project.zcustom.domain.unit.LargeCamera" id="LargeCameraResult">
+    <resultMap type="com.project.zcustom.domain.addional.LargeCamera" id="LargeCameraResult">
         <result property="id"    column="id"    />
         <result property="cameraName"    column="camera_name"    />
         <result property="projectId"    column="project_id"    />

+ 1 - 1
project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.zcustom.mapper.unit.LargeIssueMapper">
 
-    <resultMap type="com.project.zcustom.domain.unit.LargeIssue" id="LargeIssueResult">
+    <resultMap type="com.project.zcustom.domain.addional.LargeIssue" id="LargeIssueResult">
         <result property="id"    column="id"    />
         <result property="description"    column="description"    />
         <result property="projectId"    column="project_id"    />

+ 10 - 7
project-zcustom/src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml

@@ -4,12 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.zcustom.mapper.unit.LargeProjectMapper">
 
-    <resultMap type="com.project.zcustom.domain.unit.LargeProject" id="LargeProjectResult">
+    <resultMap type="com.project.zcustom.domain.addional.LargeProject" id="LargeProjectResult">
         <result property="id"    column="id"    />
         <result property="projectName"    column="project_name"    />
         <result property="unitCode"    column="unit_code"    />
         <result property="connectFlag"    column="connect_flag"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="subdivision"    column="subdivision"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -82,14 +83,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM large_project ${ew.customSqlSegment}
     </delete>
 
-    <select id="getProjectNumX" parameterType="String" resultType="int">
-        select count(*) from large_project
-        where del_flag = '0' and type = '0' and subdivision = #{subdivision}
+    <select id="getProjectNumX" parameterType="String" resultMap="LargeProjectResult">
+        select count(*) as num, subdivision from large_project
+        where del_flag = '0' and type = '0'
+        group by subdivision
     </select>
 
-    <select id="getProjectNumY" parameterType="String" resultType="int">
-        select count(*) from large_project
-        where del_flag = '0' and type = '2' and subdivision = #{subdivision}
+    <select id="getProjectNumY" parameterType="String" resultMap="LargeProjectResult">
+        select count(*) as num, subdivision from large_project
+        where del_flag = '0' and type = '2'
+        group by subdivision
     </select>
 
     <select id="getCameraNumList" parameterType="String" resultMap="LargeProjectResult">

+ 1 - 1
project-zcustom/src/main/resources/mapper/zcustom/unit/LargeUnitMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.zcustom.mapper.unit.LargeUnitMapper">
 
-    <resultMap type="com.project.zcustom.domain.unit.LargeUnit" id="LargeUnitResult">
+    <resultMap type="com.project.zcustom.domain.addional.LargeUnit" id="LargeUnitResult">
         <result property="id"    column="id"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="connectFlag"    column="connect_flag"    />