工程现场接口---

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

@@ -0,0 +1,35 @@
+package com.project.zcustom.controller.engineering;
+
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+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/one")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatProjectA extends BaseController {
+
+    private final ILargeProjectService largeProjectService;
+
+    /**
+     * 已接入项目数量(在建)
+     */
+    @GetMapping("/getProjectNumX/{subdivision}")
+    public AjaxResult getProjectNumX(@PathVariable String subdivision) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumX(subdivision));
+    }
+
+    /**
+     * 已接入项目数量(施工)
+     */
+    @GetMapping("/getProjectNumY/{subdivision}")
+    public AjaxResult getProjectNumY(@PathVariable String subdivision) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumY(subdivision));
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.project.zcustom.controller.engineering;
+
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.zcustom.service.unit.ILargeCameraService;
+import com.project.zcustom.service.unit.ILargeProjectService;
+import com.project.zcustom.service.unit.ILargeUnitService;
+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/two")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatProjectB extends BaseController {
+
+    private final ILargeUnitService largeUnitService;
+
+    private final ILargeProjectService largeProjectService;
+
+    private final ILargeCameraService largeCameraService;
+
+    /**
+     * 各单位已接入项目数量和已接入摄像头数量
+     */
+    @GetMapping("/getProjectCameraNumList")
+    public AjaxResult getProjectCameraNumList() {
+        return AjaxResult.success("查询成功", largeUnitService.getProjectCameraNumList());
+    }
+
+    /**
+     * 各项目已接入摄像头数量
+     */
+    @GetMapping("/getCameraNumList/{unitCode}")
+    public AjaxResult getCameraNumList(@PathVariable String unitCode) {
+        return AjaxResult.success("查询成功", largeProjectService.getCameraNumList(unitCode));
+    }
+
+    /**
+     * 某项目的所有摄像头信息
+     */
+    @GetMapping("/getCameraList/{projectId}")
+    public AjaxResult getCameraList(@PathVariable Long projectId) {
+        return AjaxResult.success("查询成功", largeCameraService.getCameraList(projectId));
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.project.zcustom.controller.engineering;
+
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+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;
+
+@RestController
+@RequestMapping("/large/three")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatProjectC extends BaseController {
+
+    private final ILargeProjectService largeProjectService;
+
+    private final ILargeIssueService largeIssueService;
+
+    /**
+     * 问题数量
+     */
+    @GetMapping("/getIssueNum")
+    public AjaxResult getIssueNum() {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueNum());
+    }
+
+    /**
+     * 已整改问题数量
+     */
+    @GetMapping("/getOverIssueNum")
+    public AjaxResult getOverIssueNum() {
+        return AjaxResult.success("查询成功", largeIssueService.getOverIssueNum());
+    }
+
+    /**
+     * 本周检查项目数量
+     */
+    @GetMapping("/getProjectNumThisWeek")
+    public AjaxResult getProjectNumThisWeek() {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumThisWeek());
+    }
+
+    /**
+     * 近一周问题列表
+     */
+    @GetMapping("/getIssueListLastWeek")
+    public AjaxResult getIssueListLastWeek() {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek());
+    }
+}

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

@@ -0,0 +1,33 @@
+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));
+    }
+}

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

@@ -72,13 +72,7 @@ public class LargeCameraController extends BaseController {
         return toAjax(largeCameraService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
 
-    /**
-     * 已接入摄像头数量
-     */
-    @GetMapping("/getConnectCameraNum")
-    public AjaxResult getConnectCameraNum() {
-        return AjaxResult.success("查询成功", largeCameraService.getConnectCameraNum());
-    }
+
     /**
      * 某项目已接入摄像头
      */

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

@@ -71,28 +71,4 @@ public class LargeProjectController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(largeProjectService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
-
-    /**
-     * 应接入项目数量
-     */
-    @GetMapping("/getProjectNum")
-    public AjaxResult getProjectNum() {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNum());
-    }
-
-    /**
-     * 已接入项目数量
-     */
-    @GetMapping("/getConnectProjectNum")
-    public AjaxResult getConnectProjectNum() {
-        return AjaxResult.success("查询成功", largeProjectService.getConnectProjectNum());
-    }
-
-    /**
-     * 某单位已接入项目
-     */
-    @GetMapping("/getConnectProjectByUnit/{appOrg}")
-    public AjaxResult getConnectProjectByUnit(@PathVariable String appOrg) {
-        return AjaxResult.success("查询成功", largeProjectService.getConnectProjectByUnit(appOrg));
-    }
 }

project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeCamera.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.domain.unit;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,6 +24,7 @@ import io.swagger.annotations.ApiModelProperty;
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_camera")
 @ApiModel(value = "large_camera实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeCamera extends CustomBaseEntity {
 
     /**

project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeIssue.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.domain.unit;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,6 +24,7 @@ import io.swagger.annotations.ApiModelProperty;
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_issue")
 @ApiModel(value = "large_issue实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeIssue extends CustomBaseEntity {
 
     /**

project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargePlan.java

@@ -2,6 +2,7 @@ package com.project.zcustom.domain.unit;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -25,6 +26,7 @@ import io.swagger.annotations.ApiModelProperty;
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plan")
 @ApiModel(value = "large_plan实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargePlan extends CustomBaseEntity {
 
     /**

project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeProject.java

@@ -1,5 +1,7 @@
 package com.project.zcustom.domain.unit;
 
+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;
@@ -23,6 +25,7 @@ import io.swagger.annotations.ApiModelProperty;
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_project")
 @ApiModel(value = "large_project实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeProject extends CustomBaseEntity {
 
     /**
@@ -42,9 +45,16 @@ public class LargeProject extends CustomBaseEntity {
     /**
      * 所属单位id
      */
-    @Excel(name = "所属单位id")
-    @ApiModelProperty("所属单位id")
-    private String unitId;
+    @Excel(name = "所属单位编码")
+    @ApiModelProperty("所属单位编码")
+    private String unitCode;
+
+    /**
+     * 项目类型
+     */
+    @Excel(name = "项目类型")
+    @ApiModelProperty("项目类型")
+    private String type;
 
     /**
      * 接入标志（0代表接入 2代表未接入）
@@ -53,4 +63,7 @@ public class LargeProject extends CustomBaseEntity {
     @ApiModelProperty("接入标志（0代表接入 2代表未接入）")
     private String connectFlag;
 
+    @TableField(exist = false)
+    private Long cameraNum;
+
 }

project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeUnit.java

@@ -1,6 +1,7 @@
 package com.project.zcustom.domain.unit;
 
 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;
@@ -23,6 +24,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "large_unit实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeUnit extends CustomBaseEntity {
 
     /**
@@ -56,6 +58,9 @@ public class LargeUnit extends CustomBaseEntity {
     private String connectFlag;
 
     @TableField(exist = false)
+    private Long projectNum;
+
+    @TableField(exist = false)
     private Long cameraNum;
 
     @TableField(exist = false)

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

@@ -69,7 +69,9 @@ public interface LargeCameraMapper extends BaseMapper<LargeCamera>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeCamera> deleteWrapper);
 
-    public int getConnectCameraNum();
+    public List<LargeCamera> getCameraList(Long projectId);
+
+    public int getCameraNum();
     public List<LargeCamera> getConnectCameraNumByProject(Long projectId);
     public int getConnectOnlineCameraNum();
 }

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

@@ -68,4 +68,10 @@ public interface LargeIssueMapper extends BaseMapper<LargeIssue>
     * 真删接口
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeIssue> deleteWrapper);
+
+    public int getIssueNum();
+
+    public int getOverIssueNum();
+
+    public List<LargeIssue> getIssueListLastWeek();
 }

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

@@ -16,13 +16,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface LargeProjectMapper extends BaseMapper<LargeProject>
 {
-    /**
-     * 查询工程项目
-     *
-     * @param id 工程项目主键
-     * @return 工程项目
-     */
-    public LargeProject selectLargeProjectById(Long id);
 
     /**
      * 查询工程项目列表
@@ -69,9 +62,11 @@ public interface LargeProjectMapper extends BaseMapper<LargeProject>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeProject> deleteWrapper);
 
-    public int getProjectNum();
+    public int getProjectNumX(String subdivision);
+
+    public int getProjectNumY(String subdivision);
 
-    public int getConnectProjectNum();
+    public List<LargeProject> getCameraNumList(String unitCode);
 
-    public List<LargeProject> getConnectProjectByUnit(String appOrg);
+    public int getProjectNumThisWeek();
 }

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

@@ -69,9 +69,11 @@ public interface LargeUnitMapper extends BaseMapper<LargeUnit>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeUnit> deleteWrapper);
 
+    public List<LargeUnit> getProjectCameraNumList();
+
     public int getConnectUnitNum();
 
     public List<LargeUnit> getAllCameraCondition();
 
-    public LargeUnit getCameraConditionByAppOrg(String appOrg);
+    public LargeUnit getCameraConditionByAppOrg(String unitCode);
 }

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

@@ -89,7 +89,9 @@ public interface ILargeCameraService extends IService<LargeCamera> {
      */
     public void reallyDeleteLargeCamera(LambdaQueryWrapper<LargeCamera> lqw);
 
-    public int getConnectCameraNum();
+    public List<LargeCamera> getCameraList(Long projectId);
+
+    public int getCameraNum();
     public List<LargeCamera> getConnectCameraNumByProject(Long projectId);
     public int getConnectOnlineCameraNum();
 }

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

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

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

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

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

@@ -1,6 +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.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
@@ -87,6 +88,8 @@ public interface ILargeUnitService extends IService<LargeUnit> {
      */
     public void reallyDeleteLargeUnit(LambdaQueryWrapper<LargeUnit> lqw);
 
+    public List<LargeUnit> getProjectCameraNumList();
+
     public int getConnectUnitNum();
 
     public List<LargeUnit> getAllCameraCondition();

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

@@ -179,8 +179,12 @@ public class LargeCameraServiceImpl extends ServiceImpl<LargeCameraMapper, Large
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
-    public int getConnectCameraNum(){
-        return largeCameraMapper.getConnectCameraNum();
+    public List<LargeCamera> getCameraList(Long projectId){
+        return largeCameraMapper.getCameraList(projectId);
+    }
+
+    public int getCameraNum(){
+        return largeCameraMapper.getCameraNum();
     }
     public List<LargeCamera> getConnectCameraNumByProject(Long projectId){
         return largeCameraMapper.getConnectCameraNumByProject(projectId);

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

@@ -169,6 +169,19 @@ public class LargeIssueServiceImpl extends ServiceImpl<LargeIssueMapper, LargeIs
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
+    public int getIssueNum(){
+        return largeIssueMapper.getIssueNum();
+    }
+
+    public int getOverIssueNum(){
+        return largeIssueMapper.getOverIssueNum();
+    }
+
+    public List<LargeIssue> getIssueListLastWeek(){
+        return largeIssueMapper.getIssueListLastWeek();
+    }
+
+
     public List<LargeIssue> selectList(LargeIssue largeIssue){
         return largeIssueMapper.selectLargeIssueList(largeIssue);
     }

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

@@ -35,8 +35,8 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
                         if (StringUtils.isNotBlank(largeProject.getProjectName())){
                         lqw.like(LargeProject::getProjectName ,largeProject.getProjectName());
                     }
-                        if (StringUtils.isNotNull(largeProject.getUnitId())){
-                        lqw.eq(LargeProject::getUnitId ,largeProject.getUnitId());
+                        if (StringUtils.isNotNull(largeProject.getUnitCode())){
+                        lqw.eq(LargeProject::getUnitCode ,largeProject.getUnitCode());
                     }
                         if (StringUtils.isNotBlank(largeProject.getConnectFlag())){
                         lqw.eq(LargeProject::getConnectFlag ,largeProject.getConnectFlag());
@@ -169,15 +169,18 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
-    public int getProjectNum() {
-        return largeProjectMapper.getProjectNum();
+    public int getProjectNumX(String subdivision) {
+        return largeProjectMapper.getProjectNumX(subdivision);
+    }
+    public int getProjectNumY(String subdivision) {
+        return largeProjectMapper.getProjectNumY(subdivision);
     }
 
-    public int getConnectProjectNum() {
-        return largeProjectMapper.getConnectProjectNum();
+    public List<LargeProject> getCameraNumList(String unitCode){
+        return largeProjectMapper.getCameraNumList(unitCode);
     }
 
-    public List<LargeProject> getConnectProjectByUnit(String appOrg){
-        return largeProjectMapper.getConnectProjectByUnit(appOrg);
+    public int getProjectNumThisWeek(){
+        return largeProjectMapper.getProjectNumThisWeek();
     }
 }

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

@@ -166,6 +166,9 @@ public class LargeUnitServiceImpl extends ServiceImpl<LargeUnitMapper, LargeUnit
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
+    public List<LargeUnit> getProjectCameraNumList(){
+        return largeUnitMapper.getProjectCameraNumList();
+    }
 
     public int getConnectUnitNum(){
         return largeUnitMapper.getConnectUnitNum();

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

@@ -102,9 +102,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM large_camera ${ew.customSqlSegment}
     </delete>
 
-    <select id="getConnectCameraNum" resultType="int">
+    <select id="getCameraList" parameterType="Long" resultMap="LargeCameraResult">
+        select * from large_camera
+        where del_flag = '0' and project_id = #{projectId}
+    </select>
+
+    <select id="getCameraNum" resultType="int">
         select count(*) from large_camera
-        where connect_flag = '0' and del_flag = '0'
+        where del_flag = '0'
     </select>
 
     <select id="getConnectCameraNumByProject" parameterType="Long" resultMap="LargeCameraResult">

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

@@ -95,4 +95,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="reallyDeleteByWrapper">
         DELETE FROM large_issue ${ew.customSqlSegment}
     </delete>
+
+    <select id="getIssueNum" resultType="int">
+        SELECT
+            COUNT(*)
+        FROM
+            large_issue a
+                LEFT JOIN large_project b ON a.project_id = b.id
+        WHERE a.del_flag = 0 AND b.del_flag = 0
+    </select>
+
+    <select id="getOverIssueNum" resultType="int">
+        SELECT
+            COUNT(*)
+        FROM
+            large_issue a
+                LEFT JOIN large_project b ON a.project_id = b.id
+        WHERE a.del_flag = '0' AND b.del_flag = '0' AND a.`status` = '0'
+    </select>
+
+    <select id="getIssueListLastWeek" resultMap="LargeIssueResult">
+        SELECT
+            description,
+            `status`,
+            create_time
+        FROM
+            `large_issue`
+        WHERE
+            DATE(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

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.project.zcustom.domain.unit.LargeProject" id="LargeProjectResult">
         <result property="id"    column="id"    />
         <result property="projectName"    column="project_name"    />
-        <result property="unitId"    column="unit_id"    />
+        <result property="unitCode"    column="unit_code"    />
         <result property="connectFlag"    column="connect_flag"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLargeProjectVo">
-        select id, project_name, unit_id, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_project
+        select id, project_name, unit_code, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_project
     </sql>
 
     <select id="selectLargeProjectList" parameterType="LargeProject" resultMap="LargeProjectResult">
         <include refid="selectLargeProjectVo"/>
         <where>
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="unitId != null "> and unit_id = #{unitId}</if>
+            <if test="unitCode != null "> and unit_code = #{unitCode}</if>
             <if test="connectFlag != null  and connectFlag != ''"> and connect_flag = #{connectFlag}</if>
         </where>
     </select>
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into large_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectName != null">project_name,</if>
-            <if test="unitId != null">unit_id,</if>
+            <if test="unitCode != null">unit_code,</if>
             <if test="connectFlag != null">connect_flag,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectName != null">#{projectName},</if>
-            <if test="unitId != null">#{unitId},</if>
+            <if test="unitCode != null">#{unitCode},</if>
             <if test="connectFlag != null">#{connectFlag},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update large_project
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
-            <if test="unitId != null">unit_id = #{unitId},</if>
+            <if test="unitCode != null">unit_code = #{unitCode},</if>
             <if test="connectFlag != null">connect_flag = #{connectFlag},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -82,18 +82,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM large_project ${ew.customSqlSegment}
     </delete>
 
-    <select id="getProjectNum" resultType="int">
+    <select id="getProjectNumX" parameterType="String" resultType="int">
         select count(*) from large_project
-        where del_flag = '0'
+        where del_flag = '0' and type = '0' and subdivision = #{subdivision}
     </select>
 
-    <select id="getConnectProjectNum" resultType="int">
+    <select id="getProjectNumY" parameterType="String" resultType="int">
         select count(*) from large_project
-        where connect_flag = '0' and del_flag = '0'
+        where del_flag = '0' and type = '2' and subdivision = #{subdivision}
     </select>
 
-    <select id="getConnectProjectByUnit" parameterType="String" resultMap="LargeProjectResult">
-        <include refid="selectLargeProjectVo"/>
-        where connect_flag = '0' and del_flag = '0' and unit_id = #{appOrg}
+    <select id="getCameraNumList" parameterType="String" resultMap="LargeProjectResult">
+        SELECT
+            a.project_name,
+            COUNT(
+                    IF
+                        ( a.del_flag = 0 AND b.del_flag = 0, 1, NULL )) AS cameraNum
+        FROM
+            large_project a
+                LEFT JOIN large_camera b ON a.id = b.project_id
+        WHERE a.del_flag = 0 AND a.unit_code = #{unitCode}
+        GROUP BY a.id
+    </select>
+
+    <select id="getProjectNumThisWeek" resultType="int">
+        SELECT
+            COUNT(*)
+        FROM
+            large_plan a
+                LEFT JOIN large_project b ON a.project_id = b.id
+        WHERE
+            a.del_flag = '0'
+          AND b.del_flag = '0'
+          AND a.type = '0'
+          AND DATE(a.start_time) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+          AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY )
+           OR DATE(a.end_time) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+          AND DATE_ADD(
+            CURDATE(),
+            INTERVAL (
+            8 - DAYOFWEEK(
+            CURDATE())) DAY)
     </select>
 </mapper>

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

@@ -84,6 +84,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM large_unit ${ew.customSqlSegment}
     </delete>
 
+    <select id="getProjectCameraNumList" resultMap="LargeUnitResult">
+        SELECT
+            c.unit_name,
+            COUNT(*) AS projectNum,
+            SUM(t.cameraNum) AS cameraNum
+        FROM
+            (
+                SELECT
+                    a.unit_code,
+                    COUNT(
+                            IF
+                                ( a.del_flag = 0 AND b.del_flag = 0, 1, NULL )) AS cameraNum
+                FROM
+                    large_project a
+                        LEFT JOIN large_camera b ON a.id = b.project_id
+                WHERE a.del_flag = 0
+                GROUP BY a.id
+            ) t
+                LEFT JOIN large_unit c ON t.unit_code = c.unit_code
+        WHERE c.del_flag = 0
+        GROUP BY
+            c.id
+    </select>
+
+
     <select id="getConnectUnitNum" resultType="int">
         select count(*) from large_unit
         where connect_flag = '0' and del_flag = '0'
@@ -91,8 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getAllCameraCondition" resultMap="LargeUnitResult">
         SELECT
-            c.app_org,
-            c.app_name,
+            c.unit_code,
+            c.unit_name,
             COUNT(
                     IF
                         ( a.del_flag = 0 AND a.connect_flag = 0, 1, NULL )) AS cameraNum,
@@ -102,15 +127,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             `large_camera` a
                 LEFT JOIN large_project b ON a.project_id = b.id
-                LEFT JOIN large_unit c ON b.unit_id = c.app_org
+                LEFT JOIN large_unit c ON b.unit_code = c.unit_code
         GROUP BY
-            c.app_org
+            c.unit_code
     </select>
 
     <select id="getCameraConditionByAppOrg" parameterType="String" resultMap="LargeUnitResult">
         SELECT
-            c.app_org,
-            c.app_name,
+            c.unit_code,
+            c.unit_name,
             COUNT(
                     IF
                         ( a.del_flag = 0 AND a.connect_flag = 0, 1, NULL )) AS cameraNum,
@@ -120,8 +145,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             `large_camera` a
                 LEFT JOIN large_project b ON a.project_id = b.id
-                LEFT JOIN large_unit c ON b.unit_id = c.app_org
+                LEFT JOIN large_unit c ON b.unit_code = c.unit_code
         WHERE
-            c.app_org = #{appOrg}
+            c.unit_code = #{unitCode}
     </select>
 </mapper>