Merge remote-tracking branch 'origin/develop_tzs_register_test' into develop_tzs_register_test

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

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum RegistrationTypeEnum {
+    新设备首次启用("新设备首次启用","DJ_SY"),
+    历史无证设备登记("历史无证设备登记","SP_TT");
+
+    private String name;
+    private String code;
+
+    public static String getNameByType(String code) {
+        String name = null;
+        for (RegistrationTypeEnum enumOne : RegistrationTypeEnum.values()) {
+            if (enumOne.getCode().equals(code)) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+}

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

@@ -4,6 +4,7 @@ import lombok.Getter;
 
 /**
  * 业务类型枚举
+ * 枚举code需同字典表中问题类型（type=ISSUE_TYPE）code保持一致
  *
  * @author Administrator
  */
@@ -18,7 +19,7 @@ public enum SafetyProblemTypeEnum {
     WBCQ("1", "维保超期", "设备维保超期", "safetyProblemTracing/wb/cq", "outOfMaintenanceRecords"),
     WBBA("11", "维保合同备案", "设备维保合同备案", "safetyProblemTracing/wb/ba", null),
     XKCQ("3", "许可超期", "企业许可超期", "safetyProblemTracing/xk/cq", null),
-    ZZCQ("4", "人员资质超期", "人员资质超期", "safetyProblemTracing/zz/cq", null);
+    ZZCQ("9", "资质超期", "人员资质超期", "safetyProblemTracing/zz/cq", null);
 
     private final String code;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -92,6 +92,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     List<Map<String,Object>> getUseRegisterCount(@Param("orgCode")String orgCode);
 
+    List<Map<String,Object>> getUseRegisterCountTotal();
+
     List<Map<String, Object>> getElevatorModeList(@Param("equIds") List<String> equIds);
 
     List<Map<String, Object>> getCylinderInfoList(@Param("records") List<String> records);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -2561,7 +2561,7 @@
         ei.unit_type unitType,
         ei.supervise_org_code superviseOrgCode,
         ei.supervise_org_name superviseOrgName,
-        ul.sequence_nbr licenceSeq,
+        ul.sequence_nbr problemSourceId,
         ul.cert_no certNo,
         ul.expiry_date expiryDate,
         ul.item_code itemCode,
@@ -2625,7 +2625,7 @@
             ei.unit_type unitType,
             ei.supervise_org_code superviseOrgCode,
             ei.supervise_org_name superviseOrgName,
-            tup.sequence_nbr permissionSeq,
+            tup.sequence_nbr problemSourceId,
             tup.cert_no certNo,
             tup.expiry_date expiryDate,
             tui.name  userName,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -1290,4 +1290,20 @@
         )
     </update>
 
+    <select id="getUseRegisterCountTotal" resultType="java.util.Map">
+        SELECT
+            date_format(A.audit_pass_date, '%Y-%m') AS time,
+            A.supervision_org_code AS  supervisionOrgCode
+        FROM
+            "tzs_jg_use_registration_eq" ae
+                JOIN tzs_jg_use_registration A ON A.sequence_nbr = ae.equip_transfer_id
+                JOIN "idx_biz_jg_use_info" u ON ae.equ_id = u."RECORD"
+                JOIN idx_biz_jg_register_info ri ON u."RECORD" = ri."RECORD"
+        WHERE
+            ae.equ_id = u."RECORD"
+          AND ri.EQU_CATEGORY = '2300'
+          AND A.status = '已完成'
+          AND A.is_delete = 0
+           AND A.supervision_org_code is not null
+    </select>
 </mapper>

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

@@ -258,7 +258,7 @@ public class SafetyProblemTracingController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "GET", value = "生成维保超期数据", notes = "生成维保超期数据")
+	@ApiOperation(httpMethod = "GET", value = "生成人员资质超期数据", notes = "生成人员资质超期数据")
 	@GetMapping(value = "/gen/test4")
 	public ResponseModel<String> test4() {
 		safetyProblemTracingGenService.executePersonnalCertificationCheck();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/XKCQEventHandler.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.handler;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemSourceTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.event.SafetyProblemEvent;
 import com.yeejoin.amos.boot.module.jg.api.event.handler.SafetyProblemEventHandler;
@@ -38,6 +39,12 @@ public class XKCQEventHandler implements SafetyProblemEventHandler {
     }
 
     private void generateProblem(JSONArray jsonArray) {
+        jsonArray.forEach(item -> {
+            JSONObject problemObj = (JSONObject) item;
+            problemObj.put("sourceType", SafetyProblemSourceTypeEnum.UNIT.getName());
+            problemObj.put("sourceTypeCode", SafetyProblemSourceTypeEnum.UNIT.getCode());
+            problemObj.put("problemDesc", "证书编号：" + problemObj.get("certNo") + SafetyProblemTypeEnum.XKCQ.getName());
+        });
         SafetyProblemTopicMessage.generateUnitProblem(jsonArray, SafetyProblemTypeEnum.XKCQ, safetyProblemTracingService);
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/ZZCQEventHandler.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.handler;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemSourceTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.event.SafetyProblemEvent;
 import com.yeejoin.amos.boot.module.jg.api.event.handler.SafetyProblemEventHandler;
@@ -38,6 +39,12 @@ public class ZZCQEventHandler implements SafetyProblemEventHandler {
     }
 
     private void generateProblem(JSONArray jsonArray) {
+        jsonArray.forEach(item -> {
+            JSONObject problemObj = (JSONObject) item;
+            problemObj.put("sourceType", SafetyProblemSourceTypeEnum.PERSONNEL.getName());
+            problemObj.put("sourceTypeCode", SafetyProblemSourceTypeEnum.PERSONNEL.getCode());
+            problemObj.put("problemDesc", "证书编号：" + problemObj.getOrDefault("certNo", "") + SafetyProblemTypeEnum.ZZCQ.getName());
+        });
         SafetyProblemTopicMessage.generatePersonnelProblem(jsonArray, SafetyProblemTypeEnum.ZZCQ, safetyProblemTracingService);
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/SafetyProblemTopicMessage.java

@@ -151,6 +151,10 @@ public class SafetyProblemTopicMessage extends EmqxListener {
     }
 
     public static void generateUnitProblem(JSONArray jsonArray, SafetyProblemTypeEnum problemTypeEnum, SafetyProblemTracingServiceImpl safetyProblemTracingService) {
+        generateProblem2(jsonArray, problemTypeEnum, safetyProblemTracingService);
+    }
+
+    private static void generateProblem2(JSONArray jsonArray, SafetyProblemTypeEnum problemTypeEnum, SafetyProblemTracingServiceImpl safetyProblemTracingService) {
         if (jsonArray == null || problemTypeEnum == null) {
             throw new IllegalArgumentException("jsonObject and problemTypeEnum must not be null.");
         }
@@ -163,10 +167,10 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 SafetyProblemTracing safetyProblemTracing = new SafetyProblemTracing();
                 safetyProblemTracing.setProblemType(problemTypeEnum.getName());
                 safetyProblemTracing.setProblemTypeCode(problemTypeEnum.getCode());
-                safetyProblemTracing.setProblemDesc(problemTypeEnum.getDesc() + "-" + json.getOrDefault("itemName", "") + "-" + json.getOrDefault("subItemName", ""));
-                safetyProblemTracing.setSourceType(SafetyProblemSourceTypeEnum.UNIT.getName());
-                safetyProblemTracing.setSourceTypeCode(SafetyProblemSourceTypeEnum.UNIT.getCode());
-                safetyProblemTracing.setSourceId(json.getOrDefault("licenceSeq", "").toString());
+                safetyProblemTracing.setProblemDesc(json.getString("problemDesc"));
+                safetyProblemTracing.setSourceType(json.getString("sourceType"));
+                safetyProblemTracing.setSourceTypeCode(json.getString("sourceTypeCode"));
+                safetyProblemTracing.setSourceId(json.getString("problemSourceId"));
                 safetyProblemTracing.setProblemTime(new Date());
                 safetyProblemTracing.setPrincipalUnit(json.getOrDefault("useUnit", "").toString());
                 safetyProblemTracing.setPrincipalUnitCode(json.getOrDefault("useUnitCode", "").toString());
@@ -187,39 +191,7 @@ public class SafetyProblemTopicMessage extends EmqxListener {
     }
 
     public static void generatePersonnelProblem(JSONArray jsonArray, SafetyProblemTypeEnum problemTypeEnum, SafetyProblemTracingServiceImpl safetyProblemTracingService) {
-        if (jsonArray == null || problemTypeEnum == null) {
-            throw new IllegalArgumentException("jsonObject and problemTypeEnum must not be null.");
-        }
-        if (!ValidationUtil.isEmpty(jsonArray)) {
-            List<SafetyProblemTracing> safetyProblemTracingList = jsonArray.stream().map(item -> {
-                if (!(item instanceof JSONObject)) {
-                    throw new IllegalArgumentException("item is not a JSONObject.");
-                }
-                JSONObject json = (JSONObject) item;
-                SafetyProblemTracing safetyProblemTracing = new SafetyProblemTracing();
-                safetyProblemTracing.setProblemType(problemTypeEnum.getName());
-                safetyProblemTracing.setProblemTypeCode(problemTypeEnum.getCode());
-                safetyProblemTracing.setProblemDesc(problemTypeEnum.getDesc() + "-" + json.getOrDefault("userName", "") + "-" + json.getOrDefault("certNo", ""));
-                safetyProblemTracing.setSourceType(SafetyProblemSourceTypeEnum.PERSONNEL.getName());
-                safetyProblemTracing.setSourceTypeCode(SafetyProblemSourceTypeEnum.PERSONNEL.getCode());
-                safetyProblemTracing.setSourceId(json.getOrDefault("permissionSeq", "").toString());
-                safetyProblemTracing.setProblemTime(new Date());
-                safetyProblemTracing.setPrincipalUnit(json.getOrDefault("useUnit", "").toString());
-                safetyProblemTracing.setPrincipalUnitCode(json.getOrDefault("useUnitCode", "").toString());
-                safetyProblemTracing.setPrincipalUnitType(json.getOrDefault("unitType", "").toString());
-                safetyProblemTracing.setGoverningBody(json.getOrDefault("superviseOrgName", "").toString());
-                safetyProblemTracing.setGoverningBodyCode(json.getOrDefault("useUnitCode", "").toString());
-                safetyProblemTracing.setGoverningBodyOrgCode(json.getOrDefault("superviseOrgCode", "").toString());
-                safetyProblemTracing.setCreateDate(new Date());
-                safetyProblemTracing.setProblemStatus(SafetyProblemStatusEnum.UNHANDLED.getName());
-                safetyProblemTracing.setProblemStatusCode(SafetyProblemStatusEnum.UNHANDLED.getCode());
-                return safetyProblemTracing;
-            }).collect(Collectors.toList());
-            safetyProblemTracingService.saveOrUpdateBatchByColumns(safetyProblemTracingList,
-                    safetyProblemTracing -> new QueryWrapper<>()
-                            .eq("problem_type_code", safetyProblemTracing.getProblemTypeCode())
-                            .eq("source_id", safetyProblemTracing.getSourceId())
-                            .eq("problem_status_code", SafetyProblemStatusEnum.UNHANDLED.getCode()));}
+        generateProblem2(jsonArray, problemTypeEnum, safetyProblemTracingService);
     }
 
     public String buildTopic(String topic) {

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

@@ -2234,6 +2234,10 @@ public class CommonServiceImpl implements ICommonService {
         DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         Pattern timePattern = Pattern.compile("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}");
 
+        //登记类型
+        if (jsonObject.containsKey("type")){
+            formData.put("registrationType",RegistrationTypeEnum.getNameByType(jsonObject.getString("type")));
+        }
         for (String key : formData.keySet()) {
             if (key.contains("Date") && timePattern.matcher(formData.getString(key)).matches()){
                 // 解析原始日期时间字符串
@@ -2280,7 +2284,7 @@ public class CommonServiceImpl implements ICommonService {
             formData.put("productName", formData.getString("projectContraption"));
         }
         //单位模版 部分字段需从设备列表中获取
-        if (formData.containsKey("equipmentLists") && manageType.equals(UNIT) ){
+        if (formData.containsKey("equipmentLists") ){
             JSONArray equipmentLists = formData.getJSONArray("equipmentLists");
             List<Map<String, Object>> equips = equipmentLists.stream()
                     .filter(obj -> obj instanceof Map)
@@ -2290,7 +2294,27 @@ public class CommonServiceImpl implements ICommonService {
                 formData.put("equNum",equipmentLists.size());
                 //设备品种
                 formData.put("equDefine",equips.get(0).get("equDefineName"));
-            }else if (manageType.equals(UNIT) && !CollectionUtils.isEmpty(equips)){
+
+                Set<String> productNameSet = equips.stream()
+                        .filter(Objects::nonNull) // 过滤掉equip为null的情况
+                        .map(e -> e.get("productName")) // 获取productName
+                        .filter(Objects::nonNull) // 过滤掉productName为null的情况
+                        .map(Object::toString) // 转换为String类型
+                        .collect(Collectors.toSet()); // 收集到Set中
+
+                // 将set转成字符串逗号拼接
+                String productName="";
+                List<String> sortedProductNameList = new
+                        ArrayList<>(productNameSet);
+                if (sortedProductNameList.size() > 3
+                ) {
+                    productName = String.join(",", sortedProductNameList.subList(0, 3)) + ",...";
+                } else
+                {
+                    productName = String.join(",", sortedProductNameList);
+                }
+                formData.put("productName",productName);
+            }else if (manageType.equals(VEHICLE) && !CollectionUtils.isEmpty(equips)){
                 //气瓶数量
                 formData.put("gasNum",equips.size());
                 //设备品种

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

@@ -316,11 +316,15 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
      */
     private void delRepeatUseEquipData(JgChangeRegistrationName notice) {
         if (NOT_FLOWING_STATE.contains(notice.getAuditStatus())) {
-            LambdaQueryWrapper<JgChangeRegistrationNameEq> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, notice.getSequenceNbr());
-            List<JgChangeRegistrationNameEq> noticeEqList = jgChangeRegistrationNameEqMapper.selectList(queryWrapper);
-            noticeEqList.forEach(noticeEq -> EquipUsedCheckStrategyContext.getUsedStrategy(CHANGE_NAME_KEY)
-                    .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getCertificateSeq()), notice.getUseUnitCreditCode())
+            final String creditCode = notice.getUseUnitCreditCode().contains("_")
+                    ? notice.getUseUnitCreditCode().substring(notice.getUseUnitCreditCode().indexOf("_") + 1)
+                    : notice.getUseUnitCreditCode();
+            jgChangeRegistrationNameEqMapper.selectList(
+                    new LambdaQueryWrapper<JgChangeRegistrationNameEq>()
+                            .eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, notice.getSequenceNbr())
+            ).forEach(noticeEq ->
+                    EquipUsedCheckStrategyContext.getUsedStrategy(CHANGE_NAME_KEY)
+                            .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getCertificateSeq()), creditCode)
             );
         }
     }

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

@@ -2520,10 +2520,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (CollectionUtils.isNotEmpty(equipmentLists)) {
                 equipmentLists.stream()
                         .map(obj -> (JSONObject) obj)
-                        .peek(equipmentItem -> equipmentItem.put("useDate", timeToMonths(useDateValue)))
                         .filter(equipmentItem -> this.checkEquStatusInUse(equipmentItem.getString("record")))
-                        .filter(equipmentItem -> addedEquCodes.add(equipmentItem.getString("equCode")))
-                        .forEach(allEquipment::add);
+                        .forEach(item ->{
+                            item.put("useDate", timeToMonths(useDateValue));
+                            allEquipment.add(item);
+                            addedEquCodes.add(item.getString("equCode"));
+                        });
             }
         });
         total = allEquipment.size();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-form-set.ftl

@@ -2191,7 +2191,7 @@
                                             <w:spacing w:val="-1"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${(resultNo)!''}</w:t>
+                                        <w:t>${(inspectReportNo)!''}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-form-unit.ftl

@@ -543,7 +543,7 @@
                         <w:sz w:val="21"/>
                         <w:sz-cs w:val="21"/>
                     </w:rPr>
-                    <w:t>${(registrationType)!''}</w:t>
+                    <w:t>${(registrationType)!'新设备首次启用'}</w:t>
                 </w:r>
             </w:p>
             <w:p>

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

@@ -1344,7 +1344,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
             boolMust.must(QueryBuilders.matchPhraseQuery("USE_INNER_CODE", test));
         }
-        this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"));
+        this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"), map.getString("EQU_CATEGORY_CODE"));
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);
@@ -1382,14 +1382,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     /**
      * 过滤条件去掉流程中的设备,
      *
-     * @param boolMust 条件
+     * @param boolMust        条件
+     * @param equCategoryCode
      */
-    private void setFilterOfInFlowing(BoolQueryBuilder boolMust, String equListCode, String inspectionType) {
+    private void setFilterOfInFlowing(BoolQueryBuilder boolMust, String equListCode, String inspectionType, String equCategoryCode) {
         Set<String> records = this.getEquipInFlowing();
         if (records != null && !records.isEmpty()) {
             boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records));
         }
-        if ("5000".equals(equListCode) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
+        // 流动时起重机械及厂车可直接做首检
+        if (("5000".equals(equListCode) || "4400".equals(equCategoryCode)) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
             boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", false));
         } else {
             BoolQueryBuilder shouldBuilder = QueryBuilders.boolQuery();

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

+package com.yeejoin.amos.boot.module.statistics.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2025-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderBusinessStatisticsDto", description="")
+public class CylinderBusinessStatisticsDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "年月")
+    private String time;
+
+    @ApiModelProperty(value = "总数")
+    private Long num;
+
+    @ApiModelProperty(value = "机构代码")
+    private String supervisionOrgCode;
+
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/entity/CylinderBusinessStatistics.java

+package com.yeejoin.amos.boot.module.statistics.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2025-02-21
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tzs_cylinder_business_statistics")
+public class CylinderBusinessStatistics implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(
+            value = "SEQUENCE_NBR",
+            type = IdType.ID_WORKER
+    )
+    protected Long sequenceNbr;
+
+    /**
+     * 年月
+     */
+	@TableField("time")
+    private String time;
+
+    /**
+     * 总数
+     */
+	@TableField("num")
+    private Long num;
+
+    /**
+     * 机构代码
+     */
+	@TableField("supervision_org_code")
+    private String supervisionOrgCode;
+
+    public CylinderBusinessStatistics(String time, String supervisionOrgCode) {
+        this.time = time;
+        this.supervisionOrgCode = supervisionOrgCode;
+    }
+}

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

+package com.yeejoin.amos.boot.module.statistics.api.mapper;
+
+import com.yeejoin.amos.boot.module.statistics.api.entity.CylinderBusinessStatistics;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2025-02-21
+ */
+public interface CylinderBusinessStatisticsMapper extends BaseMapper<CylinderBusinessStatistics> {
+
+    void deleteAll();
+
+    void insertBatch(@Param("list") List<CylinderBusinessStatistics> cylinderBusinessStatisticsList);
+
+    List<Map<String,Object>> getUseRegisterCount(@Param("orgCode")String orgCode);
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderBusinessStatisticsMapper.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.CylinderBusinessStatisticsMapper">
+    <insert id="insertBatch" parameterType="com.yeejoin.amos.boot.module.statistics.api.entity.CylinderBusinessStatistics">
+        insert into tzs_cylinder_business_statistics
+        (sequence_nbr, time, supervision_org_code, update_time) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sequenceNbr},
+            #{item.time},
+            #{item.supervisionOrgCode},
+            CURRENT_TIMESTAMP
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteAll">
+        delete from tzs_cylinder_business_statistics
+    </delete>
+
+    <select id="getUseRegisterCount" resultType="java.util.Map">
+        SELECT
+            C.time,                              -- 月份
+            COUNT(1) AS num                      -- 每月的记录数
+        FROM
+            tzs_cylinder_business_statistics C
+        WHERE
+            C.supervision_org_code LIKE '50%'  -- 仅过滤 '50%' 开头的监管机构代码
+        GROUP BY
+            C.time                            -- 按月份分组
+    </select>
+</mapper>

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

+package com.yeejoin.amos.boot.module.statistcs.biz.job;
+
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
+import com.yeejoin.amos.boot.module.statistics.api.entity.CylinderBusinessStatistics;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderBusinessStatisticsMapper;
+import lombok.extern.slf4j.Slf4j;
+import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 定时任务统计
+ *
+ * @author LiuLin
+ */
+@EnableScheduling
+@Component
+@Slf4j
+public class MonthCylinderBusinessStatisticsJob {
+
+    private final JgUseRegistrationMapper useRegistrationMapper;
+    private final CylinderBusinessStatisticsMapper businessStatisticsMapper;
+
+    public MonthCylinderBusinessStatisticsJob(JgUseRegistrationMapper useRegistrationMapper,
+                                              CylinderBusinessStatisticsMapper businessStatisticsMapper) {
+        this.useRegistrationMapper = useRegistrationMapper;
+        this.businessStatisticsMapper = businessStatisticsMapper;
+    }
+
+    @Scheduled(cron = "0 */5 * * * ?")
+    @SchedulerLock(name = "cylinderBusinessStatisticsJob", lockAtMostFor = "PT1H")
+    public void cylinderBusinessStatisticsJob() {
+        List<Map<String, Object>> useRegisterCountList = useRegistrationMapper.getUseRegisterCountTotal();
+        if (!CollectionUtils.isEmpty(useRegisterCountList)) {
+            businessStatisticsMapper.deleteAll();
+            List<CylinderBusinessStatistics> statisticsList = useRegisterCountList.stream()
+                    .map(item -> new CylinderBusinessStatistics(
+                            (String) item.get("time"),
+                            (String) item.get("supervisionOrgCode")
+                    ))
+                    .collect(Collectors.toList());
+            businessStatisticsMapper.insertBatch(statisticsList);
+        }
+    }
+}

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

@@ -306,11 +306,11 @@ public class CylinderDPStatisticsServiceImpl {
     public Map<String, Object> getCylinderStatisticsDataByCityForTotal(DPFilterParamDto dpFilterParamDto) {
         Map<String, Object> result = new HashMap<>();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
-        getCylinderMapCount(orgCode, result);
+        getCylinderMapCount(orgCode, result, dpFilterParamDto.getCityCode());
         return result;
     }
 
-    private Map<String, Object> getCylinderMapCount(String orgCode, Map<String, Object> result) {
+    private void getCylinderMapCount(String orgCode, Map<String, Object> result, String cityCode) {
         if (StringUtils.isNotEmpty(orgCode)) {
             Long cylindersCount = this.countForCylinderNum(orgCode);
             Long automotiveGasCount = this.countForCylinderNumForVehicleUsed(orgCode);
@@ -330,15 +330,38 @@ public class CylinderDPStatisticsServiceImpl {
             // 检验超期气瓶数
             result.put("jycqsbCount", this.countForCylinderOverdueInspect(orgCode));
             // 充气量
-            Long fillingVolumeCount = cylinderStatisticsMapper.countFillingVolumeCount(orgCode);
-            result.put("fillingVolumeCount", fillingVolumeCount == null ? 0L : new BigDecimal(fillingVolumeCount).divide(new BigDecimal("10000000")).setScale(3,RoundingMode.HALF_UP).toString());
+            // Long fillingVolumeCount = cylinderStatisticsMapper.countFillingVolumeCount(orgCode);
+            Double fillingVolumeCount = this.countFillingVolumeCount(cityCode);
+            BigDecimal value = new BigDecimal(fillingVolumeCount);
+            value = value.divide(new BigDecimal("1000"), 3, RoundingMode.HALF_UP);
+            String unit = (fillingVolumeCount == 0) ? "吨" : (fillingVolumeCount > 10000 ? "万吨" : "吨");
+            BigDecimal resultValue = (fillingVolumeCount > 10000000) ? value.divide(new BigDecimal("10000000"), 3, RoundingMode.HALF_UP) : value;
+            result.put("fillingVolumeCount", resultValue );
+
             // 卸液量
             Long dischargeVolumeCount = cylinderStatisticsMapper.countDischargeVolumeCount(orgCode);
             result.put("dischargeVolumeCount", dischargeVolumeCount == null ? 0L : new BigDecimal(dischargeVolumeCount).divide(new BigDecimal("10000000")).setScale(3,RoundingMode.HALF_UP).toString());
         } else {
             this.setDefaultValueIfNoData(result, "cylindersCount", "stationCount", "operatorCount", "liquefiedGasCount", "automotiveGasCount", "industrialGasCount", "useRegistrationQuantityCount", "jylqsbCount", "jycqsbCount","fillingVolumeCount","dischargeVolumeCount");
         }
-        return result;
+    }
+
+    /**
+     * 从ES查询总量
+     * @param cityCode
+     * @return
+     */
+    private Double countFillingVolumeCount(String cityCode) {
+        DPFilterParamForDetailDto dpFilterParamForDetailDto = new DPFilterParamForDetailDto();
+        dpFilterParamForDetailDto.setCityCode(cityCode);
+        List<Map<String, Object>> list = this.getFillingQuantity(dpFilterParamForDetailDto, null, null);
+        return list.isEmpty()
+                ? 0L
+                : list.stream()
+                .mapToDouble(e -> Optional.ofNullable(e.get("fillingQuantity"))
+                        .map(f -> Double.parseDouble(f.toString()))
+                        .orElse(0.0))
+                .sum();
     }
 
     /**
@@ -422,7 +445,7 @@ public class CylinderDPStatisticsServiceImpl {
             Map<String, Object> item = new HashMap<>();
             item.put("regionCode", r.getRegionCode());
             item.put("regionName", r.getRegionName());
-            getCylinderMapCount(orgCode, item);
+            getCylinderMapCount(orgCode, item, dpFilterParamDto.getCityCode());
             return item;
         }).collect(Collectors.toList());
     }

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

@@ -35,6 +35,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderBusinessStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.JGStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
@@ -180,6 +181,8 @@ public class JGDPStatisticsServiceImpl {
 
     private JgUseRegistrationMapper useRegistrationMapper;
 
+    private CylinderBusinessStatisticsMapper businessStatisticsMapper;
+
     private JgEnableDisableMapper enableDisableMapper;
 
     private JgScrapCancelMapper scrapCancelMapper;
@@ -277,8 +280,10 @@ public class JGDPStatisticsServiceImpl {
                                      IdxBizJgTechParamsPipelineMapper idxBizJgTechParamsPipelineMapper,
                                      IdxBizJgTechParamsElevatorMapper idxBizJgTechParamsElevatorMapper,
                                      DataDictionaryServiceImpl iDataDictionaryService,
-                                     SafetyProblemTracingMapper safetyProblemTracingMapper) {
+                                     SafetyProblemTracingMapper safetyProblemTracingMapper,
+                                     CylinderBusinessStatisticsMapper businessStatisticsMapper) {
         this.useRegistrationMapper = useRegistrationMapper;
+        this.businessStatisticsMapper = businessStatisticsMapper;
         this.enableDisableMapper = enableDisableMapper;
         this.scrapCancelMapper = scrapCancelMapper;
         this.restHighLevelClient = restHighLevelClient;
@@ -512,7 +517,7 @@ public class JGDPStatisticsServiceImpl {
         List<Object> scrappedDeviceList = new ArrayList();
         DateTimeFormatter sdf = DateTimeFormatter.ofPattern("yyyy-MM");
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
-        List<Map<String,Object>> useRegisterCountList = useRegistrationMapper.getUseRegisterCount(orgCode);
+        List<Map<String,Object>> useRegisterCountList = businessStatisticsMapper.getUseRegisterCount(orgCode);
         List<Map<String,Object>> scrappedDeviceCountList = scrapCancelMapper.getScrappedDeviceCount(dpFilterParamDto);
         Map<String,Object> useRegisterCount = new HashMap<>();
         Map<String,Object> scrappedDeviceCount = new HashMap<>();