Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/IAlertStatisticsService.java

@@ -13,6 +13,4 @@ public interface IAlertStatisticsService {
     void statisticalGeneration(String type);
 
     List<AlertStatistics> getList(String date) throws ParseException;
-
-    JSONArray statisticInfoByRegionAndDate(DPFilterParamDto queryParams);
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/StatisticsController.java

@@ -350,14 +350,4 @@ public class StatisticsController extends BaseController {
         ExcelUtil.createTemplate(response, "困人救援超时情况统计", "困人救援超时情况统计", exportVos, AlertDispatchStatisticsExportVo.class, null, false);
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping (value = "/region/info")
-    @ApiOperation(httpMethod = "POST", value = "查询区域统计信息", notes = "查询区域统计信息")
-    public ResponseModel<JSONArray> statisticsRegionInfo(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
-        List<FieldError> fieldErrors = result.getFieldErrors();
-        if (!fieldErrors.isEmpty()) {
-            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
-        }
-        return ResponseHelper.buildResponse(alertStatisticsService.statisticInfoByRegionAndDate(dpFilterParamDto));
-    }
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/TzsAuthController.java

@@ -73,7 +73,6 @@ public class TzsAuthController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "获取用户regionCode", notes = "获取用户regionCode")
 	public ResponseModel<List<String>> getUserRegincode() {
 		List<String> regionList = tzsAuthService.getUserRegionCode();
-		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
 		return ResponseHelper.buildResponse(regionList);
 	}
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertStatisticsServiceImpl.java

@@ -168,100 +168,4 @@ public class AlertStatisticsServiceImpl extends BaseService<AlertStatisticsDto,
         return alertStatistics;
     }
 
-    @Override
-    public JSONArray statisticInfoByRegionAndDate(DPFilterParamDto params) {
-        LocalDate today = LocalDate.now();
-        LocalDate startDate;
-        LocalDate endDate;
-        String regionCode = params.getCityCode();
-        if (ObjectUtils.isEmpty(params.getBeginDate()) || ObjectUtils.isEmpty(params.getBeginDate())) {
-            startDate = today.minusDays(6);
-            endDate = today;
-        } else {
-            startDate = LocalDate.parse(params.getBeginDate());
-            endDate = LocalDate.parse(params.getEndDate());
-        }
-        params.setBeginDate(startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        params.setEndDate(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        AlertStatistics statistics = this.baseMapper.statisticsInfoByRegionAndDate(regionCode, startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        JSONArray jsonArray = new JSONArray();
-        if (!ObjectUtils.isEmpty(statistics)) {
-            JSONObject jsonObject0 = new JSONObject();
-            jsonObject0.put("key", "dtkr");
-            jsonObject0.put("value", ValidationUtil.isEmpty(statistics.getTrappedPeople()) ? 0 : statistics.getTrappedPeople());
-            jsonObject0.put("name", "电梯困人");
-
-            JSONObject jsonObject1 = new JSONObject();
-            jsonObject1.put("key", "slts");
-            jsonObject1.put("value", ValidationUtil.isEmpty(statistics.getComplaint()) ? 0 : statistics.getComplaint());
-            jsonObject1.put("name", "受理投诉");
-
-            JSONObject jsonObject2 = new JSONObject();
-            jsonObject2.put("key", "gzbx");
-            jsonObject2.put("value", ValidationUtil.isEmpty(statistics.getBreakdownRescue()) ? 0 : statistics.getBreakdownRescue());
-            jsonObject2.put("name", "故障维修");
-
-            JSONObject jsonObject3 = new JSONObject();
-            jsonObject3.put("key", "jjbkck");
-            jsonObject3.put("value", ValidationUtil.isEmpty(statistics.getRescuePersonnel()) ? 0 : statistics.getRescuePersonnel());
-            jsonObject3.put("name", "解救被困乘客");
-
-            JSONObject jsonObject4 = new JSONObject();
-            jsonObject4.put("key", "30fzdd");
-            jsonObject4.put("value", ValidationUtil.isEmpty(statistics.getWithinThirtyRescue()) ? 0 : statistics.getWithinThirtyRescue());
-            jsonObject4.put("name", "30分钟内到达");
-
-            JSONObject jsonObject5 = new JSONObject();
-            jsonObject5.put("key", "pjjysj");
-            jsonObject5.put("value", ValidationUtil.isEmpty(statistics.getAvgTime()) ? 0 : statistics.getAvgTime());
-            jsonObject5.put("name", "平均救援时间");
-
-            String orgCode = this.getAndSetOrgCode(regionCode);
-            JSONObject jsonObject6 = new JSONObject();
-            jsonObject6.put("key", "jycq");
-            jsonObject6.put("value", this.getQuestionNumber("检验超期",params, orgCode));
-            jsonObject6.put("name", "检验超期");
-            
-            JSONObject jsonObject7 = new JSONObject();
-            jsonObject7.put("key", "jybhg");
-            jsonObject7.put("value", this.getQuestionNumber("检验不合格",params, orgCode));
-            jsonObject7.put("name", "检验不合格");
-
-            JSONObject jsonObject8 = new JSONObject();
-            jsonObject8.put("key", "wbcq");
-            jsonObject8.put("value", this.getQuestionNumber("维保超期",params, orgCode));
-            jsonObject8.put("name", "维保超期");
-
-            JSONObject jsonObject9 = new JSONObject();
-            jsonObject9.put("key", "csjsynx");
-            jsonObject9.put("value", this.getQuestionNumber("超设计使用年限",params, orgCode));
-            jsonObject9.put("name", "超设计使用年限");
-            jsonArray.add(jsonObject0);
-            jsonArray.add(jsonObject1);
-            jsonArray.add(jsonObject2);
-            jsonArray.add(jsonObject3);
-            jsonArray.add(jsonObject4);
-            jsonArray.add(jsonObject5);
-            jsonArray.add(jsonObject6);
-            jsonArray.add(jsonObject7);
-            jsonArray.add(jsonObject8);
-            jsonArray.add(jsonObject9);
-        }
-        return jsonArray;
-    }
-
-    private Long getQuestionNumber(String problemType, DPFilterParamDto params, String orgCode) {
-        return this.getBaseMapper().countProblemByTypeDateAndOrgCode(problemType, params, orgCode);
-    }
-
-    private String getAndSetOrgCode(String region) {
-        String orgCode = regionCodeOrgCodeMap.get(region);
-        if (orgCode == null) {
-            orgCode = this.getBaseMapper().getOrgCodeByCompanyCode(region);
-            if (orgCode != null) {
-                regionCodeOrgCodeMap.put(region, orgCode);
-            }
-        }
-        return orgCode;
-    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamDto.java

@@ -36,4 +36,8 @@ public class DPFilterParamDto {
      * month , year
      */
     private String searchType;
+    /**
+     * 1生产单位 2使用单位 3充装单位 4检验检测机构
+     */
+    private String companyType;
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UnitTypeEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+
+@Getter
+public enum UnitTypeEnum {
+    //type 1生产单位 2使用单位 3充装单位 4检验检测机构
+    //制造单位
+    ZZDW("制造单位","1236","1"),
+    //设计单位
+    SJDW("设计单位","1235","1"),
+    //安改维单位
+    AGWDW("安装改造维修单位","1234","1"),
+    //使用单位
+    SYDW("使用单位","1232","2"),
+    //充装单位
+    CZDW("充装单位","1231","3"),
+    //检验检测机构
+    JYJCJG("检验检测机构","1233","4"),
+
+    ;
+
+    String name;
+    String code;
+    String type;
+
+    private UnitTypeEnum(String name, String code, String type) {
+        this.name = name;
+        this.code = code;
+        this.type = type;
+    }
+
+    public static List<String> getNameListByType(String type) {
+        List<String> list = new ArrayList<>();
+        for (UnitTypeEnum testEnum : EnumSet.allOf(UnitTypeEnum.class)) {
+            if (testEnum.getType().equals(type)) {
+                list.add(testEnum.getName());
+            }
+        }
+        return list;
+    }
+
+
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UserPostEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.Getter;
+
+import java.util.*;
+
+@Getter
+public enum UserPostEnum {
+    //type 1生产单位 2使用单位 3充装单位 4检验检测机构
+    //主要负责人
+    ZYFZR("主要负责人","6548","1,2,3"),
+    //质量安全总监
+    ZLAQZJ("质量安全总监","6550","1"),
+    //质量安全员
+    ZLAQY("质量安全员","6551","1"),
+    //作业人员
+    ZYRY("作业人员","6552","1,2,3,4"),
+    //检验人员
+    ZJRY("检验人员","66151","1,4"),
+    //检测人员
+    JCRY("检测人员","66152","1,4"),
+    //安全总监
+    AQZJ("安全总监","6547","2,3"),
+    //安全员
+    AQY("安全员","6549","2,3"),
+
+
+    //质量保证体系人员（非字典表字段，后期修改code）
+    ZLBZTXRY("质量保证体系人员","nullnull","1,3,4"),
+    ;
+
+    String name;
+    String code;
+    String type;
+
+    private UserPostEnum(String name, String code, String type) {
+        this.name = name;
+        this.code = code;
+        this.type = type;
+    }
+
+    public static List<Map<String,String>> getEnumListByType(String type) {
+        List<Map<String,String>> list = new ArrayList<>();
+        for (UserPostEnum testEnum : EnumSet.allOf(UserPostEnum.class)) {
+            Map<String,String> map = new HashMap<>();
+            if (testEnum.getType().contains(type)) {
+                map.put("name",testEnum.getName());
+                map.put("code",testEnum.getCode());
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeController.java

@@ -64,7 +64,9 @@ public class JgReformNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新改造告知", notes = "根据sequenceNbr更新改造告知")
-    public ResponseModel<JgReformNoticeDto> updateBySequenceNbrJgReformNotice(@RequestParam String submitType, @RequestBody JgReformNoticeDto installationInfo, @RequestParam(value = "op", required = false) String op) {
+    public ResponseModel<JgReformNoticeDto> updateBySequenceNbrJgReformNotice(@RequestParam String submitType,
+                                                                              @RequestBody JgReformNoticeDto installationInfo,
+                                                                              @RequestParam(value = "op", required = false) String op) {
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数installationInfo不能为空");
         }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/AlertStatisticsMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.statistics.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author system_generator
  * @date 2023-11-02
  */
+@Mapper
 public interface AlertStatisticsMapper extends BaseMapper<AlertStatistics> {
 
     AlertStatistics getStatisticsMessage(@Param("orgCode") String orgCode, @Param("startDate") String startDate, @Param("endDate") String endDate);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/ZLStatisticsMapper.java

@@ -26,4 +26,6 @@ public interface ZLStatisticsMapper {
     List<Map<String, Object>> supervisorCount(@Param("screenDto") DPFilterParamDto screenDto);
 
     String getOrgCodeByCompanyCode(@Param("cityCode") String cityCode);
+
+    List<Map<String, String>> userCountNew(@Param("screenDto") DPFilterParamDto screenDto, @Param("unitTypeList") List<String> unitTypeList);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml

@@ -11,7 +11,7 @@
 				 WHERE company_code = #{screenDto.cityCode}
 			 ) AS subquery
 				 JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT(subquery.org_code, '%')
-		where bi.equip_category is not null and bi.equip_category != '[]' and bi.unit_type is not null;
+		where  bi.unit_type is not null
 	</select>
 	<select id="testOrg" resultType="java.util.Map">
 		SELECT COUNT(1),
@@ -35,7 +35,7 @@
 					INNER JOIN tzs_user_info tui ON bi.use_unit_code = tui.unit_code
 		WHERE
 			tui.post LIKE concat ( '%', '6552', '%' )
-		  AND bi.unit_type IS NOT NULL;
+		  AND bi.unit_type IS NOT NULL
 	</select>
 	<select id="supervisorCount" resultType="java.util.Map">
 		SELECT
@@ -52,6 +52,23 @@
     <select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
 		select org_code from privilege_company where company_code = #{cityCode} limit 1
 	</select>
+	<select id="userCountNew" resultType="java.util.Map">
+		SELECT
+			tui.post
+		FROM
+			( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
+				INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
+				INNER JOIN tzs_user_info tui ON bi.use_unit_code = tui.unit_code
+		WHERE
+		  bi.unit_type IS NOT NULL
+		  AND tui.post IS NOT NULL
+		  <if test="unitTypeList != null and unitTypeList.size() > 0">
+			AND
+			<foreach collection="unitTypeList" item="unitType" open="(" separator="OR" close=")">
+				bi.unit_type LIKE concat ( '%', #{unitType}, '%' )
+			</foreach>
+		  </if>
+	</select>
 
 </mapper>
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/AQZSDPStatisticsController.java

@@ -63,7 +63,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "问题类型主体统计")
+    @ApiOperation(value = "大屏-安全追溯-左屏-问题类型主体统计")
     @PostMapping(value = "/mainBodyCount")
     public ResponseModel<Map<String, Object>> mainBodyCount(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -76,7 +76,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "设备问题近30天统计")
+    @ApiOperation(value = "大屏-安全追溯-左屏-设备问题近30天统计")
     @PostMapping(value = "/equipmentCount")
     public ResponseModel<Map<String, Object>> equipmentCount(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -89,7 +89,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "企业问题近30天统计")
+    @ApiOperation(value = "大屏-安全追溯-左屏-企业问题近30天统计")
     @PostMapping(value = "/companyCount")
     public ResponseModel<List<Map<String, Object>>> companyCount(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -102,7 +102,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "人员问题近30天统计")
+    @ApiOperation(value = "大屏-安全追溯-左屏-人员问题近30天统计")
     @PostMapping(value = "/personCount")
     public ResponseModel<Map<String, Object>> personCount(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -116,7 +116,7 @@ public class AQZSDPStatisticsController {
     ;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "气瓶问题近30天统计")
+    @ApiOperation(value = "大屏-安全追溯-左屏-气瓶问题近30天统计")
     @PostMapping(value = "/cylinderCount")
     public ResponseModel<Map<String, Object>> cylinderCount(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -129,7 +129,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "按月统计近12个月的问题数量趋势")
+    @ApiOperation(value = "大屏-安全追溯-右屏-按月统计近12个月的问题数量趋势")
     @PostMapping(value = "/issueCountByMonth")
     public ResponseModel<Map<String, Object>> issueCountByMonth(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -142,7 +142,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "按月统计近30天的问题数量趋势")
+    @ApiOperation(value = "大屏-安全追溯-右屏-按月统计近30天的问题数量趋势")
     @PostMapping(value = "/issueCountByDay")
     public ResponseModel<Map<String, Object>> issueCountByDay(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -154,7 +154,7 @@ public class AQZSDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "当前区域数据统计")
+    @ApiOperation(value = "大屏-安全追溯-中屏-当前区域数据统计")
     @PostMapping(value = "/issueCountByCityCode")
     public ResponseModel<Map<String, Object>> issueCountByCityCode(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -167,7 +167,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "当前区域子区域数据统计")
+    @ApiOperation(value = "大屏-安全追溯-中屏-当前区域子区域数据统计")
     @PostMapping(value = "/issueChildrenCityCount")
     public ResponseModel<List<Map<String, Object>>> issueChildrenCityCount(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -180,7 +180,7 @@ public class AQZSDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "当月问题列表（主体类型、问题类型、问题时间、操作）")
+    @ApiOperation(value = "大屏-安全追溯-左屏-当月问题列表（主体类型、问题类型、问题时间、操作）")
     @PostMapping(value = "/issueMonthList")
     public ResponseModel<List<Map<String, Object>>> issueMonthList(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -192,7 +192,7 @@ public class AQZSDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "当年问题等级分类统计")
+    @ApiOperation(value = "大屏-安全追溯-右屏-当年问题等级分类统计")
     @PostMapping(value = "/issueProblemLevelCount")
     public ResponseModel<Map<String, Object>> issueProblemLevelCount(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -204,7 +204,7 @@ public class AQZSDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "按问题类型排名top 10")
+    @ApiOperation(value = "大屏-安全追溯-右屏-按问题类型排名top 10")
     @PostMapping(value = "/issueCompanyTop")
     public ResponseModel<List<Map<String, Object>>> issueCompanyTop(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -227,7 +227,7 @@ public class AQZSDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "当年下级区域问题闭环率排名")
+    @ApiOperation(value = "大屏-安全追溯-右屏-当年下级区域问题闭环率排名")
     @PostMapping(value = "/issueChildrenCityCountTop")
     public ResponseModel<List<Map<String, Object>>> issueChildrenCityCountTop(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
@@ -239,7 +239,7 @@ public class AQZSDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "按问题类型排名top 10")
+    @ApiOperation(value = "大屏-安全追溯-右屏-按问题类型排名top 10")
     @PostMapping(value = "/issueCountTopByProblemType")
     public ResponseModel<List<Map<String, Object>>> issueCountTopByProblemType(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JGDPStatisticsController.java

@@ -228,7 +228,7 @@ public class JGDPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏监管-中屏-各地市数据统计", notes = "大屏监管-中屏-各地市数据统计")
-    @PostMapping(value = "/jg/centre/dataStatistic")
+    @PostMapping(value = "/centre/dataStatistic")
     public ResponseModel<List<Map<String, Object>>> dataStatisticByReginCode(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -239,7 +239,7 @@ public class JGDPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏监管-中屏-当前区域数据统计", notes = "大屏监管-中屏-当前区域数据统计")
-    @PostMapping(value = "/jg/centre/dataStatisticCount")
+    @PostMapping(value = "/centre/dataStatisticCount")
     public ResponseModel<Map<String, Object>> dataStatisticCountByReginCode(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/StCommonController.java

+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
+
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+
+@RestController
+@Api(tags = "统计公共API")
+@RequestMapping(value = "/st-common")
+public class StCommonController {
+
+    StCommonServiceImpl commonService;
+
+    /**
+     * 获取用户regionCode
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUserRegincode")
+    @ApiOperation(httpMethod = "GET", value = "获取用户regionCode", notes = "获取用户regionCode")
+    public ResponseModel<List<String>> getUserRegincode() {
+        List<String> regionList = commonService.getUserRegionCode();
+        return ResponseHelper.buildResponse(regionList);
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ZLDPStatisticsController.java

 package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ZLDPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -37,36 +42,54 @@ public class ZLDPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/companyInfo")
-    @ApiOperation(httpMethod = "POST", value = "大屏企业统计", notes = "大屏企业统计")
+    @ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-企业统计", notes = "大屏-总览-左屏-企业统计")
     public ResponseModel<List<Map<String, Object>>> companyInfo(@RequestBody DPFilterParamDto screenDto) {
         return ResponseHelper.buildResponse(statisticsService.companyInfo(screenDto));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/testOrg")
-    @ApiOperation(httpMethod = "POST", value = "大屏检测机构统计", notes = "大屏检测机构统计")
+    @ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-检测机构统计", notes = "大屏-总览-左屏-检测机构统计")
     public ResponseModel<List<Map<String, Object>>> testOrg(@RequestBody DPFilterParamDto screenDto) {
         return ResponseHelper.buildResponse(statisticsService.testOrg(screenDto));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/userCount")
-    @ApiOperation(httpMethod = "POST", value = "大屏人员统计", notes = "大屏人员统计")
+    @ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-人员统计", notes = "大屏-总览-左屏-人员统计")
     public ResponseModel<Map<String, Object>> userCount(@RequestBody DPFilterParamDto screenDto) {
         return ResponseHelper.buildResponse(statisticsService.userCount(screenDto));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/userCountNew")
+    @ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-人员统计新", notes = "大屏-总览-左屏-人员统计")
+    public ResponseModel<Map<String, Object>> userCountNew(@RequestBody DPFilterParamDto screenDto) {
+        return ResponseHelper.buildResponse(statisticsService.userCountNew(screenDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/supervisorCount")
-    @ApiOperation(httpMethod = "POST", value = "大屏行业主管部门统计", notes = "大屏行业主管部门统计")
+    @ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-行业主管部门统计", notes = "大屏-总览-左屏-行业主管部门统计")
     public ResponseModel<Map<String, Object>> supervisorCount(@RequestBody DPFilterParamDto screenDto) {
         return ResponseHelper.buildResponse(statisticsService.supervisorCount(screenDto));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/equipmentInformCount")
-    @ApiOperation(httpMethod = "POST", value = "大屏设备使用场所统计", notes = "大屏设备使用场所统计")
+    @ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-设备使用场所统计", notes = "大屏-总览-左屏-设备使用场所统计")
     public ResponseModel<List<Map<String, Object>>> equipmentInformCount(@RequestBody DPFilterParamDto screenDto) {
         return ResponseHelper.buildResponse(statisticsService.equipmentInformCount(screenDto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "/region/info")
+    @ApiOperation(httpMethod = "POST", value = "查询区域统计信息", notes = "查询区域统计信息")
+    public ResponseModel<JSONArray> statisticsRegionInfo(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.statisticInfoByRegionAndDate(dpFilterParamDto));
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

+package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
+
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class StCommonServiceImpl {
+
+    public List<String> getUserRegionCode() {
+        List<String> regionList = new ArrayList<>();
+        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+        CompanyModel userCompany = me.getCompanys().get(0);
+        String regions = userCompany.getRegionSeq();
+        if(regions != null) {
+            String[] regionsId = regions.split(",");
+            for(String regionId:regionsId) {
+                RegionModel region = Systemctl.regionClient.getRegion(Long.valueOf(regionId)).getResult();
+                regionList.add(region.getRegionCode() + "");
+            }
+        }
+        return regionList;
+    }
+}