工程现场监控接口修改

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

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/large/production")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -40,4 +42,20 @@ public class PlatProjectProductionController extends BaseController {
     public AjaxResult getProjectNumY(@PathVariable String appOrg) {
         return AjaxResult.success("查询成功", largeProjectService.getProjectNumY(appOrg));
     }
+
+    /**
+     * 查询对应市的项目信息
+     */
+    @GetMapping("/getProjectByAppOrg/{appOrg}")
+    public AjaxResult getProjectByAppOrg(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectByAppOrg(appOrg));
+    }
+
+    /**
+     * 获取各个市的在建和施工项目数量
+     */
+    @GetMapping("/getProjectNumZ/{appOrg}")
+    public AjaxResult getProjectNumZ(@PathVariable List<String> appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumZ(appOrg));
+    }
 }

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

@@ -57,13 +57,19 @@ public class LargeProject extends CustomBaseEntity {
     private BigDecimal ordinate;
 
     /**
-     * 所属单位id
+     * 所属单位编码
      */
     @Excel(name = "所属单位编码")
     @ApiModelProperty("所属单位编码")
     private String appOrg;
 
     /**
+     * 所属单位的父单位编码
+     */
+    @TableField(exist = false)
+    private String appParentOrg;
+
+    /**
      * 项目类型
      */
     @Excel(name = "项目类型")

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

@@ -1,6 +1,8 @@
 package com.project.zcustom.mapper.unit;
 
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.project.zcustom.domain.addional.LargeProject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -68,7 +70,11 @@ public interface LargeProjectMapper extends BaseMapper<LargeProject>
 
     public List<LargeProject> getProjectNumY(String appOrg);
 
+    public List<LargeProject> getProjectByAppOrg(String appOrg);
+
     public List<LargeProject> getCameraNumList(String appOrg);
 
     public int getProjectNumThisWeek(String appOrg);
+
+    public List<LargeProject> getProjectNumZ(List<String> appOrg);
 }

project-zcustom/src/main/java/com/project/zcustom/service/logistics/ILargePlatAssetService.java

@@ -22,11 +22,11 @@ public interface ILargePlatAssetService {
 
     public LargeLogistics getMainlyRate(String appOrg);
 
-    public List<LargeLogistics> getSceneRate(int flag);
+    public Map<String, Object> getSceneRate(int flag);
 
     public List<LargeLogistics> getOperation(String appOrg);
 
-    public List<LargeLogistics> getInspectionSchemeNumX();
+    public Map<String, Object> getInspectionSchemeNumX();
 
-    public List<LargeLogistics> getInspectionSchemeNumY();
+    public Map<String, Object> getInspectionSchemeNumY();
 }

project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargePlatAssetServiceImpl.java

@@ -6,6 +6,7 @@ import com.project.zcustom.service.logistics.ILargePlatAssetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -58,29 +59,58 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         return platLogisticsMapper.getMainlyRate(appOrg);
     }
 
-    public List<LargeLogistics> getSceneRate(int flag){
+    public Map<String, Object> getSceneRate(int flag){
         List<LargeLogistics> list;
+        List<String> list1 = new ArrayList<>();
+        List<BigDecimal> list2 = new ArrayList<>();
         if (flag == 0){
             list = platLogisticsMapper.getSceneRateX();
+            for (LargeLogistics it : list){
+                it.setAppName(it.getAppName().substring(2, 4));
+            }
         }
         else {
             list = platLogisticsMapper.getSceneRateY();
         }
         for (LargeLogistics it : list){
-            it.setAppName(it.getAppName().substring(2, 4));
+            list1.add(it.getAppName());
+            list2.add(it.getSceneRate());
         }
-        return list;
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
+        map.put("yList", list2);
+        return map;
     }
 
     public List<LargeLogistics> getOperation(String appOrg){
         return platLogisticsMapper.getOperation(appOrg);
     }
 
-    public List<LargeLogistics> getInspectionSchemeNumX(){
-        return platLogisticsMapper.getInspectionSchemeNumX();
+    public Map<String, Object> getInspectionSchemeNumX(){
+        List<LargeLogistics> list = platLogisticsMapper.getInspectionSchemeNumX();
+        List<String> list1 = new ArrayList<>();
+        List<Long> list2 = new ArrayList<>();
+        for (LargeLogistics it : list){
+            list1.add(it.getAppName().substring(2, 4));
+            list2.add(it.getInspectionSchemeNum());
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
+        map.put("yList", list2);
+        return map;
     }
 
-    public List<LargeLogistics> getInspectionSchemeNumY(){
-        return platLogisticsMapper.getInspectionSchemeNumY();
+    public Map<String, Object> getInspectionSchemeNumY(){
+        List<LargeLogistics> list = platLogisticsMapper.getInspectionSchemeNumY();
+        List<String> list1 = new ArrayList<>();
+        List<Long> list2 = new ArrayList<>();
+        for (LargeLogistics it : list){
+            list1.add(it.getAppName());
+            list2.add(it.getInspectionSchemeNum());
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
+        map.put("yList", list2);
+        return map;
     }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 工程项目Service接口
@@ -93,7 +94,11 @@ public interface ILargeProjectService extends IService<LargeProject> {
 
     public List<LargeProject> getProjectNumY(String appOrg);
 
+    public List<LargeProject> getProjectByAppOrg(String appOrg);
+
     public List<LargeProject> getCameraNumList(String appOrg);
 
     public int getProjectNumThisWeek(String appOrg);
+
+    public Map<String, Object> getProjectNumZ(List<String> appOrg);
 }

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

@@ -13,7 +13,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.utils.StringUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 工程项目Service业务层处理
@@ -180,6 +183,10 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
         return largeProjectMapper.getProjectNumY(appOrg);
     }
 
+    public List<LargeProject> getProjectByAppOrg(String appOrg){
+        return largeProjectMapper.getProjectByAppOrg(appOrg);
+    }
+
     public List<LargeProject> getCameraNumList(String appOrg){
         return largeProjectMapper.getCameraNumList(appOrg);
     }
@@ -187,4 +194,29 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
     public int getProjectNumThisWeek(String appOrg){
         return largeProjectMapper.getProjectNumThisWeek(appOrg);
     }
+
+    public Map<String, Object> getProjectNumZ(List<String> appOrg){
+        List<LargeProject> list = largeProjectMapper.getProjectNumZ(appOrg);
+        Map<String, Object> map = new HashMap<>();
+        List<Integer> list1 = new ArrayList<>();
+        List<Integer> list2 = new ArrayList<>();
+        for (String app : appOrg){
+            int x = 0, y = 0;
+            for (LargeProject project : list){
+                if (project.getAppOrg().equals(app) || project.getAppParentOrg().equals(app)){
+                    if (project.getSubdivision().equals(1L)){
+                        x++;
+                    }
+                    else {
+                        y++;
+                    }
+                }
+            }
+            list1.add(x);
+            list2.add(y);
+            map.put("list1", list1);
+            map.put("list2", list2);
+        }
+        return map;
+    }
 }

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="projectName"    column="project_name"    />
         <result property="appOrg"    column="app_org"    />
+        <result property="appParentOrg"    column="app_parent_org"    />
         <result property="connectFlag"    column="connect_flag"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="subdivision"    column="subdivision"    />
@@ -127,6 +128,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             subdivision
     </select>
 
+    <select id="getProjectByAppOrg" parameterType="String" resultMap="LargeProjectResult">
+        SELECT
+            a.project_name,
+            a.abscissa,
+            a.ordinate
+        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'
+          AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )
+    </select>
+
     <select id="getCameraNumList" parameterType="String" resultMap="LargeProjectResult">
         SELECT
             a.project_name,
@@ -158,4 +173,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             OR DATE( a.end_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
             AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY ))
     </select>
+
+    <select id="getProjectNumZ" parameterType="String" resultMap="LargeProjectResult">
+        SELECT
+            a.project_name,
+            a.app_org,
+            b.app_parent_org,
+            CASE
+
+                WHEN subdivision > 10 THEN
+                    0 ELSE 1
+                END AS 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'
+    </select>
 </mapper>