接口调整及表名称调整---

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

@@ -25,33 +25,33 @@ public class PlatProjectCheckController extends BaseController {
     /**
      * 问题数量
      */
-    @GetMapping("/getIssueNum")
-    public AjaxResult getIssueNum() {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueNum());
+    @GetMapping("/getIssueNum/{appOrg}")
+    public AjaxResult getIssueNum(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueNum(appOrg));
     }
 
     /**
      * 已整改问题数量
      */
-    @GetMapping("/getOverIssueNum")
-    public AjaxResult getOverIssueNum() {
-        return AjaxResult.success("查询成功", largeIssueService.getOverIssueNum());
+    @GetMapping("/getOverIssueNum/{appOrg}")
+    public AjaxResult getOverIssueNum(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeIssueService.getOverIssueNum(appOrg));
     }
 
     /**
      * 本周检查项目数量
      */
-    @GetMapping("/getProjectNumThisWeek")
-    public AjaxResult getProjectNumThisWeek() {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNumThisWeek());
+    @GetMapping("/getProjectNumThisWeek/{appOrg}")
+    public AjaxResult getProjectNumThisWeek(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumThisWeek(appOrg));
     }
 
     /**
      * 近一周问题列表
      */
-    @GetMapping("/getIssueListLastWeek")
-    public AjaxResult getIssueListLastWeek() {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek());
+    @GetMapping("/getIssueListLastWeek/{appOrg}")
+    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg));
     }
 
     /**

project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectMonitorController.java

@@ -26,9 +26,9 @@ public class PlatProjectMonitorController extends BaseController {
     /**
      * 各单位已接入项目数量和已接入摄像头数量
      */
-    @GetMapping("/getProjectCameraNumList")
-    public AjaxResult getProjectCameraNumList() {
-        return AjaxResult.success("查询成功", platAppOrgService.getProjectCameraNumList());
+    @GetMapping("/getProjectCameraNumList/{appOrg}")
+    public AjaxResult getProjectCameraNumList(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", platAppOrgService.getProjectCameraNumList(appOrg));
     }
 
     /**

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

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

project-zcustom/src/main/java/com/project/zcustom/mapper/basics/PlatAppOrgMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface PlatAppOrgMapper extends BaseMapper<PlatAppOrg> {
 
-    public List<PlatAppOrg> getProjectCameraNumList();
+    public List<PlatAppOrg> getProjectCameraNumList(String appOrg);
 
     public int getConnectUnitNum();
 

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

@@ -69,9 +69,9 @@ public interface LargeIssueMapper extends BaseMapper<LargeIssue>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeIssue> deleteWrapper);
 
-    public int getIssueNum();
+    public int getIssueNum(String appOrg);
 
-    public int getOverIssueNum();
+    public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek();
+    public List<LargeIssue> getIssueListLastWeek(String appOrg);
 }

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

@@ -62,13 +62,13 @@ public interface LargeProjectMapper extends BaseMapper<LargeProject>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeProject> deleteWrapper);
 
-    public Long getProjectNum();
+    public Long getProjectNum(String appOrg);
 
-    public List<LargeProject> getProjectNumX();
+    public List<LargeProject> getProjectNumX(String appOrg);
 
-    public List<LargeProject> getProjectNumY();
+    public List<LargeProject> getProjectNumY(String appOrg);
 
     public List<LargeProject> getCameraNumList(String appOrg);
 
-    public int getProjectNumThisWeek();
+    public int getProjectNumThisWeek(String appOrg);
 }

project-zcustom/src/main/java/com/project/zcustom/service/basics/IPlatAppOrgService.java

@@ -91,7 +91,7 @@ public interface IPlatAppOrgService extends IService<PlatAppOrg> {
      */
     public void checkFieldExist(String field, String filedValue,String tips,Long id);
 
-    public List<PlatAppOrg> getProjectCameraNumList();
+    public List<PlatAppOrg> getProjectCameraNumList(String appOrg);
 
     public int getConnectUnitNum();
 

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatAppOrgServiceImpl.java

@@ -206,8 +206,8 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
 
     }
 
-    public List<PlatAppOrg> getProjectCameraNumList(){
-        return platAppOrgMapper.getProjectCameraNumList();
+    public List<PlatAppOrg> getProjectCameraNumList(String appOrg){
+        return platAppOrgMapper.getProjectCameraNumList(appOrg);
     }
 
     public int getConnectUnitNum(){

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

@@ -87,11 +87,11 @@ public interface ILargeIssueService extends IService<LargeIssue> {
      */
     public void reallyDeleteLargeIssue(LambdaQueryWrapper<LargeIssue> lqw);
 
-    public int getIssueNum();
+    public int getIssueNum(String appOrg);
 
-    public int getOverIssueNum();
+    public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek();
+    public List<LargeIssue> getIssueListLastWeek(String appOrg);
 
     public List<LargeIssue> selectList(LargeIssue largeIssue);
     public LargeIssue selectLargeIssueById(Long id);

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

@@ -87,13 +87,13 @@ public interface ILargeProjectService extends IService<LargeProject> {
      */
     public void reallyDeleteLargeProject(LambdaQueryWrapper<LargeProject> lqw);
 
-    public Long getProjectNum();
+    public Long getProjectNum(String appOrg);
 
-    public List<LargeProject> getProjectNumX();
+    public List<LargeProject> getProjectNumX(String appOrg);
 
-    public List<LargeProject> getProjectNumY();
+    public List<LargeProject> getProjectNumY(String appOrg);
 
     public List<LargeProject> getCameraNumList(String appOrg);
 
-    public int getProjectNumThisWeek();
+    public int getProjectNumThisWeek(String appOrg);
 }

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

@@ -169,16 +169,16 @@ public class LargeIssueServiceImpl extends ServiceImpl<LargeIssueMapper, LargeIs
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
-    public int getIssueNum(){
-        return largeIssueMapper.getIssueNum();
+    public int getIssueNum(String appOrg){
+        return largeIssueMapper.getIssueNum(appOrg);
     }
 
-    public int getOverIssueNum(){
-        return largeIssueMapper.getOverIssueNum();
+    public int getOverIssueNum(String appOrg){
+        return largeIssueMapper.getOverIssueNum(appOrg);
     }
 
-    public List<LargeIssue> getIssueListLastWeek(){
-        return largeIssueMapper.getIssueListLastWeek();
+    public List<LargeIssue> getIssueListLastWeek(String appOrg){
+        return largeIssueMapper.getIssueListLastWeek(appOrg);
     }
 
 

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

@@ -169,22 +169,22 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
-    public Long getProjectNum(){
-        return largeProjectMapper.getProjectNum();
+    public Long getProjectNum(String appOrg){
+        return largeProjectMapper.getProjectNum(appOrg);
     }
 
-    public List<LargeProject> getProjectNumX() {
-        return largeProjectMapper.getProjectNumX();
+    public List<LargeProject> getProjectNumX(String appOrg) {
+        return largeProjectMapper.getProjectNumX(appOrg);
     }
-    public List<LargeProject> getProjectNumY() {
-        return largeProjectMapper.getProjectNumY();
+    public List<LargeProject> getProjectNumY(String appOrg) {
+        return largeProjectMapper.getProjectNumY(appOrg);
     }
 
     public List<LargeProject> getCameraNumList(String appOrg){
         return largeProjectMapper.getCameraNumList(appOrg);
     }
 
-    public int getProjectNumThisWeek(){
-        return largeProjectMapper.getProjectNumThisWeek();
+    public int getProjectNumThisWeek(String appOrg){
+        return largeProjectMapper.getProjectNumThisWeek(appOrg);
     }
 }

project-zcustom/src/main/resources/mapper/zcustom/basics/PlatAppOrgMapper.xml

@@ -17,11 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="appParentOrg"    column="app_parent_org"    />
     </resultMap>
 
-    <select id="getProjectCameraNumList" resultMap="LargeUnitResult">
+    <select id="getProjectCameraNumList" parameterType="String" resultMap="LargeUnitResult">
         SELECT
             c.app_name,
             COUNT(*) AS projectNum,
-            SUM(t.cameraNum) AS cameraNum
+            SUM( t.cameraNum ) AS cameraNum
         FROM
             (
                 SELECT
@@ -32,11 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 FROM
                     large_plat_project a
                         LEFT JOIN large_plat_camera b ON a.id = b.project_id
-                WHERE a.del_flag = 0
-                GROUP BY a.id
+                WHERE
+                    a.del_flag = 0
+                GROUP BY
+                    a.id
             ) t
                 LEFT JOIN large_plat_app_org c ON t.app_org = c.app_org
-        WHERE c.del_flag = 0
+        WHERE
+            c.del_flag = 0
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
         GROUP BY
             c.id
     </select>

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

@@ -96,35 +96,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM large_plat_issue ${ew.customSqlSegment}
     </delete>
 
-    <select id="getIssueNum" resultType="int">
+    <select id="getIssueNum" parameterType="String" resultType="int">
         SELECT
             COUNT(*)
         FROM
             large_plat_issue a
                 LEFT JOIN large_plat_project b ON a.project_id = b.id
-        WHERE a.del_flag = 0 AND b.del_flag = 0
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
+        WHERE
+            a.del_flag = 0
+          AND b.del_flag = 0
+          AND c.del_flag = '0'
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
     </select>
 
-    <select id="getOverIssueNum" resultType="int">
+    <select id="getOverIssueNum" parameterType="String" resultType="int">
         SELECT
             COUNT(*)
         FROM
             large_plat_issue a
                 LEFT JOIN large_plat_project b ON a.project_id = b.id
-        WHERE a.del_flag = '0' AND b.del_flag = '0' AND a.`status` = '0'
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
+        WHERE
+            a.del_flag = 0
+          AND b.del_flag = 0
+          AND c.del_flag = '0'
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+          AND a.`status` = '0'
     </select>
 
-    <select id="getIssueListLastWeek" resultMap="LargeIssueResult">
+    <select id="getIssueListLastWeek" parameterType="String" resultMap="LargeIssueResult">
         SELECT
             description,
             `status`,
-            create_time
+            a.create_time
         FROM
-            `large_plat_issue`
+            large_plat_issue a
+                LEFT JOIN large_plat_project b ON a.project_id = b.id
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
         WHERE
-            DATE(create_time) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) + 5 ) DAY )
-                AND DATE_SUB(
-                    CURDATE(),
-                    INTERVAL ( DAYOFWEEK( CURDATE()) - 1 ) DAY)
+            a.del_flag = 0
+          AND b.del_flag = 0
+          AND c.del_flag = '0'
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+          AND DATE( a.create_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) + 5 ) DAY )
+          AND DATE_SUB(
+            CURDATE(),
+            INTERVAL ( DAYOFWEEK( CURDATE()) - 1 ) DAY)
     </select>
 </mapper>

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

@@ -83,21 +83,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM large_plat_project ${ew.customSqlSegment}
     </delete>
 
-    <select id="getProjectNum" resultType="Long">
-        select count(*) as num from large_plat_project
-        where del_flag = '0'
+    <select id="getProjectNum" parameterType="String" resultType="Long">
+        SELECT
+            count(*) AS num
+        FROM
+            large_plat_project a
+                LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
+        WHERE
+            a.del_flag = '0'
+          AND b.del_flag = '0'
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
     </select>
 
     <select id="getProjectNumX" parameterType="String" resultMap="LargeProjectResult">
-        select count(*) as num, subdivision from large_plat_project
-        where del_flag = '0' and subdivision &lt;= 10
-        group by subdivision
+        SELECT
+            count(*) AS num,
+            subdivision
+        FROM
+            large_plat_project a
+            LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
+        WHERE
+            a.del_flag = '0'
+          AND b.del_flag = '0'
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+          AND subdivision &lt;= 10
+        GROUP BY
+            subdivision
     </select>
 
     <select id="getProjectNumY" parameterType="String" resultMap="LargeProjectResult">
-        select count(*) as num, subdivision from large_plat_project
-        where del_flag = '0' and subdivision > 10
-        group by subdivision
+        SELECT
+            count(*) AS num,
+            subdivision
+        FROM
+            large_plat_project a
+                LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
+        WHERE
+            a.del_flag = '0'
+          AND b.del_flag = '0'
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+          AND subdivision >= 10
+        GROUP BY
+            subdivision
     </select>
 
     <select id="getCameraNumList" parameterType="String" resultMap="LargeProjectResult">
@@ -109,19 +136,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             large_plat_project a
                 LEFT JOIN large_plat_camera b ON a.id = b.project_id
-        WHERE a.del_flag = 0 AND a.app_org = #{appOrg}
+        WHERE a.del_flag = '0' AND a.app_org = #{appOrg}
         GROUP BY a.id
     </select>
 
-    <select id="getProjectNumThisWeek" resultType="int">
+    <select id="getProjectNumThisWeek" parameterType="String" resultType="int">
         SELECT
             COUNT(*)
         FROM
             large_plat_plan a
                 LEFT JOIN large_plat_project b ON a.project_id = b.id
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
         WHERE
             a.del_flag = '0'
           AND b.del_flag = '0'
+          AND c.del_flag = '0'
+          AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )
           AND (
             DATE( a.start_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
             AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY )