Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/DPMapStatisticsItemEnum.java

@@ -30,6 +30,9 @@ public enum DPMapStatisticsItemEnum {
     GAS_UNITS("充装单位 (家)", "gasUnits", ""),
     OPERATORS("作业人员 (人)", "operators", ""),
     DEVICE_COUNT("已纳管设备数", "deviceCount", ""),
+    PERSON_ISSUES_COUNT("个人问题数", "个人", ""),
+    COMPANY_ISSUES_COUNT("企业问题数", "企业", ""),
+    EQU_ISSUES_COUNT("设备数", "设备", ""),
     CERTIFICATE_COUNT("登记证总量", "certificateCount", "");
     private String label;
     private String code;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl

@@ -2332,7 +2332,7 @@
                                         </w:rPr>
                                     </w:pPr>
 
-                                    <#list installLicenseExpirationDateList as item1>
+                                    <#list equipList.installLicenseExpirationDateList as item1>
                                         <w:r>
                                             <w:rPr>
                                                 <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>

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

@@ -62,4 +62,5 @@ public interface AQZSDPStatisticsMapper {
 
     Map<String, Object> getInspectionResultRate(@Param(value = "orgCode") String orgCode, @Param(value = "appId") String appId);
 
+    List<Map<String, Object>> selectByOrg(String orgCode);
 }

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

@@ -306,6 +306,18 @@
           and cu.supervise_org_code like concat(#{orgCode}, '%')
         GROUP BY strKey
     </select>
+
+	<select id="selectByOrg" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			source_type AS sourceType
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		GROUP BY
+			source_type
+	</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

@@ -241,4 +241,26 @@ public class AQZSDPStatisticsController {
         List<Map<String, Object>> result = statisticsService.issueCountTopByProblemType(regionCode.toString());
         return ResponseHelper.buildResponse(result);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-中间地图左右两侧8大类、单位、人员数量、问题数量全局统计", notes = "大屏中间-地图左右两侧8大类、单位、人员数量、问题数量全局统计")
+    @PostMapping(value = "/center-map/legend")
+    public ResponseModel<Map<String, Object>> centerMapCountForGlobal(@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.getCenterMapCountDataForGlobal(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "安全追溯大屏-中间地图地市统计", notes = "安全追溯大屏中间-地图地市统计")
+    @PostMapping(value = "/center-map/overview")
+    public ResponseModel<List<Map<String, Object>>> centerMapCountForOverview(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getCenterMapCountDataForOverview(dpFilterParamDto));
+    }
 }

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

 package com.yeejoin.amos.boot.module.statistcs.biz.init;
 
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.AQZSDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JGDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -16,14 +17,17 @@ public class DataInitAfterRuning implements ApplicationRunner {
 
     private JGDPStatisticsServiceImpl jgdpStatisticsService;
 
+    private AQZSDPStatisticsServiceImpl aqzsdpStatisticsService;
+
     private StCommonServiceImpl stCommonService;
 
     private AmosRequestContext amosRequestContext;
 
-    public DataInitAfterRuning(JGDPStatisticsServiceImpl jgdpStatisticsService, StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext) {
+    public DataInitAfterRuning(JGDPStatisticsServiceImpl jgdpStatisticsService, StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext, AQZSDPStatisticsServiceImpl aqzsdpStatisticsService) {
         this.jgdpStatisticsService = jgdpStatisticsService;
         this.stCommonService = stCommonService;
         this.amosRequestContext = amosRequestContext;
+        this.aqzsdpStatisticsService = aqzsdpStatisticsService;
     }
 
     @Override
@@ -34,5 +38,6 @@ public class DataInitAfterRuning implements ApplicationRunner {
         RequestContext.setToken(amosRequestContext.getToken());
         jgdpStatisticsService.init();
         stCommonService.init();
+        aqzsdpStatisticsService.init();
     }
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipTechParamPipelineMapper.java

@@ -2,8 +2,9 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
+@Mapper
 public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamPipeline> {
     /**
      * 在用的最新需求整理的技术参数--需求未出

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.UseUnitCreditCodeCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -19,6 +20,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2021-10-20
  */
+@Mapper
 public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     @Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +18,7 @@ import java.util.List;
  * @author duanwei
  * @date 2022-08-10
  */
+@Mapper
 public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseInfo> {
 
     /**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzsUserInfoMapper.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
+@Mapper
 public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     Page<TzsUserInfoDto> selectPageMessage(@Param("page") Page<TzsUserInfoDto> page, @Param("dto") TzsUserInfoDto dto);