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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -61,7 +61,7 @@ public class ControllerAop {
 	/**
 	 * saveUserRedis设置过期时间
 	 */
-	@Value("${redis.cache.failure.time}")
+	@Value("${redis.cache.failure.time:10800}")
 	private Long redisRegionTimeSecond;
 
 	@Autowired

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -40,7 +40,7 @@ public class DataDictionaryController extends BaseController {
 	@Autowired
 	RedisUtils redisUtils;
 
-	@Value("${redis.cache.failure.time}")
+	@Value("${redis.cache.failure.time:10800}")
 	private long time;
 
 	@Autowired

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/ScreenDto.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/KeyValueDto.java

-package com.yeejoin.amos.boot.module.tcm.api.dto;
-
+package com.yeejoin.amos.boot.biz.common.dto;
 
 import lombok.Data;
 
+/**
+ * @author Administrator
+ */
 @Data
-public class ScreenDto {
-    /**
-     * 城市编码
-     */
-    String cityCode;
+public class KeyValueDto {
+
+    private String strKey;
+
+    private Integer iValue;
 
+    private String strValue;
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/DataDictionaryServiceImpl.java

@@ -30,7 +30,7 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
     @Autowired
     RedisUtils redisUtils;
 
-    @Value("${redis.cache.failure.time}")
+    @Value("${redis.cache.failure.time:10800}")
     private long time;
     @Autowired
     DataDictionaryMapper dataDictionaryMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/RestTemplateUtils.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RestTemplateUtils.java

-package com.yeejoin.amos.boot.module.jyjc.biz.util;
+package com.yeejoin.amos.boot.biz.common.utils;
 
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/StringUtils.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/StringUtils.java

-package com.yeejoin.amos.boot.module.jyjc.biz.util;
+package com.yeejoin.amos.boot.biz.common.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

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

@@ -12,7 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface YjBaseMapper {
 
-    CompanyModel selectOneCompanyByCode(String companyCode);
-
     String getOrgCodeByCompanyCode(String companyCode);
 }

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/AlertCalledServiceImpl.java

@@ -866,10 +866,10 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
             // 当天接警
             alarmStatisticsDto.setTodayAlarmNum(
-                    map.get("calledCount") == null ? 0 : map.get("calledCount"));
+                    map.get("calledCount") == null ? 0L : map.get("calledCount"));
             // 当天提交
             alarmStatisticsDto.setSubmitNum(
-                    map.get("majorAlertCount") == null ? 0 : map.get("majorAlertCount"));
+                    map.get("majorAlertCount") == null ? 0L : map.get("majorAlertCount"));
             alarmStatisticsDto.setAllNum(this.count(allNumQueryWrapper));
 
 

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/core/framework/PersonIdentifyAspect.java

@@ -30,7 +30,7 @@ public class PersonIdentifyAspect {
 
     @Autowired
     RedisUtils redisUtils;
-    @Autowired
+    @Autowired(required = false)
     private IOrgUsrService orgUsrService;
 
     @Before(value = "@annotation(com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify) && @annotation(permission)")

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+@Data
+public class CylinderFillingRecordStatisticsDto {
+    private String time;
+    private String fillingQuantity;
+    private String offloadingVolume;
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+@Data
+public class CylinderInfoStatisticsDto {
+    private String unitName;
+    private String 	city;
+    private String 	province;
+    private String 	district;
+    private Double num;
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/AlertRescueStatistics.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-11-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_alert_rescue_statistics")
+public class AlertRescueStatistics extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监管单位ID
+     */
+	@TableField("supervisory_unit_id")
+    private String supervisoryUnitId;
+
+    /**
+     * 监管单位名称
+     */
+	@TableField("supervisory_unit_name")
+    private String supervisoryUnitName;
+
+    /**
+     * 监管单位orgcode
+     */
+	@TableField("supervisory_unit_org_code")
+    private String supervisoryUnitOrgCode;
+
+    /**
+     * 维保单位数
+     */
+	@TableField("maintenance_unit")
+    private Integer maintenanceUnit;
+
+    /**
+     * 大于30分钟
+     */
+	@TableField("greater_num")
+    private Integer greaterNum;
+
+    /**
+     * 小于30分钟
+     */
+	@TableField("less_num")
+    private Integer lessNum;
+
+    /**
+     * 平均
+     */
+	@TableField("avg_num")
+    private String avgNum;
+
+    /**
+     * 一级救援
+     */
+	@TableField("level_one")
+    private Integer levelOne;
+
+    /**
+     * 二级救援
+     */
+	@TableField("level_two")
+    private Integer levelTwo;
+
+    /**
+     * 三级救援
+     */
+	@TableField("level_three")
+    private Integer levelThree;
+
+    /**
+     * 统计月份
+     */
+	@TableField("statistics_date")
+    private String statisticsDate;
+
+    /**
+     * 开始时间
+     */
+	@TableField("start_date")
+    private String startDate;
+
+    /**
+     * 结束时间
+     */
+	@TableField("end_date")
+    private String endDate;
+
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/AlertStatistics.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_alert_statistics")
+public class AlertStatistics extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监管单位ID
+     */
+	@TableField("supervisory_unit_id")
+    private String supervisoryUnitId;
+
+    /**
+     * 监管单位名称
+     */
+	@TableField("supervisory_unit_name")
+    @ColumnWidth(30)
+    @ExcelProperty(value = "区  域", index = 0)
+    private String supervisoryUnitName;
+
+    /**
+     * 监管单位orgcode
+     */
+	@TableField("supervisory_unit_org_code")
+    private String supervisoryUnitOrgCode;
+
+    /**
+     * 电梯总数
+     */
+	@TableField("elevator_num")
+    @ExcelProperty(value = "电梯总数（台）", index = 1)
+    private Integer elevatorNum;
+
+    /**
+     * 应急事件
+     */
+	@TableField("emergency_events")
+    private Integer emergencyEvents;
+
+    /**
+     * 困人救援
+     */
+	@TableField("trapped_people")
+    private Integer trappedPeople;
+
+    /**
+     * 故障救援
+     */
+	@TableField("breakdown_rescue")
+    private Integer breakdownRescue;
+
+    /**
+     * 解救人员
+     */
+	@TableField("rescue_personnel")
+    @ExcelProperty(value = "解救被困人员（起)", index = 5)
+    private Integer rescuePersonnel;
+
+    /**
+     * 投诉建议
+     */
+	@TableField("complaint")
+    @ExcelProperty(value = "投诉建议（条)", index = 6)
+    private Integer complaint;
+
+    /**
+     * 故障率
+     */
+	@TableField("failure_rate")
+    @ExcelProperty(value = "电梯故障率", index = 7)
+    private String failureRate;
+
+    /**
+     * 平均救援时长（分钟）
+     */
+    private String avgTime;
+
+    /**
+     * 30分钟内到达次数
+     */
+    private Integer withinThirtyRescue;
+
+    /**
+     * 统计日期
+     */
+	@TableField("statistics_date")
+    private String statisticsDate;
+
+    /**
+     * 统计开始时间
+     */
+	@TableField("start_date")
+    private String startDate;
+
+    /**
+     * 统计结束时间
+     */
+	@TableField("end_date")
+    private String endDate;
+
+    @ExcelProperty(value = "电梯应急总事件（起）", index = 2)
+    @TableField(exist = false)
+    private String avgDaysEmergencyEvents;
+
+    @ExcelProperty(value = "困  人（起）", index = 3)
+    @TableField(exist = false)
+    private String avgDaysTrappedPeople;
+
+    @ExcelProperty(value = "故  障（起)", index = 4)
+    @TableField(exist = false)
+    private String avgDaysBreakdownRescue;
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/AlertUseUnitStatistics.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_alert_use_unit_statistics")
+public class AlertUseUnitStatistics extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监管单位ID
+     */
+	@TableField("supervisory_unit_id")
+    private String supervisoryUnitId;
+
+    /**
+     * 监管单位名称
+     */
+	@TableField("supervisory_unit_name")
+    private String supervisoryUnitName;
+
+    /**
+     * 监管单位编码
+     */
+	@TableField("supervisory_unit_org_code")
+    private String supervisoryUnitOrgCode;
+
+    /**
+     * 统计月份
+     */
+	@TableField("statistics_date")
+    private String statisticsDate;
+
+    /**
+     * 开始日期
+     */
+	@TableField("start_date")
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+	@TableField("end_date")
+    private String endDate;
+
+    /**
+     * 困人救援
+     */
+	@TableField("trapped_num")
+    private Integer trappedNum;
+
+    /**
+     * 故障救援
+     */
+	@TableField("fault_num")
+    private Integer faultNum;
+
+    /**
+     * 电梯总量
+     */
+	@TableField("equip_num")
+    private Integer equipNum;
+
+    /**
+     * 使用单位
+     */
+    @TableField("use_unit")
+    private String useUnit;
+    /**
+     * 维保单位
+     */
+    @TableField("maintenance_unit")
+    private String maintenanceUnit;
+    /**
+     * 电梯地址
+     */
+    @TableField("address")
+    private String address;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/pom.xml

@@ -31,11 +31,6 @@
             <artifactId>shedlock-spring</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <version>1.8.0</version>
-        </dependency>
-        <dependency>
             <groupId>net.javacrumbs.shedlock</groupId>
             <artifactId>shedlock-provider-redis-spring</artifactId>
         </dependency>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/pom.xml

@@ -55,6 +55,11 @@
             <artifactId>vastbase-jdbc</artifactId>
             <version>2.7p</version>
         </dependency>
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+            <version>1.8.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/exception/handle/GlobalExceptionHandler.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/GlobalExceptionHandler.java

-package com.yeejoin.amos.boot.module.jg.api.common.exception.handle;
+package com.yeejoin.amos.boot.module.jg.biz.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/XidFeignConfiguration.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/XidFeignConfiguration.java

-package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
+package com.yeejoin.amos.boot.module.jg.biz.config;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/PrivilegeFeginService.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/PrivilegeFeginService.java

-package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
+package com.yeejoin.amos.boot.module.jg.biz.feign;
 
 
 import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/TaskV2FeignService.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TaskV2FeignService.java

-package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
+package com.yeejoin.amos.boot.module.jg.biz.feign;
 
+import com.yeejoin.amos.boot.module.jg.biz.config.XidFeignConfiguration;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/WorkFlowFeignService.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/WorkFlowFeignService.java

-package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
+package com.yeejoin.amos.boot.module.jg.biz.feign;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.biz.config.XidFeignConfiguration;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.cloud.openfeign.FeignClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/init/ApplicationRunnerImpl.java

@@ -50,9 +50,6 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
 
     private List<IEquipUsedCheck> equipUsedCheckList;
 
-    private DPStatisticsServiceImpl statisticsService;
-
-    private AmosRequestContext amosRequestContext;
 
     public ApplicationRunnerImpl(JgUseRegistrationServiceImpl useRegistrationService,
                                  CommonServiceImpl commonService,
@@ -69,7 +66,7 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
                                  JgScrapCancelServiceImpl scrapCancelService,
                                  JgChangeRegistrationNameServiceImpl changeRegistrationNameService,
                                  ReportAnalysisServiceImpl reportAnalysisService,
-                                 List<IEquipUsedCheck> equipUsedCheckList, DPStatisticsServiceImpl statisticsService, AmosRequestContext amosRequestContext) {
+                                 List<IEquipUsedCheck> equipUsedCheckList) {
         this.commonService = commonService;
 
         this.useRegistrationService = useRegistrationService;
@@ -96,13 +93,11 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
 
         this.scrapCancelService = scrapCancelService;
 
-        this.changeRegistrationNameService =changeRegistrationNameService;
+        this.changeRegistrationNameService = changeRegistrationNameService;
 
         this.reportAnalysisService = reportAnalysisService;
 
         this.equipUsedCheckList = equipUsedCheckList;
-        this.statisticsService = statisticsService;
-        this.amosRequestContext = amosRequestContext;
     }
 
 
@@ -192,11 +187,5 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
 
         // 流程中的设备统计数据预热
         equipUsedCheckList.forEach(IEquipUsedCheck::init);
-
-        // 初始化数据到内存
-        RequestContext.setAppKey(amosRequestContext.getAppKey());
-        RequestContext.setProduct(amosRequestContext.getProduct());
-        RequestContext.setToken(amosRequestContext.getToken());
-        statisticsService.init();
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CmWorkflowServiceImpl.java

@@ -3,7 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.workflow.model.*;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -45,8 +45,8 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.PrivilegeFeginService;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.TaskV2FeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.PrivilegeFeginService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.TaskV2FeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -49,8 +49,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import lombok.extern.slf4j.Slf4j;
@@ -1432,12 +1430,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     if (ValidationUtil.isEmpty(map.get("useUnitCreditCode"))) {
                         throw new BadRequest("请先选择使用单位等信息！");
                     }
-                    if (!ValidationUtil.isEmpty(map.get("transferType")) && ValidationUtil.equals(map.get("transferType"), "区内移装")
-                            && ValidationUtil.isEmpty(map.get("county"))) {
-                        throw new BadRequest("请先选择施工区域等信息！");
+                    if (!ValidationUtil.isEmpty(map.get("transferType")) && ValidationUtil.equals(map.get("transferType"), "区内移装")) {
+                        if (ValidationUtil.isEmpty(map.get("county"))) {
+                            throw new BadRequest("请先选择施工区域等信息！");
+                        } else {
+                            map.put(USE_PLACE_CODE, String.valueOf(map.get("county")).split("_")[0]);
+                        }
                     }
                     map.put("USE_UNIT_CREDIT_CODE", map.get("useUnitCreditCode"));
-                    map.put(USE_PLACE_CODE, ValidationUtil.equals(map.get("transferType"), "区内移装") ? String.valueOf(map.get("county")).split("_")[0] : null);
                 }
             }
 //            this.setRepeatUsedCheckFilterByType(boolMust,companyCode,queryType);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -23,7 +23,7 @@ import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -24,7 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,7 +14,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEnableDisableService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -26,18 +23,15 @@ import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -28,7 +28,7 @@ import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -36,7 +36,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -33,7 +33,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/PublicWorkFlowService.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkFlowPublicInfo;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/JsonValueUtils.java

-package com.yeejoin.amos.boot.module.jyjc.biz.util;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.base.Strings;
-
-/**
- * @Author: xl
- * @Description: json快速取值
- * @Date: 2022/5/12 11:11
- */
-public class JsonValueUtils {
-
-    public static Object getValueByKey(Object originObject, String startKey,
-                                       String targetKey) {
-        if (Strings.isNullOrEmpty(startKey)) {
-            return originObject;
-        }
-        if (originObject instanceof JSONObject) {
-            return getValueFromJSONObjectByKey((JSONObject) originObject, startKey,
-                    targetKey);
-        }
-        if (originObject instanceof JSONArray) {
-            return getValueFromJSONArrayByKey((JSONArray) originObject, startKey,
-                    targetKey);
-        }
-        return null;
-    }
-
-    private static String getNextKey(String startKey, String targetKey) {
-        if (Strings.isNullOrEmpty(targetKey)) {
-            return null;
-        }
-        String[] keys = targetKey.split("\\.");
-        for (int i = 0; i < keys.length; i++) {
-            if (keys[i].equals(startKey) && (i < keys.length - 1)) {
-                return keys[i + 1];
-            }
-        }
-        return null;
-    }
-
-    private static Object getValueFromJSONArrayByKey(JSONArray originObject,
-                                                     String startKey,
-                                                     String targetKey) {
-        try {
-            Integer integer = Integer.valueOf(startKey);
-            JSONObject jsonObject = originObject.getJSONObject(integer);
-            Object targetObject = getValueFromJSONObjectByKey(jsonObject, getNextKey(startKey, targetKey),
-                    targetKey);
-            if (targetObject != null) {
-                return targetObject;
-            }
-        } catch (NumberFormatException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private static Object getValueFromJSONObjectByKey(JSONObject originObject,
-                                                      String startKey,
-                                                      String targetKey) {
-        Object object = originObject.get(startKey);
-        return object != null
-                ? getValueByKey(object, getNextKey(startKey, targetKey),
-                targetKey)
-                : null;
-    }
-}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>amos-boot-module-statistics</artifactId>
+        <groupId>com.amosframework.boot</groupId>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>amos-boot-module-statistics-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-module-jyjc-api</artifactId>
+            <version>${amos-boot-biz.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-module-jg-api</artifactId>
+            <version>${amos-boot-biz.version}</version>
+        </dependency>
+    </dependencies>
+
+
+</project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/AlertUseUnitStatisticsDto.java

+package com.yeejoin.amos.boot.module.statistics.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AlertUseUnitStatisticsDto", description="")
+public class AlertUseUnitStatisticsDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "监管单位ID")
+    private String supervisoryUnitId;
+
+    @ApiModelProperty(value = "监管单位名称")
+    private String supervisoryUnitName;
+
+    @ApiModelProperty(value = "监管单位编码")
+    private String supervisoryUnitOrgCode;
+
+    @ApiModelProperty(value = "统计月份")
+    private String statisticsDate;
+
+    @ApiModelProperty(value = "开始日期")
+    private String startDate;
+
+    @ApiModelProperty(value = "结束日期")
+    private String endDate;
+
+    @ApiModelProperty(value = "困人救援")
+    private Integer trappedNum;
+
+    @ApiModelProperty(value = "故障救援")
+    private Integer faultNum;
+
+    @ApiModelProperty(value = "电梯总量")
+    private Integer equipNum;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnit;
+
+    @ApiModelProperty(value = "维保单位")
+    private String maintenanceUnit;
+
+    @ApiModelProperty(value = "电梯地址")
+    private String address;
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/EquipQuestionNumCountDto.java

+package com.yeejoin.amos.boot.module.statistics.api.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class EquipQuestionNumCountDto {
+
+    /**
+     * 设备id
+     */
+    private String sourceId;
+
+    private String useOrgCode;
+
+    private String supervisoryCode;
+
+    private String useUnitName;
+
+    private String cityName;
+
+    private String equList;
+
+    private Long total;
+
+    private Long finished;
+
+}

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

+package com.yeejoin.amos.boot.module.statistics.api.mapper;
+
+import com.yeejoin.amos.boot.biz.common.dto.KeyValueDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.statistics.api.dto.EquipQuestionNumCountDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AQZSDPStatisticsMapper {
+
+    String getOrgCodeByCompanyCode(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> selectByOrgAndMainBody(@Param("orgCode") String orgCode, @Param("mainBodyNameList") List<String> mainBodyNameList,
+                                                     @Param("startDate") String startDate, @Param("status") String status);
+
+    List<Map<String, Object>> selectByOrgAndProblemType(@Param("orgCode") String orgCode, @Param("enumNameList") List<String> enumNameList,
+                                                        @Param("startDate") String startDate, @Param("sourceType") String sourceType, @Param("equipType") String equipType);
+
+    List<Map<String, Object>> getIssueCountByMonth(@Param("orgCode") String orgCode, @Param("year") String year, @Param("status") String status);
+
+    List<Map<String, Object>> getIssueCountByDate(@Param("orgCode") String orgCode, @Param("year") String year, @Param("status") String status);
+
+    int countByOrgCode(@Param("orgCode") String orgCode, @Param("now") String now);
+
+    List<Map<String, String>> getOrgCodeAndCompanyCodesByCompanyCodes(@Param("regionCodes") List<Integer> regionCodes);
+
+    List<Map<String, Object>> countByOrgCodes(@Param("orgCodes") List<String> orgCodes, @Param("now") String now);
+
+    List<Map<String, Object>> issueMonthList(@Param("orgCode") String orgCode, @Param("time") String time);
+
+    List<Map<String, Object>> issueProblemLevelCount(@Param("orgCode") String orgCode, @Param("time") String time);
+
+    List<Map<String, Object>> issueCompanyTop(@Param("orgCode") String orgCode, @Param("time") String time);
+
+    List<Map<String, Object>> issueChildrenCityCountTop(@Param("orgCodes") List<String> orgCodes, @Param("now") String now, @Param("status") String status);
+
+    List<Map<String, Object>> issueCountTopByProblemType(@Param("orgCode") String orgCode, @Param("status") String status);
+
+    List<EquipQuestionNumCountDto> queryEquipQuestionList(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+
+
+    /**
+     * 单位按照资质状态分组下的统计数量
+     *
+     * @param regionCode 区域
+     * @return List<KeyValueDto>
+     */
+    List<KeyValueDto> queryLicenseEfficiencyOfRegion(@Param(value = "regionCode") String regionCode);
+    /**
+     * 查询单个单位的有效期信息
+     *
+     * @param appId 公司唯一标识
+     * @return KeyValueDto
+     */
+    KeyValueDto queryLicenseEfficiencyOneCompany(@Param(value = "appId") String appId);
+
+    Map<String, Object> getInspectionExpiredRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+
+    Map<String, Object> getInspectionResultRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+
+}

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

+package com.yeejoin.amos.boot.module.statistics.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertRescueStatistics;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-11-07
+ */
+public interface AlertRescueStatisticsMapper extends BaseMapper<AlertRescueStatistics> {
+
+    AlertRescueStatistics 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/AlertStatisticsMapper.java

+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.Param;
+
+/**
+ * Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-11-02
+ */
+public interface AlertStatisticsMapper extends BaseMapper<AlertStatistics> {
+
+    AlertStatistics getStatisticsMessage(@Param("orgCode") String orgCode, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    AlertStatistics statisticsInfoByRegionAndDate(@Param("regionCode") String regionCode, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    Long countProblemByTypeDateAndOrgCode(@Param("problemType") String problemType, @Param("dto") DPFilterParamDto params, @Param("orgCode") String orgCode);
+
+    String getOrgCodeByCompanyCode(String cityCode);
+
+    Long countEmergencyEventsByOrgCodeAndDate(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto);
+}

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

+package com.yeejoin.amos.boot.module.statistics.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertUseUnitStatistics;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-11-08
+ */
+public interface AlertUseUnitStatisticsMapper extends BaseMapper<AlertUseUnitStatistics> {
+
+    List<Map<String, String>> getStatisticsMessage(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    AlertUseUnitStatistics getUseUnitMessage(@Param("unitCode") String unitCode, @Param("equipmentId") String equipmentId, @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/CommonBaseMapper.java

+package com.yeejoin.amos.boot.module.statistics.api.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-13
+ */
+@Mapper
+public interface CommonBaseMapper {
+
+    String getOrgCodeByCompanyCode(String companyCode);
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/ScreenMapper.java → 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

-package com.yeejoin.amos.boot.module.tcm.api.mapper;
+package com.yeejoin.amos.boot.module.statistics.api.mapper;
 
-import com.yeejoin.amos.boot.module.tcm.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,16 +14,16 @@ import java.util.Map;
  * @date 2024-07-09
  */
 @Mapper
-public interface ScreenMapper {
+public interface ZLStatisticsMapper {
 
 
-    List<Map<String, Object>> getCompanyInfo(@Param("screenDto") ScreenDto screenDto);
+    List<Map<String, Object>> getCompanyInfo(@Param("screenDto") DPFilterParamDto screenDto);
 
-    List<Map<String, Object>> testOrg(@Param("screenDto") ScreenDto screenDto);
+    List<Map<String, Object>> testOrg(@Param("screenDto") DPFilterParamDto screenDto);
 
-    List<Map<String, String>> userCount(@Param("screenDto") ScreenDto screenDto);
+    List<Map<String, String>> userCount(@Param("screenDto") DPFilterParamDto screenDto);
 
-    List<Map<String, Object>> supervisorCount(@Param("screenDto") ScreenDto screenDto);
+    List<Map<String, Object>> supervisorCount(@Param("screenDto") DPFilterParamDto screenDto);
 
     String getOrgCodeByCompanyCode(@Param("cityCode") String cityCode);
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.AQZSDPStatisticsMapper">
+
+
+	<select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
+		select org_code from privilege_company where company_code = #{cityCode} limit 1
+	</select>
+	<select id="selectByOrgAndMainBody" resultType="java.util.Map">
+		SELECT COUNT
+				   ( 1 ),
+			   source_type AS sourceType
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		  	AND problem_time &gt;= #{startDate}
+		    AND source_type IN
+			<foreach collection="mainBodyNameList" item="item" separator="," open="(" close=")">
+				#{item}
+			</foreach>
+			<if test="null != status">
+				AND problem_status_code = #{status}
+			</if>
+		GROUP BY
+			source_type
+	</select>
+	<select id="selectByOrgAndProblemType" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			problem_type AS problemType
+			FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+			AND problem_time &gt;= #{startDate}
+		  	AND source_type = #{sourceType}
+		  	<if test="null != equipType">
+				AND equip_list_code = #{equipType}
+			</if>
+			AND problem_type IN
+				<foreach collection="enumNameList" item="item" separator="," open="(" close=")">
+					#{item}
+				</foreach>
+		GROUP BY
+			problem_type
+
+	</select>
+	<select id="getIssueCountByMonth" resultType="java.util.Map">
+		SELECT COUNT
+				   ( 1 ),
+			   DATE_FORMAT(problem_time,'%Y-%m') AS time
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		  	AND DATE_FORMAT(problem_time,'%Y') = #{year}
+			<if test="null != status">
+				AND problem_status_code = #{status}
+			</if>
+		GROUP BY
+			DATE_FORMAT(problem_time,'%Y-%m')
+	</select>
+
+	<select id="getIssueCountByDate" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			DATE_FORMAT(problem_time,'%Y-%m-%d') AS time
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+			AND DATE_FORMAT(problem_time,'%Y-%m-%d') &gt;= #{year}
+			<if test="null != status">
+				AND problem_status_code = #{status}
+			</if>
+		GROUP BY
+			DATE_FORMAT(problem_time,'%Y-%m-%d')
+	</select>
+	<select id="countByOrgCode" resultType="java.lang.Integer">
+		SELECT COUNT
+				   ( 1 )
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		  AND DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now}
+	</select>
+	<select id="getOrgCodeAndCompanyCodesByCompanyCodes" resultType="java.util.Map">
+		select org_code AS orgCode,company_code AS companyCode from privilege_company where company_code in
+		<foreach collection="regionCodes" item="regionCode" separator="," open="(" close=")">
+			#{regionCode} :: VARCHAR
+		</foreach>
+	</select>
+	<select id="countByOrgCodes" resultType="java.util.Map">
+		SELECT COUNT
+				   ( 1 ),
+		    governing_body_org_code AS orgCode
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+		   	DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now}
+		   	AND
+		    <foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
+				governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+			</foreach>
+		GROUP BY
+			governing_body_org_code
+	</select>
+	<select id="issueMonthList" resultType="java.util.Map">
+		SELECT
+			sequence_nbr AS sequenceNbr,
+			source_type AS sourceType,
+			problem_type AS problemType,
+			problem_time AS problemTime
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		  AND DATE_FORMAT ( problem_time, '%Y-%m' ) = #{time}
+	</select>
+	<select id="issueProblemLevelCount" resultType="java.util.Map">
+		SELECT
+			COUNT
+				( 1 ),
+			problem_level AS problemLevel
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		    AND DATE_FORMAT(problem_time,'%Y') = #{time}
+		 	AND problem_level IS NOT NULL
+		GROUP BY
+			problem_level
+		ORDER BY
+			problem_level_code
+	</select>
+	<select id="issueCompanyTop" resultType="java.util.Map">
+		SELECT COUNT
+				   ( 1 ),
+			   principal_unit AS principalUnit,
+			   governing_body AS governingBody
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		  AND DATE_FORMAT ( problem_time, '%Y' ) = #{time}
+		  AND problem_level IS NOT NULL
+		GROUP BY
+			principal_unit_code
+		ORDER BY
+			COUNT DESC
+			LIMIT 10
+	</select>
+	<select id="issueChildrenCityCountTop" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			governing_body_org_code AS orgCode
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			DATE_FORMAT(problem_time,'%Y') &gt;= #{now}
+		AND
+			<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
+				governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+			</foreach>
+			<if test="null != status">
+				AND problem_status_code = #{status}
+			</if>
+		GROUP BY
+			governing_body_org_code
+	</select>
+	<select id="issueCountTopByProblemType" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			problem_type_code AS problemTypeCode
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		<if test="null != status">
+			AND problem_status_code = #{status}
+		</if>
+		GROUP BY
+			problem_type_code
+		ORDER BY
+			COUNT DESC
+		LIMIT 10
+	</select>
+	<select id="queryEquipQuestionList"  resultType="com.yeejoin.amos.boot.module.statistics.api.dto.EquipQuestionNumCountDto">
+		select
+			bb."USE_ORG_CODE",
+			cc."SUPERVISORY_CODE",
+			dd."USE_UNIT_NAME",
+			aa.finished,
+			aa.source_id,
+			aa.total,
+			dd."CITY_NAME",
+			bb."EQU_LIST"
+		from
+			(
+			select
+				a.total,
+				a.source_id,
+				ifnull(b.total,0) as finished
+			from
+				(
+				SELECT
+					count(1) as total,
+					source_id
+				FROM
+						"tzs_safety_problem_tracing"
+				WHERE
+						 source_type_code = '3'
+						 and governing_body_org_code like concat(#{orgCode}, '%')
+						 and cast(problem_time AS DATE)  between #{dto.beginDate} and #{dto.endDate}
+				GROUP BY source_id ORDER BY total desc) a
+				left join (
+				SELECT
+					count(1) as total,
+					source_id
+				FROM
+						"tzs_safety_problem_tracing"
+				WHERE
+						 source_type_code = '3'
+						 and problem_status_code ='1'
+					 and governing_body_org_code like concat(#{orgCode}, '%')
+					 and cast(problem_time AS DATE)  between #{dto.beginDate} and #{dto.endDate}
+				GROUP BY source_id ORDER BY total desc) b on a.source_id = b.source_id
+			) aa,
+			idx_biz_jg_register_info bb,
+			idx_biz_jg_other_info cc,
+			idx_biz_jg_use_info dd
+		where
+			aa.source_id=bb."RECORD"
+			and aa.source_id=cc."RECORD"
+			and aa.source_id=dd."RECORD"
+			order by aa.total desc
+	</select>
+	<select id="getInspectionExpiredRate" resultType="java.util.Map">
+		SELECT
+		CASE WHEN COUNT(*) = 0 THEN 0 ELSE ROUND((COUNT(CASE WHEN ci.next_inspection_date <![CDATA[<=]]> now() THEN 1 END) * 100.0 / COUNT(*)), 2) END AS expiredRate
+		FROM
+		"tz_cylinder_inspection" ci
+		LEFT JOIN tz_base_enterprise_info cu on ci.app_id = cu.app_id
+		<where>
+			cu.data_sources = '陕西省内企业'
+			AND cu.unit_type LIKE '%充装单位%'
+			<if test="regionCode != null and regionCode != ''">
+				and cu.org_code like concat(#{regionCode}, '%')
+			</if>
+			<if test="appId != null and appId != ''">
+				and cu.app_id = #{appId}
+			</if>
+		</where>
+	</select>
+
+	<select id="getInspectionResultRate" resultType="java.util.Map">
+		SELECT
+		CASE WHEN COUNT(*) = 0 THEN 0 ELSE ROUND((COUNT(CASE WHEN ci.inspection_result = '3123' THEN 1 END) * 100.0 / COUNT(*)), 2) END AS resultRate
+		FROM
+		"tz_cylinder_inspection" ci
+		LEFT JOIN tz_base_enterprise_info cu on ci.app_id = cu.app_id
+		<where>
+			cu.data_sources = '陕西省内企业'
+			AND cu.unit_type LIKE '%充装单位%'
+			<if test="regionCode != null and regionCode != ''">
+				and cu.org_code like concat( #{regionCode}, '%')
+			</if>
+			<if test="appId != null and appId != ''">
+				and cu.app_id = #{appId}
+			</if>
+		</where>
+	</select>
+	<select id="queryLicenseEfficiencyOneCompany" resultType="com.yeejoin.amos.boot.biz.common.dto.KeyValueDto">
+        SELECT
+            cu.sequence_nbr as strKey,
+            (select
+            case
+            when min(ul.expiry_date) >= now()
+            THEN '正常'
+            when min(ul.expiry_date) is null then '--'
+            ELSE '已超期'
+            END AS licenseOk  from tz_base_unit_licence ul where cu.credit_code = ul.unit_code) as strValue
+        FROM
+            tz_cylinder_unit cu
+        where
+            cu.unit_status = '1210'
+            and cu.app_id = #{appId}
+    </select>
+	<select id="queryLicenseEfficiencyOfRegion" resultType="com.yeejoin.amos.boot.biz.common.dto.KeyValueDto">
+        SELECT
+            count(1) as iValue,
+            (select
+            case
+            when min(ul.expiry_date) >= now()
+            THEN '正常'
+            when min(ul.expiry_date) is null then '未提供'
+            ELSE '已超期'
+            END AS licenseOk  from tz_base_unit_licence ul where cu.use_code = ul.unit_code) as strKey
+        FROM
+            tz_base_enterprise_info cu
+        where
+             cu.data_sources = '陕西省内企业'
+          AND cu.unit_type LIKE '%充装单位%'
+          and cu.org_code like concat('%', #{regionCode}, '%')
+        GROUP BY strKey
+    </select>
+</mapper>
+
+

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.AlertRescueStatisticsMapper">
+
+    <select id="getStatisticsMessage"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.AlertRescueStatistics">
+        SELECT (select count(1)
+                from tz_dispatch_task
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960' and father_alert is null)
+                  and org_type_code = 'levelOneUnit') as          levelOne,
+               (select count(1)
+                from tz_dispatch_task
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960' and father_alert is null)
+                  and org_type_code = 'levelTwoUnit') as          levelTwo,
+               (select count(1)
+                from tz_dispatch_task
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960' and father_alert is null)
+                  and org_type_code = '953')          as          levelThree,
+               (select count(DISTINCT (response_org_id))
+                from tz_dispatch_task
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960'  and father_alert is null)
+                  and org_type_code = 'levelOneUnit') as          maintenanceUnit,
+               (			SELECT count(1) from (
+
+                        SELECT
+                        t1.sequence_nbr,
+                        (SELECT min(arrive_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and arrive_time is not null) as arr,
+
+                        (SELECT min(dispatch_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and dispatch_time is not null ) as dis
+
+                        from tz_alert_called t1 where t1.biz_org_code like concat(#{orgCode}, '%')  and t1.alarm_type_code = '960' and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is null
+
+                        ) where   extract(epoch from  arr  -  dis ) &lt; 1800
+                        ) as lessNum,
+        (SELECT count(1) from  tz_alert_called where biz_org_code like concat(#{orgCode}, '%')  and alarm_type_code = '960' and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is null) as greaterNum,
+        (
+
+                   SELECT sum(extract(epoch from  arr  -  dis )) from
+
+                       (   SELECT
+                               t1.sequence_nbr,
+                               (SELECT min(arrive_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and arrive_time is not null) as arr,
+
+                               (SELECT min(dispatch_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and dispatch_time is not null ) as dis
+
+                           from tz_alert_called t1 where t1.biz_org_code like concat(#{orgCode}, '%')  and t1.alarm_type_code = '960' and t1.call_time BETWEEN #{startDate} and  #{endDate} and t1.father_alert is null
+
+                       ) ) as avgNum
+    </select>
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.AlertUseUnitStatisticsMapper">
+
+    <select id="getStatisticsMessage"
+            resultType="java.util.Map">
+
+        SELECT mainName as maintenanceUnit, useName as useUnit, ADDRESS as address, unitCode as unitCode, equipmentId
+        from (
+                 SELECT use.ADDRESS      as       address,
+                        tac.equipment_id as       equipmentId,
+                        (
+                            SELECT ME_UNIT_NAME
+                            from idx_biz_jg_maintenance_record_info
+                            WHERE RECORD = equipment_id
+                            ORDER BY INFORM_START LIMIT 1
+             ) as mainName,
+             use.USE_UNIT_NAME as useName,
+             use.USE_UNIT_CREDIT_CODE as unitCode from tz_alert_called tac
+            LEFT JOIN  idx_biz_jg_use_info use  on tac.equipment_id = use.RECORD
+        WHERE tac.alarm_type_code != '962'
+          and tac.equipment_id is not null
+          and use.ADDRESS is not null
+          and  tac.call_time between  #{startDate} and #{endDate}
+          and tac.father_alert is null
+            )
+        GROUP BY mainName, useName, address
+        ORDER BY address
+    </select>
+    <select id="getUseUnitMessage"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.AlertUseUnitStatistics">
+        SELECT
+            (
+                SELECT count(1) from idx_biz_jg_use_info WHERE USE_UNIT_CREDIT_CODE = #{unitCode}
+            ) as equipNum,
+            (
+                SELECT count(1) from tz_alert_called where alarm_type_code = '960' and equipment_id = #{equipmentId} and  call_time between  #{startDate} and #{endDate}
+                                                       and father_alert is null
+            ) as trappedNum,
+
+            (
+                SELECT count(1) from tz_alert_called where alarm_type_code = '961' and equipment_id = #{equipmentId} and  call_time between  #{startDate} and #{endDate}
+                                                       and father_alert is null
+            ) as faultNum
+    </select>
+
+</mapper>
+

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper">
+
+    <select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
+    select org_code from privilege_company where company_code = #{companyCode} limit 1
+    </select>
+
+</mapper>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper
-	namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.ScreenMapper">
+	namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper">
 
 	<select id="getCompanyInfo" resultType="java.util.Map">
 		SELECT bi.equip_category as equipCategory,bi.unit_type as unitType

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>amos-boot-module-statistics</artifactId>
+        <groupId>com.amosframework.boot</groupId>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>amos-boot-module-statistics-biz</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-module-statistics-api</artifactId>
+            <version>${amos-boot-biz.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yeejoin</groupId>
+            <artifactId>visual-feign-morphic</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+
+</project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/AmosStatisticsApplication.java

+package com.yeejoin.amos;
+
+import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
+import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * <pre>
+ * 特种设备服务启动类
+ * </pre>
+ *
+ * @author DELL
+ */
+@SpringBootApplication
+@EnableConfigurationProperties
+@ServletComponentScan
+@EnableDiscoveryClient
+@EnableFeignClients
+@EnableSwagger2WebMvc
+@MapperScan({"org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
+        "org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
+        "com.yeejoin.amos.boot.module.**.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
+@ComponentScan(basePackages = {"org.typroject", "com.yeejoin.amos"})
+public class AmosStatisticsApplication {
+    private static final Logger logger = LoggerFactory.getLogger(AmosStatisticsApplication.class);
+
+    public static void main(String[] args) throws UnknownHostException {
+
+        ConfigurableApplicationContext context = SpringApplication.run(AmosStatisticsApplication.class, args);
+        Environment env = context.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
+
+        logger.info("\n----------------------------------------------------------\n\t"
+                + "Application Amos-Biz-Boot is running! Access URLs:\n\t" + "Swagger文档: \thttp://" + ip + ":" + port
+                + path + "/doc.html\n" + "----------------------------------------------------------");
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.statistcs.biz.config;
+
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Arrays;
+
+@Configuration
+public class ElasticSearchClientConfig {
+
+    @Value("${spring.elasticsearch.rest.uris}")
+    private String uris;
+    @Value("${elasticsearch.username}")
+    private String username;
+
+    @Value("${elasticsearch.password}")
+    private String password;
+
+    @Bean(destroyMethod = "close")
+    public RestHighLevelClient restHighLevelClient() {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(username, password));
+
+        try {
+            HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
+            RestClientBuilder builder = RestClient.builder(httpHosts);
+            builder.setHttpClientConfigCallback(httpClientBuilder -> {
+                httpClientBuilder.disableAuthCaching();
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            });
+            // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
+            builder.setRequestConfigCallback(requestConfigBuilder -> {
+                // 连接超时（默认为1秒）
+                return requestConfigBuilder.setConnectTimeout(5000 * 1000)
+                        // 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
+                        .setSocketTimeout(6000 * 1000);
+            });
+
+            return new RestHighLevelClient(builder);
+        } catch (Exception e) {
+            throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
+        }
+    }
+}

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

+package com.yeejoin.amos.boot.module.statistcs.biz.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+@Slf4j
+public class RedissonManager {
+
+    /**
+     * 集群环境使用-节点信息
+     */
+    @Value("${spring.redis.cluster.nodes:default}")
+    private String clusterNodes;
+
+
+    /**
+     * 公共-密码
+     */
+    @Value("${spring.redis.password}")
+    private String password;
+
+    /**
+     * 单机环境使用
+     */
+    @Value("${spring.redis.host:default}")
+    private String host;
+
+
+    /**
+     * 单机环境使用
+     */
+    @Value("${spring.redis.port:default}")
+    private String port;
+
+    /**
+     * 单机环境使用
+     */
+    @Value("${spring.redis.database:0}")
+    private int database;
+
+    @Bean
+    @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "cluster")
+    public RedissonClient redissonClient() {
+        // 集群环境使用
+        Config config = new Config();
+        config.useClusterServers()
+                .addNodeAddress(clusterNodes.split(","))
+                .setPassword(password);
+        return Redisson.create(config);
+    }
+
+    @Bean
+    @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "singleton", matchIfMissing = true)
+    public RedissonClient redissonSingletonClient() {
+        // 单机环境使用
+        Config config = new Config();
+        config.useSingleServer().setAddress(host + ":" + port).setPassword(password).setDatabase(database);
+        return Redisson.create(config);
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/RestTemplateConfig.java → amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/config/RestTemplateConfig.java

-package com.yeejoin.amos.boot.module.jyjc.biz.config;
+package com.yeejoin.amos.boot.module.statistcs.biz.config;
 
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;

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

+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
+
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.CylinderFillingRecordStatisticsDto;
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.CylinderDPStatisticsServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+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.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 气瓶基本信息
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+@RestController
+@Api(tags = "大屏-气瓶统计Api")
+@RequestMapping(value = "/dp/cylinder")
+public class CylinderDPStatisticsController extends BaseController {
+
+    private CylinderDPStatisticsServiceImpl dpStatisticsService;
+
+    public CylinderDPStatisticsController(CylinderDPStatisticsServiceImpl dpStatisticsService) {
+        this.dpStatisticsService = dpStatisticsService;
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getCylinderStatisticsData")
+    @ApiOperation(httpMethod = "GET", value = "获取气瓶统计数据-按照企业名称统计", notes = "获取气瓶统计数据-按照企业名称统计")
+    public ResponseModel<List<Map<String, Object>>> getCylinderStatisticsData(@RequestParam(value = "regionCode") String regionCode) throws IOException {
+        List<Map<String, Object>> result = dpStatisticsService.getCylinderStatisticsData(regionCode);
+        return ResponseHelper.buildResponse(result);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/getCylinderStatisticsDataByCity")
+    @ApiOperation(httpMethod = "POST", value = "获取气瓶统计数据-按照城市统计", notes = "获取气瓶统计数据-按照城市统计")
+    public ResponseModel<Map<String, Object>> getCylinderStatisticsDataByCity(@RequestBody Map<String, Object> map) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+
+        Map<String, Object> result = dpStatisticsService.getCylinderStatisticsDataByCity(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/getCylinderStatisticsDataByCityForTotal")
+    @ApiOperation(httpMethod = "POST", value = "获取气瓶统计数据-按照城市统计", notes = "获取气瓶统计数据-按照城市统计-地图统计")
+    public ResponseModel<Map<String, Object>> getCylinderStatisticsDataByCityForTotal(@RequestBody Map<String, Object> map) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+
+        Map<String, Object> result = dpStatisticsService.getCylinderStatisticsDataByCityForTotal(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/getCylinderStatisticsDataByCityForMap")
+    @ApiOperation(httpMethod = "POST", value = "获取气瓶统计数据-按照城市统计", notes = "获取气瓶统计数据-按照城市统计-地图")
+    public ResponseModel<List<Map<String, Object>>> getCylinderStatisticsDataByCityForMap(@RequestBody Map<String, Object> map) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+
+        List<Map<String, Object>> result = dpStatisticsService.getCylinderStatisticsDataByCityForMap(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "30天的充装量、卸液量数据")
+    @GetMapping(value = "/fillingTimesAndQuantity")
+    public ResponseModel<List<CylinderFillingRecordStatisticsDto>> fillingTimesAndQuantity(@RequestParam("regionCode") String reginCode) {
+        return ResponseHelper.buildResponse(dpStatisticsService.fillingTimesAndQuantity(reginCode));
+    }
+
+
+}

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

-package com.yeejoin.amos.boot.module.jyjc.biz.controller;
+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.DPSubServiceImpl;
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.DPSubServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.Assert;
@@ -13,14 +13,16 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Map;
 
+
+
 /**
  * 大屏统计controller
  *
  * @author Administrator
  */
 @RestController
-@RequestMapping("/dp/sub")
 @Api(tags = "大屏二级弹窗")
+@RequestMapping("/dp/sub")
 public class DPSubController {
 
 
@@ -34,9 +36,9 @@ public class DPSubController {
     @ApiOperation(httpMethod = "POST", value = "动态详情页", notes = "动态详情页")
     @PostMapping(value = "/{template}")
     public ResponseModel<JSONObject> commonQuery(@PathVariable String template, @RequestBody Map<String, Object> param) {
-        if (template.equals("company")){
+        if (template.equals("company")) {
             Assert.notNull(param.get("useUnitCode"), "企业统一信用代码不能为空");
-        } else if (template.equals("equip")){
+        } else if (template.equals("equip")) {
             param.put("record", param.get("SEQUENCE_NBR"));
             param.put("equList", param.get("EQU_LIST_CODE"));
             Assert.notNull(param.get("record"), "设备ID不能为空");
@@ -48,3 +50,5 @@ public class DPSubController {
         return ResponseHelper.buildResponse(subService.commonQuery(template, param));
     }
 }
+
+

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DPStatisticsController.java → 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

-package com.yeejoin.amos.boot.module.jg.biz.controller;
+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
 
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.FourColorCountDataDto;
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.DPStatisticsServiceImpl;
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JGDPStatisticsServiceImpl;
 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.*;
+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;
@@ -25,14 +28,14 @@ import java.util.Map;
  * @author Administrator
  */
 @RestController
-@RequestMapping("/db/statistics")
-@Api(tags = "大屏统计")
-public class DPStatisticsController {
+@Api(tags = "大屏-监管及总览统计API")
+@RequestMapping("/jg/db")
+public class JGDPStatisticsController {
 
 
-    private DPStatisticsServiceImpl statisticsService;
+    private JGDPStatisticsServiceImpl statisticsService;
 
-    public DPStatisticsController(DPStatisticsServiceImpl statisticsService) {
+    public JGDPStatisticsController(JGDPStatisticsServiceImpl statisticsService) {
         this.statisticsService = statisticsService;
     }
 
@@ -116,7 +119,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧设备状态情况统计", notes = "监管大屏-左侧设备状态情况统计")
     @PostMapping(value = "/equStateCount")
-    public ResponseModel<List<Map<String,Object>>> equStateCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<List<Map<String, Object>>> equStateCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -127,7 +130,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-右侧停用、注销、报废设备状态情况统计", notes = "监管大屏-右侧停用、注销、报废设备状态情况统计")
     @PostMapping(value = "/equStopStateCount")
-    public ResponseModel<Map<String,Object>> equStopStateCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<Map<String, Object>> equStopStateCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -138,7 +141,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-维保电梯数量TOP10", notes = "监管大屏-维保电梯数量TOP10")
     @PostMapping(value = "/maintenanceCountTopTen")
-    public ResponseModel<List<Map<String,Object>>> maintenanceCountTopTen(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<List<Map<String, Object>>> maintenanceCountTopTen(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -149,7 +152,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-维保电梯数量", notes = "监管大屏-维保电梯数量")
     @PostMapping(value = "/maintenanceCount")
-    public ResponseModel<Map<String,Object>> maintenanceCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<Map<String, Object>> maintenanceCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -160,17 +163,18 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧各地市业务办理平均时效", notes = "监管大屏-左侧各地市业务办理平均时效")
     @PostMapping(value = "/cityBusinessCount")
-    public ResponseModel<Map<String,Object>> cityBusinessCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<Map<String, Object>> cityBusinessCount(@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.cityBusinessCount(dpFilterParamDto));
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧获取业务类型", notes = "监管大屏-左侧获取业务类型")
     @PostMapping(value = "/getBusinessKey")
-    public ResponseModel<List<Map<String,Object>>> getBusinessKey(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<List<Map<String, Object>>> getBusinessKey(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -181,7 +185,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-右侧施工告知的设备数办理情况统计", notes = "监管大屏-右侧施工告知的设备数办理情况统计")
     @PostMapping(value = "/getNoticeEquCount")
-    public ResponseModel<Map<String,Object>> getNoticeEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<Map<String, Object>> getNoticeEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -192,7 +196,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-右侧使用办理的设备数量情况统计", notes = "监管大屏-右侧使用办理的设备数量情况统计")
     @PostMapping(value = "/getRegEquCount")
-    public ResponseModel<Map<String,Object>> getRegEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<Map<String, Object>> getRegEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -203,7 +207,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧新增情况", notes = "监管大屏-左侧新增情况")
     @PostMapping(value = "/newRegEquCount")
-    public ResponseModel<Map<String,Object>> newRegEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<Map<String, Object>> newRegEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
@@ -214,7 +218,7 @@ public class DPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-新增登记新增设备统计", notes = "监管大屏-新增登记新增设备统计")
     @PostMapping(value = "/newRegCount")
-    public ResponseModel<List<Map<String,Object>>> newRegCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<List<Map<String, Object>>> newRegCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/DPStatisticsController.java → amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JYJCDPStatisticsController.java

-package com.yeejoin.amos.boot.module.jyjc.biz.controller;
+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.DPStatisticsServiceImpl;
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JYJCDPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
@@ -25,14 +25,14 @@ import java.util.Map;
  * @author Administrator
  */
 @RestController
-@RequestMapping("/db/statistics")
-@Api(tags = "大屏统计")
-public class DPStatisticsController {
+@Api(tags = "大屏统-总览及检验检测统计API")
+@RequestMapping("/jy/db")
+public class JYJCDPStatisticsController {
 
 
-    private DPStatisticsServiceImpl statisticsService;
+    private JYJCDPStatisticsServiceImpl statisticsService;
 
-    public DPStatisticsController(DPStatisticsServiceImpl statisticsService) {
+    public JYJCDPStatisticsController(JYJCDPStatisticsServiceImpl statisticsService) {
         this.statisticsService = statisticsService;
     }
 
@@ -61,7 +61,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-左侧检验检测人员统计", notes = "大屏-检验检测-左侧检验检测人员统计")
-    @PostMapping(value = "/jy/person/count")
+    @PostMapping(value = "/person/count")
     public ResponseModel<Map<String, Object>> inspectPersonCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -72,7 +72,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型业务数量统计", notes = "大屏-检验检测-各检验类型业务数量统计")
-    @PostMapping(value = "/jy/allApp/countByType")
+    @PostMapping(value = "/allApp/countByType")
     public ResponseModel<Map<String, Object>> inspectBizNumCountByType(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -83,7 +83,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型待检数量统计", notes = "大屏-检验检测-各检验类型待检数量统计")
-    @PostMapping(value = "/jy/pendingApp/countByType")
+    @PostMapping(value = "/pendingApp/countByType")
     public ResponseModel<Map<String, Object>> queryAllFlowingAndFinishedInspectApp(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -94,7 +94,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-按机构进行检验时效统计Top10排名", notes = "大屏-检验检测-按机构进行检验时效统计Top10排名")
-    @PostMapping(value = "/jy/timeliness/top")
+    @PostMapping(value = "/timeliness/top")
     public ResponseModel<List<InspectionTimelinesDto>> inspectionTimelinessTopXX(@RequestParam(required = false, defaultValue = "10") String top, @Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -105,7 +105,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-检验检测机构公示", notes = "大屏-检验检测-检验检测机构公示")
-    @PostMapping(value = "/jy/inspectionOrgList/publicity")
+    @PostMapping(value = "/inspectionOrgList/publicity")
     public ResponseModel<List<PublicityInspectOrgInfoDto>> inspectionOrgListForPublicity(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -116,7 +116,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备报检/待检数量统计", notes = "大屏-检验检测-八大类设备报检/待检数量统计")
-    @PostMapping(value = "/jy/inspectionEquip/countByEquList")
+    @PostMapping(value = "/inspectionEquip/countByEquList")
     public ResponseModel<Map<String, Object>> inspectionEquipCountByEquList(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -127,7 +127,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-中间地图左侧全局统计", notes = "大屏-检验检测-中间地图左侧全局统计")
-    @PostMapping(value = "/jy/center-map/legend")
+    @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()) {
@@ -138,7 +138,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-中间地图地市统计", notes = "大屏-检验检测-中间-地图地市统计")
-    @PostMapping(value = "/jy/center-map/overview")
+    @PostMapping(value = "/center-map/overview")
     public ResponseModel<List<Map<String, Object>>> centerMapCountForOverview(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -149,7 +149,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备检验临期、超期统计", notes = "大屏-检验检测-八大类设备检验临期、超期统计")
-    @PostMapping(value = "/jy/equipInspectTime/countByEquList")
+    @PostMapping(value = "/equipInspectTime/countByEquList")
     public ResponseModel<Map<String, Object>> equipInspectTimeCountByEquList(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -159,3 +159,6 @@ public class DPStatisticsController {
     }
 
 }
+
+
+

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/DPStatisticsController.java → amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/YJDPStatisticsController.java

-package com.yeejoin.amos.boot.module.elevator.biz.controller;
+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
-import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMaintenanceUnitStatisticsDto;
-import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMsgDto;
-import com.yeejoin.amos.boot.module.elevator.api.dto.AlertPaperInfoDto;
-import com.yeejoin.amos.boot.module.elevator.api.dto.AlertUseUnitStatisticsDto;
-import com.yeejoin.amos.boot.module.elevator.biz.service.impl.DPStatisticsServiceImpl;
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.YJDPStatisticsServiceImpl;
+import com.yeejoin.amos.boot.module.statistics.api.dto.AlertUseUnitStatisticsDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
@@ -31,20 +29,20 @@ import java.util.Map;
  * @author Administrator
  */
 @RestController
-@RequestMapping("/db/statistics")
-@Api(tags = "大屏统计")
-public class DPStatisticsController {
+@RequestMapping("/yj/db")
+@Api(tags = "大屏-应急-统计API")
+public class YJDPStatisticsController {
 
 
-    private DPStatisticsServiceImpl statisticsService;
+    private YJDPStatisticsServiceImpl statisticsService;
 
-    public DPStatisticsController(DPStatisticsServiceImpl statisticsService) {
+    public YJDPStatisticsController(YJDPStatisticsServiceImpl statisticsService) {
         this.statisticsService = statisticsService;
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-办理量 (近7日)", notes = "大屏-应急-办理量 (近7日)")
-    @PostMapping(value = "/yj/eventStatByDay")
+    @PostMapping(value = "/eventStatByDay")
     public ResponseModel<JSONObject> eventStatByDay(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -55,7 +53,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-电梯数量统计 (按区域)", notes = "大屏-应急-电梯数量统计 (按区域)")
-    @PostMapping(value = "/yj/elevatorCountStat")
+    @PostMapping(value = "/elevatorCountStat")
     public ResponseModel<JSONObject> elevatorCountStat(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -66,7 +64,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-事件分布 (按场所)", notes = "大屏-应急-事件分布 (按场所)")
-    @PostMapping(value = "/yj/eventStatByLocation")
+    @PostMapping(value = "/eventStatByLocation")
     public ResponseModel<JSONObject> eventStatByLocation(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -77,7 +75,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-故障原因占比", notes = "大屏-应急-故障原因占比")
-    @PostMapping(value = "/yj/faultCauseRatio")
+    @PostMapping(value = "/faultCauseRatio")
     public ResponseModel<JSONObject> faultCauseRatio(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -88,7 +86,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-困人救援月度情况", notes = "大屏-应急-困人救援月度情况")
-    @PostMapping(value = "/yj/trappedUserCount")
+    @PostMapping(value = "/trappedUserCount")
     public ResponseModel<JSONObject> trappedUserCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -99,7 +97,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-即时警情列表", notes = "大屏-应急-即时警情列表")
-    @PostMapping(value = "/yj/instantAlert")
+    @PostMapping(value = "/instantAlert")
     public ResponseModel<List<AlertPaperInfoDto>> instantAlert(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -110,7 +108,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-月度困人故障高发使用单位", notes = "大屏-应急-月度困人故障高发使用单位")
-    @PostMapping(value = "/yj/trappedUserHighCompanyCount")
+    @PostMapping(value = "/trappedUserHighCompanyCount")
     public ResponseModel<List<AlertUseUnitStatisticsDto>> trappedUserHighCompanyCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -121,7 +119,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-维保单位平均救援时间排名", notes = "大屏-应急-维保单位平均救援时间排名")
-    @PostMapping(value = "/yj/rankUnitByRescueTime")
+    @PostMapping(value = "/rankUnitByRescueTime")
     public ResponseModel<List<Map<String, Object>>> rankUnitByRescueTime(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -132,7 +130,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-各地市应急事件总数排名", notes = "大屏-应急-各地市应急事件总数排名")
-    @PostMapping(value = "/yj/regionEventRank")
+    @PostMapping(value = "/regionEventRank")
     public ResponseModel<JSONObject> regionEventRank(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
@@ -143,7 +141,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-中间地图图列统计", notes = "大屏-应急-中间地图图列统计")
-    @PostMapping(value = "/yj/center-map/legend")
+    @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()) {
@@ -154,7 +152,7 @@ public class DPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-中间地图地市统计", notes = "大屏总览中间-地图地市统计")
-    @PostMapping(value = "/yj/center-map/overview")
+    @PostMapping(value = "/center-map/overview")
     public ResponseModel<List<Map<String, Object>>> centerMapCountForOverview(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/statistics/dp/ScreenController.java → 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.tcm.biz.controller.statistics.dp;
+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
-import com.yeejoin.amos.boot.module.tcm.api.dto.ScreenDto;
-import com.yeejoin.amos.boot.module.tcm.api.service.statistics.IScreenService;
+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.web.bind.annotation.PostMapping;
@@ -13,10 +13,10 @@ 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 javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * 大屏控制层
  *
@@ -24,43 +24,49 @@ import java.util.Map;
  * @date 2024-07-09
  */
 @RestController
-@Api(tags = "大屏企业统计")
-@RequestMapping(value = "/statistics")
-public class ScreenController {
-    @Resource
-    private IScreenService screenService;
+@Api(tags = "大屏-总览统计API")
+@RequestMapping(value = "/zl/dp")
+public class ZLDPStatisticsController {
+
+    private ZLDPStatisticsServiceImpl statisticsService;
+
+    public ZLDPStatisticsController(ZLDPStatisticsServiceImpl statisticsService) {
+        this.statisticsService = statisticsService;
+    }
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/companyInfo")
     @ApiOperation(httpMethod = "POST", value = "大屏企业统计", notes = "大屏企业统计")
-    public ResponseModel<List<Map<String,Object>>> companyInfo(@RequestBody ScreenDto screenDto){
-        return ResponseHelper.buildResponse(screenService.companyInfo(screenDto));
+    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 = "大屏检测机构统计")
-    public ResponseModel<List<Map<String,Object>>> testOrg(@RequestBody ScreenDto screenDto){
-        return ResponseHelper.buildResponse(screenService.testOrg(screenDto));
+    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 = "大屏人员统计")
-    public ResponseModel<Map<String,Object>> userCount(@RequestBody ScreenDto screenDto){
-        return ResponseHelper.buildResponse(screenService.userCount(screenDto));
+    public ResponseModel<Map<String, Object>> userCount(@RequestBody DPFilterParamDto screenDto) {
+        return ResponseHelper.buildResponse(statisticsService.userCount(screenDto));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/supervisorCount")
     @ApiOperation(httpMethod = "POST", value = "大屏行业主管部门统计", notes = "大屏行业主管部门统计")
-    public ResponseModel<Map<String,Object>> supervisorCount(@RequestBody ScreenDto screenDto){
-        return ResponseHelper.buildResponse(screenService.supervisorCount(screenDto));
+    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 = "大屏设备使用场所统计")
-    public ResponseModel<List<Map<String,Object>>> equipmentInformCount(@RequestBody ScreenDto screenDto){
-        return ResponseHelper.buildResponse(screenService.equipmentInformCount(screenDto));
+    public ResponseModel<List<Map<String, Object>>> equipmentInformCount(@RequestBody DPFilterParamDto screenDto) {
+        return ResponseHelper.buildResponse(statisticsService.equipmentInformCount(screenDto));
     }
 }

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.JGDPStatisticsServiceImpl;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+/**
+ * @author Administrator
+ */
+@Component
+public class DataInitAfterRuning implements ApplicationRunner {
+
+    private JGDPStatisticsServiceImpl jgdpStatisticsService;
+
+    private AmosRequestContext amosRequestContext;
+
+    public DataInitAfterRuning(JGDPStatisticsServiceImpl jgdpStatisticsService, AmosRequestContext amosRequestContext) {
+        this.jgdpStatisticsService = jgdpStatisticsService;
+        this.amosRequestContext = amosRequestContext;
+    }
+
+    @Override
+    public void run(ApplicationArguments args) {
+        // 初始化数据到内存
+        RequestContext.setAppKey(amosRequestContext.getAppKey());
+        RequestContext.setProduct(amosRequestContext.getProduct());
+        RequestContext.setToken(amosRequestContext.getToken());
+        jgdpStatisticsService.init();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java → 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/DPSubServiceImpl.java

-package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
+package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
-import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
-import com.yeejoin.amos.boot.module.jyjc.biz.util.DpSubUtils;
-import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonValueUtils;
-import com.yeejoin.amos.boot.module.jyjc.biz.util.RestTemplateUtils;
-import com.yeejoin.amos.boot.module.jyjc.biz.util.StringUtils;
+import com.yeejoin.amos.boot.biz.common.utils.JsonValueUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RestTemplateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.StringUtils;
+import com.yeejoin.amos.boot.module.statistcs.biz.utils.DpSubUtils;
 import com.yeejoin.amos.feign.morphic.Morphic;
 import com.yeejoin.amos.feign.morphic.model.FormSceneModel;
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
@@ -31,8 +30,9 @@ import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import java.net.URI;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DPStatisticsServiceImpl.java → 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/JGDPStatisticsServiceImpl.java

-package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
@@ -60,7 +60,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class DPStatisticsServiceImpl {
+public class JGDPStatisticsServiceImpl {
 
     /**
      * 压力容器设备种类
@@ -134,7 +134,7 @@ public class DPStatisticsServiceImpl {
     @Autowired
     private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
 
-    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, EquipTechParamPipelineMapper techParamsPipelineMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper, TzsUserInfoMapper userInfoMapper) {
+    public JGDPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, EquipTechParamPipelineMapper techParamsPipelineMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper, TzsUserInfoMapper userInfoMapper) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.useRegistrationMapper = useRegistrationMapper;
         this.techParamsPipelineMapper = techParamsPipelineMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java → 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/JYJCDPStatisticsServiceImpl.java

-package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
+package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
@@ -15,7 +15,6 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
@@ -51,7 +50,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class DPStatisticsServiceImpl {
+public class JYJCDPStatisticsServiceImpl {
 
     /**
      * 压力容器设备种类
@@ -84,7 +83,7 @@ public class DPStatisticsServiceImpl {
 
     private RestHighLevelClient restHighLevelClient;
 
-    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcBaseMapper jyjcBaseMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper, RestHighLevelClient restHighLevelClient) {
+    public JYJCDPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcBaseMapper jyjcBaseMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper, RestHighLevelClient restHighLevelClient) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.inspectionApplicationEquipMapper = inspectionApplicationEquipMapper;
         this.inspectionApplicationMapper = inspectionApplicationMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/DpSubUtils.java → amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/utils/DpSubUtils.java

-package com.yeejoin.amos.boot.module.jyjc.biz.util;
+package com.yeejoin.amos.boot.module.statistcs.biz.utils;
 
 
 import org.springframework.core.io.ClassPathResource;

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/application-dev.properties

+#DB properties:
+spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
+spring.datasource.username=admin
+spring.datasource.password=Yeejoin@2023
+spring.datasource.driver-class-name=cn.com.vastbase.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=25
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=120000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+## eureka properties:
+eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.3.20:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=172.16.3.20
+
+#redis properties:
+spring.redis.database=1
+spring.redis.host=172.16.10.243
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.10.243:2883
+emqx.client-user-name=admin
+emqx.client-password=public
+emqx.keepAliveInterval=1000
+
+## ES properties:
+spring.elasticsearch.rest.uris=http://172.16.10.243:9200
+elasticsearch.username= elastic
+elasticsearch.password= a123456
+
+
+amos.system.user.user-name=jyjg04
+amos.system.user.password=a1234560
+amos.system.user.app-key=AMOS_STUDIO
+amos.system.user.product=AMOS_STUDIO_WEB
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/application.properties

+spring.application.name=TZS-STATISTICS
+server.servlet.context-path=/statistics
+server.port=12001
+spring.profiles.active=dev
+
+spring.jackson.time-zone=GMT+8
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+logging.config=classpath:logback-${spring.profiles.active}.xml
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+## eureka properties:
+eureka.client.registry-fetch-interval-seconds=5
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url-path=/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+spring.security.user.roles=SBA_ADMIN
+spring.main.allow-bean-definition-overriding=true

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json

+{
+  "name": "企业模板",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "基本信息",
+      "renderType": "basic",
+      "formSeq": "1793454184889085953",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/tcm/baseEnterprise/getInfoByUseCode/map",
+          "params": {
+            "useCode": "{useUnitCode}"
+          }
+        },
+        "resultConvert": "",
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "industrySupervisor",
+            "dictionaryType": "HYZGBM"
+          },
+          {
+            "fieldKey": "registeredOrganCode",
+            "dictionaryType": "DJJG"
+          }
+        ]
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "设备列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/page",
+          "params": {
+            "number": 1,
+            "size": 14,
+            "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "record",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_LIST","width": 150,"align": "left","title": "设备种类","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CATEGORY","width": 160,"align": "left","title": "设备类别","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_DEFINE","width": 150,"align": "left","title": "设备品种","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
+          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCT_NAME","width": 180,"align": "left","title": "设备名称","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "6EB924FB-EFEA-4779-ADF8-78F310818D2D"},
+          {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "出厂编号/产品编码","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"},
+          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCE_UNIT_NAME","width": 180,"align": "left","title": "制造单位","key": "EADCED1C-C761-4209-B6C6-16298B53DD2E"},
+          {"dataRenderingMode": "defaultText","dataIndex": "USE_UNIT_NAME","width": 180,"align": "left","title": "使用单位","key": "BA4FB9F0-7F44-473F-A977-5C36A69CD541"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 2,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json

+{
+  "name": "设备-锅炉",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "gl",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734819004637278210",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "DEVICE_LEVEL",
+            "dictionaryType": "GLJB"
+          },
+          {
+            "fieldKey": "FUEL_TYPE",
+            "dictionaryType": "GLZL"
+          },
+          {
+            "fieldKey": "NAME_OF_PRESSURE_PARTS",
+            "dictionaryType": "GLBJMC"
+          }
+        ]
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "gl": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json

+{
+  "name": "设备-压力容器",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "ylrq",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818687287848961",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "QP_LOSSLESS",
+            "dictionaryType": "RQJCFF"
+          },
+          {
+            "fieldKey": "RQJCFF",
+            "dictionaryType": "RQJCFF"
+          },
+          {
+            "fieldKey": "MAIN_STRUCTURE_TYPE",
+            "dictionaryType": "RQJG"
+          },
+          {
+            "fieldKey": "CHECK_LOSSLESS",
+            "dictionaryType": "RQJCFF"
+          }
+        ]
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "ylrq": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json

+{
+  "name": "设备-电梯",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "dt",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734504628768239617",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "CONTROL_MODE",
+            "dictionaryType": "KZFS"
+          },
+          {
+            "fieldKey": "EXPLOSIONPROOF_GRADE",
+            "dictionaryType": "FBDJ"
+          },
+          {
+            "fieldKey": "JACKING_TYPE",
+            "dictionaryType": "DSXS"
+          }
+        ]
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "dt": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json

+{
+  "name": "设备-起重机械",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "qzqx",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818709194698753",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "WORK_LEVEL",
+            "dictionaryType": "GZJB"
+          },
+          {
+            "fieldKey": "select_bq8h7v9tj1",
+            "dictionaryType": "FBDJ"
+          }
+        ]
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "qzqx": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json

+{
+  "name": "设备-场（厂）内机动车",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "cnjdc",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818684284727297",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "PROTECT_GRADE",
+            "dictionaryType": "FBDJ"
+          }
+        ]
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "cnjdc": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json

+{
+  "name": "设备-大型游乐设施",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "dxylss",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818700369883137",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "dxylss": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json

+{
+  "name": "设备-压力管道",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "ylgd",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818687287848961",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "GDLB",
+            "dictionaryType": "GDLB"
+          }
+        ]
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "ylgd": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json

+{
+  "name": "设备-客运索道",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
+      }
+    },
+    {
+      "key": "kysd",
+      "displayName": "技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818694514634753",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "CARRIER_LINE",
+            "dictionaryType": "YZS"
+          }
+        ]
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "current": 1,
+            "size": 14,
+            "record": "{record}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "sequenceNbr",
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "kysd": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/logback-dev.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/jyjc.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>30mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+<!--    &lt;!&ndash; ELK管理 &ndash;&gt;-->
+<!--    <appender name="ELK" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+<!--        <destination>172.16.10.210:4560</destination>-->
+<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
+<!--    </appender>-->
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO" />
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+    <logger name="org.apache.activemq" level="INFO"/>
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin" level="INFO"/>
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <!-- <appender-ref ref="FILE" /> -->
+        <appender-ref ref="STDOUT" />
+<!--        <appender-ref ref="ELK" />-->
+    </root>
+</configuration>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>amos-boot-system-tzs</artifactId>
+        <groupId>com.amosframework.boot</groupId>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.amosframework.boot</groupId>
+    <artifactId>amos-boot-module-statistics</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>amos-boot-module-statistics-api</module>
+        <module>amos-boot-module-statistics-biz</module>
+    </modules>
+
+
+</project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/statistics/IScreenService.java

-package com.yeejoin.amos.boot.module.tcm.api.service.statistics;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.tcm.api.dto.*;
-import com.yeejoin.amos.boot.module.tcm.api.enums.DispatchPaperEnums;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 大屏接口类
- *
- * @author maxy
- * @date 2024-07-09
- */
-@Service
-public interface IScreenService {
-    List<Map<String,Object>> companyInfo(ScreenDto screenDto);
-
-    List<Map<String,Object>> testOrg(ScreenDto screenDto);
-
-    Map<String,Object> userCount(ScreenDto screenDto);
-
-    Map<String,Object> supervisorCount(ScreenDto screenDto);
-
-    List<Map<String,Object>> equipmentInformCount(ScreenDto screenDto);
-}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.AlertCalledRecordDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
@@ -111,4 +112,30 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
  @Select("select count(1) from tz_alert_called where rec_user_name =#{userName} and rec_date >= #{startTime} and rec_date <= #{endTime}")
  Integer getCountNum(String userName, Date startTime, Date endTime);
+
+ /**
+  * 接警情况统计
+  *
+  * @param beginDate
+  * @param endDate
+  * @return
+  */
+ List<Map<String, Object>> queryNearlyList(@Param("beginDate") String beginDate,
+                                           @Param("endDate") String endDate,
+                                           @Param("regionCode") String regionCode
+ );
+
+ /**
+  * 接警情况统计（按场所）
+  *
+  * @return
+  */
+ List<Map<String, Object>> queryListByLocation(@Param("regionCode") String regionCode, @Param("dto") DPFilterParamDto filterParamDto);
+ /**
+  * 接警情况统计（故障原因）
+  *
+  * @return
+  */
+ List<Map<String, Object>> faultCauseRatio(@Param("regionCode") String regionCode);
+
 }

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchTask;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 派遣任务 Mapper 接口
@@ -24,4 +25,6 @@ public interface DispatchTaskMapper extends BaseMapper<DispatchTask> {
     List<WechatMyTaskListDto> getTaskListByPhonePager(@Param("phone") String phone, @Param("typeCode") String typeCode, @Param("current") Long current);
 
     List<MainPersonDto> todayTaskPerson();
+
+    List<Map<String, Object>> rankUnitByRescueTime(@Param("regionCode") String regionCode);
 }

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

@@ -79,4 +79,7 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
      * @return Long   统计数量
      */
     Long countByOperatingStatusAndOrgCode(@Param("orgCode") String orgCode, @Param("operatingStatus") String operatingStatus, @Param("cityCode") String cityCode);
+
+
+    List<TzBaseEnterpriseInfoDto> queryByUseCode(@Param("useCodes") List<String> useCode);
 }

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

 package com.yeejoin.amos.boot.module.ymt.flc.api.mapper;
 
-import com.yeejoin.amos.boot.module.ymt.flc.api.entity.CylinderAreaData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.biz.common.dto.KeyValueDto;
+import com.yeejoin.amos.boot.module.common.api.dto.CylinderInfoStatisticsDto;
+import com.yeejoin.amos.boot.module.ymt.flc.api.entity.CylinderAreaData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 气瓶区域统计表 Mapper 接口
@@ -11,4 +17,33 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CylinderAreaDataMapper extends BaseMapper<CylinderAreaData> {
 
+
+    Map<String, Object> getInspectionExpiredRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+
+    Map<String, Object> getInspectionResultRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+
+    /**
+     * 查询单个单位的有效期信息
+     *
+     * @param appId 公司唯一标识
+     * @return KeyValueDto
+     */
+    KeyValueDto queryLicenseEfficiencyOneCompany(@Param(value = "appId") String appId);
+
+
+    /**
+     * 单位按照资质状态分组下的统计数量
+     *
+     * @param regionCode 区域
+     * @return List<KeyValueDto>
+     */
+    List<KeyValueDto> queryLicenseEfficiencyOfRegion(@Param(value = "regionCode") String regionCode);
+
+    List<CylinderInfoStatisticsDto> getCylinderStatisticsData(@Param(value = "orgCode") String orgCode);
+
+    List<CylinderInfoStatisticsDto> getCylinderStatisticsDataByCity(String orgCode);
+
+    List<Map<String, Object>> getQiZhanStatisticsDataByCity(@Param(value = "orgCodes") List<String> orgCodes);
+
+    Long getOpertorStatisticsDataByCity(@Param(value = "orgCodes") List<String> orgCodes);
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ymt.flc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.CylinderFillingRecordStatisticsDto;
 import com.yeejoin.amos.boot.module.ymt.flc.api.dto.CylinderInfoDto;
 import com.yeejoin.amos.boot.module.ymt.flc.api.entity.CylinderInfo;
 import org.apache.ibatis.annotations.Param;
@@ -87,4 +88,8 @@ public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
 
 
     Integer getInfoTotal();
+
+    List<CylinderFillingRecordStatisticsDto> queryFillingRecordByOrgCode(@Param("orgCode") String orgCode, @Param("startTime") String startTime);
+
+    List<CylinderFillingRecordStatisticsDto> queryoffloadingByOrgCode(@Param("orgCode") String orgCode, @Param("startTime") String startTime);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -624,7 +624,65 @@
 			</foreach>
 		</if>
 	</select>
+	<select id="queryNearlyList" resultType="java.util.Map">
+		SELECT
+			date_format (call_time, '%Y-%m-%d') AS day,
+			alarm_type as alarmType,
+			ifnull ( SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0) AS majorAlertCount
+		FROM
+			tz_alert_called
+		WHERE
+		    biz_org_code like concat(#{regionCode}, '%')
+		    AND day BETWEEN #{beginDate} AND #{endDate}
+		GROUP BY
+			day, alarm_type
+		ORDER BY
+			day ASC
+	</select>
+
+	<select id="queryListByLocation" resultType="java.util.Map">
+		SELECT
+		ifnull ( SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0 ) AS majorAlertCount,
+		cdd.NAME as name
+		FROM
+		tz_alert_called tac
+		LEFT JOIN idx_biz_jg_use_info ibjuj ON tac.equipment_id = ibjuj.RECORD
+		LEFT JOIN cb_data_dictionary cdd ON ibjuj.USE_PLACE = cdd.sequence_nbr
+		WHERE
+		tac.biz_org_code LIKE concat(#{regionCode}, '%')
+		AND (tac.alarm_type_code = '960' or tac.alarm_type_code = '961')
+		AND
+		ibjuj.USE_PLACE is NOT NULL
+		AND cdd.NAME is NOT NULL
+		<if test="dto.beginDate !=null and dto.beginDate !='' and dto.endDate !=null and dto.endDate !=''">
+			AND tac.call_time BETWEEN #{dto.beginDate} AND #{dto.endDate}
+		</if>
+		GROUP BY
+		cdd.NAME
+		ORDER BY ibjuj.USE_PLACE ASC
+	</select>
 
+	<select id="faultCauseRatio" resultType="java.util.Map">
+		SELECT
+			tafv.field_value AS errorResult,
+			ifnull ( SUM ( CASE WHEN tac.father_alert IS NULL THEN 1 ELSE 0 END ), 0 ) AS majorAlertCount
+		FROM
+			tz_alert_called tac
+				LEFT JOIN tz_dispatch_task tdt ON tac.sequence_nbr = tdt.alert_id
+				LEFT JOIN tz_alert_form_value tafv ON tac.sequence_nbr = tafv.alert_called_id
+				LEFT JOIN cb_data_dictionary cdd ON cdd.NAME = tafv.field_value
+		WHERE
+			tac.biz_org_code LIKE concat(#{regionCode}, '%')
+		  AND tac.alarm_type_code = '961'
+		  AND cdd.TYPE = 'GZYY'
+		  AND tafv.field_code = 'error_result'
+		  AND tafv.field_value IS NOT NULL
+		GROUP BY
+			tafv.field_value
+		ORDER BY
+			majorAlertCount ASC
+			LIMIT 5
+	</select>
 </mapper>
 
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CylinderAreaDataMapper.xml

@@ -2,4 +2,161 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ymt.flc.api.mapper.CylinderAreaDataMapper">
 
+    <select id="queryLicenseEfficiencyOneCompany" resultType="com.yeejoin.amos.boot.biz.common.dto.KeyValueDto">
+        SELECT
+            cu.sequence_nbr as strKey,
+            (select
+            case
+            when min(ul.expiry_date) >= now()
+            THEN '正常'
+            when min(ul.expiry_date) is null then '--'
+            ELSE '已超期'
+            END AS licenseOk  from tz_base_unit_licence ul where cu.credit_code = ul.unit_code) as strValue
+        FROM
+            tz_cylinder_unit cu
+        where
+            cu.unit_status = '1210'
+            and cu.app_id = #{appId}
+    </select>
+    <select id="queryLicenseEfficiencyOfRegion" resultType="com.yeejoin.amos.boot.biz.common.dto.KeyValueDto">
+        SELECT
+            count(1) as iValue,
+            (select
+            case
+            when min(ul.expiry_date) >= now()
+            THEN '正常'
+            when min(ul.expiry_date) is null then '未提供'
+            ELSE '已超期'
+            END AS licenseOk  from tz_base_unit_licence ul where cu.use_code = ul.unit_code) as strKey
+        FROM
+            tz_base_enterprise_info cu
+        where
+             cu.data_sources = '陕西省内企业'
+          AND cu.unit_type LIKE '%充装单位%'
+          and cu.org_code like concat('%', #{regionCode}, '%')
+        GROUP BY strKey
+    </select>
+
+    <select id="getInspectionExpiredRate" resultType="java.util.Map">
+        SELECT
+        CASE WHEN COUNT(*) = 0 THEN 0 ELSE ROUND((COUNT(CASE WHEN ci.next_inspection_date <![CDATA[<=]]> now() THEN 1 END) * 100.0 / COUNT(*)), 2) END AS expiredRate
+        FROM
+        "tz_cylinder_inspection" ci
+        LEFT JOIN tz_base_enterprise_info cu on ci.app_id = cu.app_id
+        <where>
+            cu.data_sources = '陕西省内企业'
+            AND cu.unit_type LIKE '%充装单位%'
+            <if test="regionCode != null and regionCode != ''">
+                and cu.org_code like concat(#{regionCode}, '%')
+            </if>
+            <if test="appId != null and appId != ''">
+                and cu.app_id = #{appId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getInspectionResultRate" resultType="java.util.Map">
+        SELECT
+        CASE WHEN COUNT(*) = 0 THEN 0 ELSE ROUND((COUNT(CASE WHEN ci.inspection_result = '3123' THEN 1 END) * 100.0 / COUNT(*)), 2) END AS resultRate
+        FROM
+        "tz_cylinder_inspection" ci
+        LEFT JOIN tz_base_enterprise_info cu on ci.app_id = cu.app_id
+        <where>
+            cu.data_sources = '陕西省内企业'
+            AND cu.unit_type LIKE '%充装单位%'
+            <if test="regionCode != null and regionCode != ''">
+                and cu.org_code like concat( #{regionCode}, '%')
+            </if>
+            <if test="appId != null and appId != ''">
+                and cu.app_id = #{appId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getCylinderStatisticsData" resultType="com.yeejoin.amos.boot.module.common.api.dto.CylinderInfoStatisticsDto">
+        SELECT
+            t1.unit_name unitName,
+            i.city,
+            i.province,
+            i.district,
+            ROUND( COUNT ( t1.sequence_code ) / 10000.00, 2 ) num
+        FROM
+            tz_base_enterprise_info i
+                RIGHT JOIN tz_cylinder_info t1 ON t1.app_id = i.app_id
+        WHERE
+            i.data_sources = '陕西省内企业'
+          AND i.unit_type LIKE'%充装单位%'
+          AND i.industry_supervisor like concat(#{orgCode}, '%')
+        GROUP BY
+            t1.unit_name
+        ORDER BY
+            num DESC
+    </select>
+
+    <select id="getCylinderStatisticsDataByCity" resultType="com.yeejoin.amos.boot.module.common.api.dto.CylinderInfoStatisticsDto">
+        SELECT
+            i.city,
+            i.province
+            ROUND( COUNT ( t1.sequence_code ) / 10000.00, 2 ) num
+        FROM
+            tz_base_enterprise_info i
+                RIGHT JOIN tz_cylinder_info t1 ON t1.app_id = i.app_id
+        WHERE
+            i.data_sources = '陕西省内企业'
+          AND i.unit_type LIKE'%充装单位%'
+          AND i.industry_supervisor like concat(#{orgCode}, '%')
+        GROUP BY
+            i.city,
+            i.province
+        ORDER BY
+            num DESC
+    </select>
+
+    <select id="getQiZhanStatisticsDataByCity" resultType="Map">
+        select a.* from (
+        SELECT
+        case
+        <if test="orgCodes != null and orgCodes.size > 0">
+            <foreach collection="orgCodes" item="orgCode">
+            when i.supervise_org_code like concat ( #{orgCode}, '%' ) then
+                #{orgCode}
+            </foreach>
+           </if>
+            end orgCode,
+            COUNT ( i.use_unit ) unitCount
+        FROM
+            tz_base_enterprise_info i
+        WHERE
+            i.data_sources = '陕西省内企业'
+          AND i.unit_type LIKE'%充装单位%'
+        <if test="orgCodes != null and orgCodes.size > 0">
+            AND
+            <foreach collection="orgCodes" open="(" item="orgCode" close=")" separator=" or ">
+                (i.org_code like concat(#{orgCode}, '%') )
+            </foreach>
+        </if>
+        )  a
+        where a.orgCode is not null
+        GROUP BY
+            a.orgCode
+    </select>
+
+
+    <select id="getOpertorStatisticsDataByCity" resultType="Long">
+        SELECT
+            count(1)
+        FROM
+            tz_base_enterprise_info u
+                RIGHT JOIN tzs_user_info ui ON ui.unit_code = u.use_code
+        WHERE
+        u.data_sources = '陕西省内企业'
+        AND u.unit_type LIKE'%充装单位%'
+        AND ui.post like '%"6552"%'
+        <if test="orgCodes != null and orgCodes.size > 0">
+            AND
+            <foreach collection="orgCodes" open="(" item="orgCode" close=")" separator=" or ">
+                (u.org_code like concat(#{orgCode}, '%') )
+            </foreach>
+        </if>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -338,4 +338,37 @@
         where ci.is_not_es IS NULL
           AND region_code is not null
     </select>
+    <select id="queryFillingRecordByOrgCode" resultType="com.yeejoin.amos.boot.module.common.api.dto.CylinderFillingRecordStatisticsDto">
+        SELECT
+            SUBSTR( f.filling_endtime, 0, 10 ) filling_time,
+            SUM ( f.filling_quantity ) filling_quantity
+        FROM
+            tz_cylinder_filling_record f ,
+            tz_base_enterprise_info i
+        WHERE
+            i.app_id = f.app_id
+          AND	f.filling_endtime >= concat(#{startTime}, ' 00:00:00')
+          AND i.org_code like concat(#{orgCode}, '%')
+        GROUP BY
+            filling_time
+        ORDER BY
+            filling_time DESC
+    </select>
+
+    <select id="queryoffloadingByOrgCode" resultType="com.yeejoin.amos.boot.module.common.api.dto.CylinderFillingRecordStatisticsDto">
+        SELECT
+            f.statistics_sync_date filling_time,
+            SUM ( f.offloading_volume ) filling_quantity
+        FROM
+            tz_cylinder_offloading f,
+            tz_base_enterprise_info i
+        WHERE
+            i.app_id = f.app_id
+          AND f.statistics_sync_date >= #{startTime}
+          AND i.org_code like concat(#{orgCode}, '%')
+        GROUP BY
+            filling_time
+        ORDER BY
+            filling_time DESC
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/DispatchTaskMapper.xml

@@ -105,6 +105,26 @@
 			left JOIN tcb_use_unit u on u.sequence_nbr = t.response_org_id
 			where to_days(t.dispatch_time) = TO_DAYS(now())
     </select>
-
+	<select id="rankUnitByRescueTime" resultType="java.util.Map">
+		SELECT
+			tac.city,
+			tdt.sequence_nbr as sequenceNbr,
+			tdt.response_org_name as maintUnit,
+			AVG (TIMESTAMPDIFF (SECOND, tdt.arrive_time, tdt.save_time)) AS avgTime
+		FROM
+			tz_dispatch_task tdt
+		LEFT JOIN tz_alert_called tac ON tdt.alert_id = tac.sequence_nbr
+		LEFT JOIN tz_base_enterprise_info tbei ON tdt.response_org_id = tbei.sequence_nbr
+		WHERE
+		    tac.alarm_type_code = '960'
+		  AND tdt.org_type_code = 'repairUnit'
+		  AND tac.biz_org_code LIKE concat(#{regionCode}, '%')
+		  AND tdt.arrive_time IS NOT NULL
+		  AND tdt.save_time IS NOT NULL
+		GROUP BY
+			tdt.response_org_id
+		ORDER BY
+			avgTime
+	</select>
 
 </mapper>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -225,4 +225,12 @@
 		 	and ((supervise_org_code != '50' and supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (supervise_org_code = '50' and office_region LIKE CONCAT ('%', #{cityCode}, '%')))
 		 	and operating_status = #{operatingStatus}
 	</select>
+	<select id="queryByUseCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
+		select * from tz_base_enterprise_info where use_code in
+		<if test="useCodes != null">
+			<foreach collection="useCodes" item="useCode" open="(" close=")" separator=",">
+				#{useCode}
+			</foreach>
+		</if>
+	</select>
 </mapper>

amos-boot-system-tzs/pom.xml

@@ -19,6 +19,7 @@
         <module>amos-boot-module-tcm</module>
         <module>amos-boot-module-app</module>
         <module>amos-boot-module-tzspatrol</module>
+        <module>amos-boot-module-statistics</module>
     </modules>
     <properties>
         <amos.version.tzs>1.8.5</amos.version.tzs>