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

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

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class CylinderFillingRecordStatisticsDto {
-    private String time;
+    private String fillingTime;
     private String fillingQuantity;
     private String offloadingVolume;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

@@ -183,4 +183,7 @@ public class JgUseRegistrationDto extends BaseDto {
     @ApiModelProperty(value = " 监察处置机构代码")
     private String supervisionOrgCode;
 
+    @ApiModelProperty(value = "属地监管机构代码")
+    private String orgBranchCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -273,5 +273,4 @@ public class JgUseRegistration extends BaseEntity {
      */
     @TableField("origin_project_contraption_ids")
     private String originProjectContraptionIds;
-
 }

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

@@ -73,6 +73,9 @@
                 <if test="param.useUnitCreditCode != null and param.useUnitCreditCode != ''">
                     AND isn.use_unit_credit_code = #{param.useUnitCreditCode}
                 </if>
+                <if test="param.orgBranchCode != null and param.orgBranchCode != ''">
+                    AND isn.org_branch_code LIKE concat(#{param.orgBranchCode},'%')
+                </if>
             </if>
             <if test="type == 'supervision'">
                 <choose>

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

@@ -55,6 +55,7 @@
             ur.audit_status as auditStatus,
             date_format(ur.reg_date,'%Y-%m-%d') as regDate,
             ur.use_unit_name as useUnitName,
+            ur.supervision_org_code as supervisionOrgCode,
             ur.status,
             ur.receive_org_name as receiveOrgName,
             ur.use_address as place,
@@ -181,6 +182,9 @@
             <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
                 and use_unit_credit_code = #{dto.useUnitCode}
             </if>
+            <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
+                and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
+            </if>
             <if test="dto.auditPassDateStart != null and dto.auditPassDateEnd != null">
                 AND auditPassDate BETWEEN #{dto.auditPassDateStart} AND #{dto.auditPassDateEnd}
             </if>

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

@@ -98,7 +98,8 @@
                tjvi.gas_num as gasNum,
                date_format(tjvi.create_date,'%Y-%m-%d')  as createDate,
                tjvi.cancel_reason as cancelReason,
-               tjvi.reg_type as regType
+               tjvi.reg_type        as regType,
+               tjvi.org_branch_code as orgBranchCode
         from tzs_jg_vehicle_information tjvi
     </sql>
 

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

@@ -197,6 +197,22 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.equipmentClassification(type));
     }
 
+
+
+    /**
+     * 设备分类
+     *
+     * @param type 1，设备种类  2，设备类别  3，设备品种
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equipmentClassificationByParentCode")
+    @ApiOperation(httpMethod = "GET", value = "设备分类", notes = "1，设备种类  2，设备类别  3，设备品种")
+    public ResponseModel<List<EquipmentCategoryDto>> equipmentClassificationByParentCode(@RequestParam(value = "type") String type, @RequestParam(value = "parentCode", required = false) String parentCode) {
+        return ResponseHelper.buildResponse(commonService.equipmentClassificationByParentCode(type, parentCode));
+    }
+
+
     /**
      * 设备分类 去掉管道分类
      *
@@ -211,6 +227,18 @@ public class CommonController extends BaseController {
     }
 
     /**
+     * 根据设备种类code获取设备类别
+     * @param type 1，设备种类  2，设备类别  3，设备品种
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equipmentClassificationNoPipelineByParentCode")
+    @ApiOperation(httpMethod = "GET", value = "设备分类", notes = "1，设备种类  2，设备类别  3，设备品种")
+    public ResponseModel<List<EquipmentCategoryDto>> equipmentClassificationNoPipelineByParentCode(@RequestParam(value = "type") String type, @RequestParam(value = "parentCode", required = false) String parentCode) {
+        return ResponseHelper.buildResponse(commonService.equipmentClassificationNoPipelineByParentCode(type, parentCode));
+    }
+
+    /**
      * 设备品种
      *
      * @param parentId 父级ID
@@ -392,6 +420,19 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.getCreatTree());
     }
 
+    /**
+     * 获取当前登录人单位及以下管辖分局树
+     *
+     * @return result
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/loginUnitAndBelow/getCreatTree")
+    @ApiOperation(httpMethod = "GET", value = "获取当前登录人单位及以下管辖分局树", notes = "获取当前登录人单位及以下管辖分局树")
+    public ResponseModel<Object> loginUnitAndBelowGetTree() {
+        String orgCode = getSelectedOrgInfo().getCompany().getOrgCode();
+        return ResponseHelper.buildResponse(commonService.loginUnitAndBelowGetTree(orgCode));
+    }
+
 
     /**
      * 获取管辖分局树

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

@@ -144,7 +144,7 @@ public class JgVehicleInformationController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
         } else {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
-            dto.setOrgBranchCode(info.getCompany().getOrgCode());
+            dto.setOrgBranchCode(dto.getOrgBranchCode() != null ? dto.getOrgBranchCode() : info.getCompany().getOrgCode());
         }
         Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds(), client);
         list.getRecords().forEach(x -> {

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

@@ -80,6 +80,8 @@ public interface ICommonService {
 
     List<LinkedHashMap> getCreatTree();
 
+    List<LinkedHashMap> loginUnitAndBelowGetTree(String orgCode);
+
     List<LinkedHashMap> getCreatTreeByInstallation();
 
     List<LinkedHashMap> getCreatTreeByInstallationTree();
@@ -188,6 +190,8 @@ public interface ICommonService {
      */
     List<EquipmentCategoryDto> equipmentClassification(String type);
 
+    List<EquipmentCategoryDto> equipmentClassificationByParentCode(String type, String parentCode);
+
     /**
      * 套打使用标志生成
      *
@@ -241,6 +245,8 @@ public interface ICommonService {
 
     List<EquipmentCategoryDto> equipmentClassificationNoPipeline(String type);
 
+    List<EquipmentCategoryDto> equipmentClassificationNoPipelineByParentCode(String type, String parentCode);
+
     List<EquipmentCategoryDto> getEquDefineByParentId(String parentId);
 
     List<EquipmentClassifyDto> getEquClassifyByCode(String parentCode);

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

@@ -422,6 +422,13 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    public List<LinkedHashMap> loginUnitAndBelowGetTree(String orgCode) {
+        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE + "_" + orgCode);
+        // 判断redis是否存在管辖机构树
+        return !ObjectUtils.isEmpty(result) ? result : creatlLoginUnitAndBelowGetTree(orgCode);
+    }
+
+    @Override
     public List<LinkedHashMap> getCreatTreeByInstallation() {
         List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE_ALL);
         // 判断redis是否存在管辖机构树
@@ -632,6 +639,34 @@ public class CommonServiceImpl implements ICommonService {
         return resultTree;
     }
 
+    public List<LinkedHashMap> creatlLoginUnitAndBelowGetTree(String orgCode) {
+        FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
+        List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
+        List<LinkedHashMap> treeData = deleteTreeData(result, REGULATOR_UNIT);
+        List<LinkedHashMap> supervisionTree = orgCodeAndBelowGetTree(treeData, orgCode);
+        List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
+        redisUtils.set(REGULATOR_UNIT_TREE + "_" + orgCode, resultTree);
+        return resultTree;
+    }
+
+    private List<LinkedHashMap> orgCodeAndBelowGetTree(List<LinkedHashMap> treeData, String orgCode) {
+        if (treeData != null) {
+            for (LinkedHashMap node : treeData) {
+                if (orgCode.equals(node.get("orgCode"))) {
+                    return Collections.singletonList(node);
+                }
+                if (node.get("children") != null) {
+                    List<LinkedHashMap> result = orgCodeAndBelowGetTree((List<LinkedHashMap>) node.get("children"), orgCode);
+                    if (!result.isEmpty()) {
+                        return result;
+                    }
+                }
+            }
+        }
+        return Collections.emptyList();
+    }
+
+
     private List<LinkedHashMap> creatReceiveUnitTree(String bizType) {
         FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
         List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
@@ -2099,6 +2134,30 @@ public class CommonServiceImpl implements ICommonService {
         return result;
     }
 
+    /**
+     * 设备分类
+     *
+     * @param type 1，设备种类  2，设备类别  3，设备品种
+     *             .c@return
+     */
+    @Override
+    public List<EquipmentCategoryDto> equipmentClassificationByParentCode(String type, String parentCode) {
+        List<EquipmentCategoryDto> categoryList = equipmentCategoryMapper.selectClassifyNoStart7ByParentCode(parentCode);
+        List<EquipmentCategoryDto> result = Collections.emptyList();
+        switch (type) {
+            case "1":
+                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                break;
+            case "2":
+                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                break;
+            case "3":
+                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                break;
+        }
+        return result;
+    }
+
     @Override
     public List<EquipmentCategoryDto> equipmentClassificationNoPipeline(String type) {
         List<EquipmentCategoryDto> categoryList = equipmentCategoryMapper.selectClassifyNoStart7And8();
@@ -2118,6 +2177,24 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    public List<EquipmentCategoryDto> equipmentClassificationNoPipelineByParentCode(String type, String parentCode) {
+        List<EquipmentCategoryDto> categoryList = equipmentCategoryMapper.selectClassifyNoStart7And8ByParentCode(parentCode);
+        List<EquipmentCategoryDto> result = Collections.emptyList();
+        switch (type) {
+            case "1":
+                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                break;
+            case "2":
+                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                break;
+            case "3":
+                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                break;
+        }
+        return result;
+    }
+
+    @Override
     public List<EquipmentCategoryDto> getEquDefineByParentId(String parentId) {
         return equipmentCategoryMapper.getEquDefineByParentId(parentId);
     }

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

@@ -445,14 +445,16 @@ public class CylinderDPStatisticsServiceImpl {
            fillingRecord = cylinderInfoMapper.queryFillingRecordByOrgCode(orgCode, LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),null);
            offloading = cylinderInfoMapper.queryoffloadingByOrgCode(orgCode, LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),null);
         }
-        Map<String, String> fillingRecordMap = fillingRecord.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getTime, CylinderFillingRecordStatisticsDto::getFillingQuantity));
-        Map<String, String> offloadingMap = offloading.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getTime, CylinderFillingRecordStatisticsDto::getOffloadingVolume));
+        Map<String, String> fillingRecordMap = fillingRecord.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getFillingTime, CylinderFillingRecordStatisticsDto::getFillingQuantity));
+        Map<String, String> offloadingMap = offloading.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getFillingTime, CylinderFillingRecordStatisticsDto::getOffloadingVolume));
         List<CylinderFillingRecordStatisticsDto> data = new ArrayList<>();
         for (String key : times) {
             CylinderFillingRecordStatisticsDto dayData = new CylinderFillingRecordStatisticsDto();
-            dayData.setTime(key);
-            dayData.setFillingQuantity(fillingRecordMap.getOrDefault(key, "0"));
-            dayData.setOffloadingVolume(offloadingMap.getOrDefault(key, "0"));
+            dayData.setFillingTime(key);
+            String filling = fillingRecordMap.getOrDefault(key, "0");
+            dayData.setFillingQuantity(filling.equals("0") ? filling : Double.valueOf(filling).toString());
+            String offloadingRecord = offloadingMap.getOrDefault(key, "0");
+            dayData.setOffloadingVolume(offloadingRecord.equals("0") ? offloadingRecord : Double.valueOf(offloadingRecord).toString());
             data.add(dayData);
         }
         return data;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/common/DateUtils.java

@@ -15,11 +15,15 @@ public class DateUtils {
 
     public static Date calculateEndOfMonth(Date currentDate) {
         LocalDateTime localDateTime = toLocalDateTime(currentDate);
-        LocalDateTime endOfMonth = localDateTime.with(localDateTime.withDayOfMonth(localDateTime.getMonth().maxLength())
+        // 获取当前月份的实际天数（考虑闰年）
+        int lastDay = localDateTime.getMonth().length(localDateTime.toLocalDate().isLeapYear());
+        // 直接设置为本月最后一天 23:59:59.999
+        LocalDateTime endOfMonth = localDateTime
+                .withDayOfMonth(lastDay)
                 .withHour(23)
                 .withMinute(59)
                 .withSecond(59)
-                .withNano(999999999));
+                .withNano(999_999_999);
         return toDate(endOfMonth);
     }
 

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

@@ -26,9 +26,15 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
     @Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' ORDER BY parent_id")
     List<EquipmentCategoryDto> selectClassifyNoStart7();
 
+
+    List<EquipmentCategoryDto> selectClassifyNoStart7ByParentCode(@Param("parentCode") String parentCode);
+
     @Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' AND code NOT LIKE '8%' ORDER BY parent_id")
     List<EquipmentCategoryDto> selectClassifyNoStart7And8();
 
+
+    List<EquipmentCategoryDto> selectClassifyNoStart7And8ByParentCode(@Param("parentCode") String parentCode);
+
     @Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")
     List<EquipmentCategoryDto> selectClassify();
 

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

@@ -682,4 +682,26 @@
           AND ( ibjoi."CODE96333" NOT LIKE'31%' OR ibjoi."CODE96333" IS NULL )
           AND "CLAIM_STATUS" = '已认领';
     </select>
+
+    <select id="selectClassifyNoStart7ByParentCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto">
+        select * from tz_equipment_category
+        <where>
+            code NOT LIKE '7%'
+            <if test="parentCode != null and parentCode != ''">
+                and parent_id = (SELECT id FROM tz_equipment_category WHERE code = #{parentCode} )
+            </if>
+        </where>
+        ORDER BY parent_id
+    </select>
+
+    <select id="selectClassifyNoStart7And8ByParentCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto">
+        select * from tz_equipment_category
+         <where>
+             code NOT LIKE '7%' AND code NOT LIKE '8%'
+             <if test="parentCode != null and parentCode != ''">
+                 and parent_id = (SELECT id FROM tz_equipment_category WHERE code = #{parentCode} )
+             </if>
+         </where>
+        ORDER BY parent_id
+    </select>
 </mapper>

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

@@ -27,7 +27,7 @@
             register.EQU_CODE,
             register.EQU_LIST,
             supervision.ORG_BRANCH_CODE,
-            (select date_format(di.NEXT_INSPECT_DATE, 'yyyy-mm-dd') from idx_biz_jg_inspection_detection_info di where di."RECORD" = register."RECORD" and di.NEXT_INSPECT_DATE is not null and di."INSPECT_TYPE" <![CDATA[<>]]> '' order by di.REC_DATE desc limit 1) as NEXT_INSPECT_DATE
+            (select date_format(di.NEXT_INSPECT_DATE, 'yyyy-mm-dd') from idx_biz_jg_inspection_detection_info di where di."RECORD" = register."RECORD" and di.NEXT_INSPECT_DATE is not null and di."INSPECT_TYPE" <![CDATA[<>]]> '' order by di.INSPECT_DATE desc limit 1) as NEXT_INSPECT_DATE
             FROM
             idx_biz_jg_use_info use
             LEFT JOIN	idx_biz_jg_register_info register on register.RECORD = use.RECORD