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

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

@@ -452,15 +452,12 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         jgCertificateChangeRecord.setRecDate(new Date());
         jgCertificateChangeRecord.setCreateDate(new Date());
         jgCertificateChangeRecord.setCreateUserId(jgChangeVehicleRegistrationUnit.getCreateUserId());
-        jgCertificateChangeRecord.setUseRegistrationCode(jgChangeVehicleRegistrationUnit.getUseRegistCode());
         jgCertificateChangeRecord.setCertificateNo(manage.getCertificateNo());
         jgCertificateChangeRecord.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
         jgCertificateChangeRecord.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
         jgCertificateChangeRecord.setEquCategory(manage.getEquCategory());
         jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveCompanyCode());
         jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
-        // 保存证流水信息
-        jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
         // 组装设备流水
         dataList.forEach(item -> {
             JSONObject object = JSONObject.parseObject(JSON.toJSONString(item));
@@ -509,6 +506,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
         manage.setAuditPassDate(new Date());
         jgUseRegistrationManageService.updateById(manage);
+        // 保存证流水信息
+        jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
+        jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
     }
 
     /**

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

@@ -235,6 +235,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectById(sequenceNbr);
         List<JgCertificateChangeRecord> changeRecordList = jgCertificateChangeRecordService.list(new LambdaQueryWrapper<JgCertificateChangeRecord>()
                 .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode())
+                .or().eq(JgCertificateChangeRecord::getCertificateNo, jgUseRegistrationManage.getCertificateNo())
                 .orderByDesc(JgCertificateChangeRecord::getCreateDate));
         return changeRecordList.stream()
                 .map(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/impl/JgUseRegistrationServiceImpl.java

@@ -674,10 +674,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                             .map(v -> (String) v.get("record"))
                             .collect(Collectors.toList())
             );
-            if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) && inspectionDetectionInfoList.stream().anyMatch(info ->
+            if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) &&
+                    (inspectionDetectionInfoList.isEmpty() || inspectionDetectionInfoList.stream().anyMatch(info ->
                             ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
                             ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
-                            ObjectUtils.isEmpty(info.getInspectOrgName()))) {
+                            ObjectUtils.isEmpty(info.getInspectOrgName())))) {
                 throw new BadRequest("请补充设备检验检测信息后提交！");
             }
 
@@ -2036,16 +2037,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     // 使用单位
                     exportParamsMap.put("useUnitName", jsonObject.get("useUnitName"));
                     // 使用单位地址
-                    exportParamsMap.put("fullAddress", ValidationUtil.isEmpty(jsonObject.get("fullAddress")) ? "" :jsonObject.get("fullAddress"));
+                    String useUnitCreditCode = String.valueOf(jsonObject.get("useUnitCreditCode"));
+                    CompanyModel companyModel = Privilege.companyClient.queryByCompanyCode(useUnitCreditCode).getResult();
+                    exportParamsMap.put("fullAddress", companyModel.getAddress());
                     // 工程（装置）名称 取第一个设备的技术参数”工程装置名称“
                     JSONObject eqJSON = (JSONObject) equipmentLists.get(0);
                     String eqId = !ValidationUtil.isEmpty(eqJSON) ? String.valueOf(eqJSON.get("record")) : "";
-                    EquipTechParamPipeline equipTechParamPipeline = equipTechParamPipelineMapper.queryTechParamInUse(eqId);
-                    String deviceName = Optional.ofNullable(equipTechParamPipeline)
-                            .map(EquipTechParamPipeline::getDeviceName)
-                            .filter(name -> !ValidationUtil.isEmpty(name))
-                            .orElse("");
-                    exportParamsMap.put("nameOfProjectDevice", deviceName);
+                    IdxBizJgUseInfo idxBizJgUseInfo = useInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, eqId));
+                    exportParamsMap.put("nameOfProjectDevice", ValidationUtil.isEmpty(idxBizJgUseInfo) ? "" : idxBizJgUseInfo.getProjectContraption());
                     // 安全管理部门
                     exportParamsMap.put("orgBranchName", String.valueOf(jsonObject.get("orgBranchCode")).split("_")[1]);
                     // 安全管理员

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

@@ -1520,7 +1520,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         changeRecord.setChangeContent(this.buildRecordContent(jgVehicleInformation));//变更内容
         changeRecord.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());//使用登记编号
         changeRecord.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());//接收机构公司代码
-        changeRecord.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));//登记证书唯一码
+//      changeRecord.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));//登记证书唯一码
+        // 流水表不需要再次生成唯一编号，使用证管理表对应值
+        if (!ObjectUtils.isEmpty(jgVehicleInformation.getUseRegistrationCode())){
+            JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgVehicleInformation.getUseRegistrationCode()).one();
+            changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
+        }
         changeRecord.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());//使用单位统一信用代码
         changeRecord.setUseUnitName(jgVehicleInformation.getUseUnitName());//使用单位名称
         changeRecord.setEquCategory(registerInfo.getEquCategory());//设备类别编码

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

@@ -34,11 +34,6 @@
             <groupId>net.javacrumbs.shedlock</groupId>
             <artifactId>shedlock-provider-redis-spring</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.yeejoin</groupId>
-            <artifactId>visual-feign-morphic</artifactId>
-            <version>1.9.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

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

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

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

@@ -5,5 +5,4 @@
     <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-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.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.CylinderStatisticsMapper">
+
+    <select id="countEnterpriseNumForCylinder" resultType="java.lang.Long">
+         SELECT
+            count(1)
+        FROM "tz_base_enterprise_info"
+        where
+            unit_type LIKE'%充装单位%'
+            and supervise_org_code like concat(#{orgCode},'%')
+    </select>
+</mapper>

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

@@ -2,13 +2,17 @@ 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.common.api.dto.DPFilterParamDto;
 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.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.annotation.Validated;
 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.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -35,7 +39,7 @@ public class CylinderDPStatisticsController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getCylinderStatisticsData")
-    @ApiOperation(httpMethod = "GET", value = "获取气瓶统计数据-按照企业名称统计", notes = "获取气瓶统计数据-按照企业名称统计")
+    @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);
@@ -43,44 +47,40 @@ public class CylinderDPStatisticsController extends BaseController {
 
     @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";
+    @ApiOperation(httpMethod = "POST", value = "大屏-气瓶-区域统计", notes = "大屏-气瓶-区域统计")
+    public ResponseModel<Map<String, Object>> getCylinderStatisticsDataByCity(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-
-        Map<String, Object> result = dpStatisticsService.getCylinderStatisticsDataByCity(regionCode.toString());
+        Map<String, Object> result = dpStatisticsService.getCylinderStatisticsDataByCity(dpFilterParamDto);
         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";
+    @ApiOperation(httpMethod = "POST", value = "大屏-气瓶-地图统计图列", notes = "大屏-气瓶-地图统计图列")
+    public ResponseModel<Map<String, Object>> getCylinderStatisticsDataByCityForTotal(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-
-        Map<String, Object> result = dpStatisticsService.getCylinderStatisticsDataByCityForTotal(regionCode.toString());
+        Map<String, Object> result = dpStatisticsService.getCylinderStatisticsDataByCityForTotal(dpFilterParamDto);
         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";
+    @ApiOperation(httpMethod = "POST", value = "大屏-气瓶-中间地图", notes = "大屏-气瓶-中间地图")
+    public ResponseModel<List<Map<String, Object>>> getCylinderStatisticsDataByCityForMap(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-
-        List<Map<String, Object>> result = dpStatisticsService.getCylinderStatisticsDataByCityForMap(regionCode.toString());
+        List<Map<String, Object>> result = dpStatisticsService.getCylinderStatisticsDataByCityForMap(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "30天的充装量、卸液量数据")
     @GetMapping(value = "/fillingTimesAndQuantity")
@@ -88,5 +88,4 @@ public class CylinderDPStatisticsController extends BaseController {
         return ResponseHelper.buildResponse(dpStatisticsService.fillingTimesAndQuantity(reginCode));
     }
 
-
 }

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

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant;
+import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author Administrator
@@ -13,9 +17,16 @@ import java.util.*;
 @Service
 public class StCommonServiceImpl {
 
+    private CommonBaseMapper commonMapper;
+
+    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
 
     private static List<RegionModel> regionModels = new ArrayList<>();
 
+    public StCommonServiceImpl(CommonBaseMapper commonMapper) {
+        this.commonMapper = commonMapper;
+    }
+
     public void init() {
         initReginCode();
     }
@@ -37,6 +48,17 @@ public class StCommonServiceImpl {
         }
     }
 
+    public String getAndSetOrgCode(String cityCode) {
+        String orgCode = regionCodeOrgCodeMap.get(cityCode);
+        if (orgCode == null) {
+            orgCode = commonMapper.getOrgCodeByCompanyCode(cityCode);
+            if (orgCode != null) {
+                regionCodeOrgCodeMap.put(cityCode, orgCode);
+            }
+        }
+        return orgCode;
+    }
+
     public List<RegionModel> getUserRegionCode(ReginParams selectedOrgInfo) {
         String regionCode = selectedOrgInfo.getCompany().getCompanyCode();
         Optional<RegionModel> op = regionModels.stream().filter(e->e.getRegionCode().toString().equals(regionCode)).findFirst();
@@ -46,4 +68,14 @@ public class StCommonServiceImpl {
         result.setRegionCode(Integer.parseInt(regionCode));
         return Collections.singletonList(result);
     }
+
+    public List<RegionModel> setRegionIfRootParent(String regionCode) throws Exception {
+        List<RegionModel> regionList = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(regionCode)).getResult();
+        // 陕西省时需要在地图返回独立的地级市:韩城、杨凌、西咸
+        if (regionCode.equals(TZSCommonConstant.SHAN_XI_REGION_CODE)) {
+            List<RegionModel> independentRegions = ReginStepEnum.enum2RegionList("map");
+            regionList.addAll(independentRegions);
+        }
+        return regionList;
+    }
 }

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

@@ -9,7 +9,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.amosframework.boot</groupId>
     <artifactId>amos-boot-module-statistics</artifactId>
     <packaging>pom</packaging>
     <modules>

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

@@ -151,7 +151,7 @@
         WHERE
         u.data_sources = '陕西省内企业'
         AND u.unit_type LIKE'%充装单位%'
-        AND ui.post like '%"6552"%'
+        AND ui.post like '%6552%'
         <if test="orgCodes != null and orgCodes.size > 0">
             AND
             <foreach collection="orgCodes" open="(" item="orgCode" close=")" separator=" or ">