处理历史数据生成登记表，并优化代码

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -275,4 +275,7 @@ public class JgVehicleInformationVo implements Serializable {
 
     @ApiModelProperty("使用登记表附件")
     private JSONArray useRegistrationFormFile;
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createUserName;
 }

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

@@ -147,4 +147,15 @@ public class DataHandlerController extends BaseController {
     public ResponseModel<String> ordinaryGasCylinderWriteEquState() {
         return ResponseHelper.buildResponse(dataHandlerService.ordinaryGasCylinderWriteEquState());
     }
+
+    /**
+     * 使用登记、车用气瓶登记历史单据使用登记表生成
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "使用登记、车用气瓶登记历史单据使用登记表生成", notes = "使用登记、车用气瓶登记历史单据使用登记表生成")
+    @GetMapping(value = "/initFormUrl")
+    public void initFormUrl() {
+        dataHandlerService.initFormUrl();
+        ResponseHelper.buildResponse(true);
+    }
 }

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

@@ -2286,8 +2286,8 @@ public class CommonServiceImpl implements ICommonService {
             if (!CollectionUtils.isEmpty(equips)){
                 formData.put("gasNum",equips.size());
                 formData.put("equDefineName",equips.get(0).get("equDefineName"));
-                formData.put("workPressure", equips.stream().mapToDouble(e -> Double.valueOf(e.get("nominalWorkingPressure").toString())).sum());
-                formData.put("volume", equips.stream().mapToDouble(e -> Double.valueOf(e.get("singleBottleVolume").toString())).sum());
+                formData.put("workPressure", equips.stream().mapToDouble(e -> Objects.isNull(e.get("nominalWorkingPressure"))? 0 : Double.valueOf(e.get("nominalWorkingPressure").toString())).sum());
+                formData.put("volume", equips.stream().mapToDouble(e -> Objects.isNull(e.get("singleBottleVolume"))? 0 : Double.valueOf(e.get("singleBottleVolume").toString())).sum());
                 Set<String> chargingMedium = equips.stream().map(e -> String.valueOf(e.get("chargingMedium"))).collect(Collectors.toSet());
                 if (chargingMedium.size()>1){
                     throw new BadRequest("充装介质仅可选择同一类型");

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

@@ -63,6 +63,7 @@ public class DataHandlerServiceImpl {
     private final JgRegistrationHistoryServiceImpl registrationHistoryService;
     private final JgInstallationNoticeServiceImpl installationNoticeService;
     private final JgUseRegistrationServiceImpl useRegistrationService;
+    private final JgVehicleInformationServiceImpl jgVehicleInformationService;
     private final JgUseRegistrationEqServiceImpl useRegistrationEqService;
     private final JgInstallationNoticeEqServiceImpl installationNoticeEqService;
     private final IdxBizJgUseInfoServiceImpl useInfoService;
@@ -974,4 +975,8 @@ public class DataHandlerServiceImpl {
 
         return String.format("刷入数据%s条，耗时：%s秒", allHisRecords.size() + allRecords.size(), stopWatch.getTotalTimeSeconds());
     }
+
+    public void initFormUrl() {
+        jgVehicleInformationService.initVehicleFormUrl();
+    }
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -221,6 +222,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             Optional.ofNullable(map.get("useRegistrationFormFile"))
                     .map(JSONObject::toJSONString)
                     .ifPresent(vehicleInfoDto::setUseRegistrationFormFile);
+            map.put("userName",reginParams.getUserModel().getRealName());
             Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", map);
             if(Objects.nonNull(vehicle)){
                 vehicleInfoDto.setUseRegistrationFormUrl(String.valueOf(vehicle.get("useRegistrationFormUrl")));
@@ -647,35 +649,38 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
         // 非完成、非已作废时显示实时数据
         if (!(dto.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) || dto.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))) {
-            vo.setEquipmentLists(
-                    this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,
-                                    vehicleInformationEqList.stream()
-                                            .map(JgVehicleInformationEq::getEquId)
-                                            .collect(Collectors.toList())
-                            ).stream()
-                            .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
-                            .collect(Collectors.toList())
-            );
+            List<String> records = vehicleInformationEqList.stream()
+                    .map(JgVehicleInformationEq::getEquId)
+                    .collect(Collectors.toList());
+            if(CollUtil.isNotEmpty(records)){
+                vo.setEquipmentLists(this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,records).stream()
+                        .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
+                        .collect(Collectors.toList()));
+            }
         } else {
             // 完成及已作废时显示历史数据详情
             JSONArray objects = commonService.queryHistoryDataObj(dto.getSequenceNbr());
             // 兼容老数据
             if (objects.isEmpty()) {
-                vo.setEquipmentLists(
-                        this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,
-                                        vehicleInformationEqList.stream()
-                                                .map(JgVehicleInformationEq::getEquId)
-                                                .collect(Collectors.toList())
-                                ).stream()
-                                .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
-                                .collect(Collectors.toList())
-                );
+                List<String> records = vehicleInformationEqList.stream()
+                        .map(JgVehicleInformationEq::getEquId)
+                        .collect(Collectors.toList());
+                if(CollUtil.isNotEmpty(records)){
+                    vo.setEquipmentLists(
+                            this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,records).stream()
+                                    .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
+                                    .collect(Collectors.toList())
+                    );
+                }
             } else {
                 List equList = objects.toJavaList(Map.class);
                 vo.setEquipmentLists(equList);
             }
 
         }
+        if(Objects.isNull(vo.getEquipmentLists())){
+            vo.setEquipmentLists(new ArrayList<>());
+        }
         vo.setEquDefineCode(
                 vo.getEquipmentLists().stream()
                         .findFirst()
@@ -689,10 +694,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             lambda.eq(IdxBizJgUseInfo::getRecord, firstEqu.get().get("record"));
             lambda.select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getOldUseRegistrationCertificate,IdxBizJgUseInfo::getOldUseRegistrationTable,IdxBizJgUseInfo::getORegDate,IdxBizJgUseInfo::getORegUnit);
             IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
-            vo.setORegDate(useInfo.getORegDate());
-            vo.setORegUnit(useInfo.getORegUnit());
-            vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
-            vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
+            if(Objects.nonNull(useInfo)){
+                vo.setORegDate(useInfo.getORegDate());
+                vo.setORegUnit(useInfo.getORegUnit());
+                vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
+                vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
+            }
         }
         String companyType = selectedOrgInfo.getCompany().getCompanyType();
         if ("个人主体".equals(companyType)) {
@@ -2366,4 +2373,28 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         commonService.saveExecuteFlowData2Redis(jgVehicleInformation.getInstanceId(), this.buildInstanceRuntimeData(jgVehicleInformation));
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void initVehicleFormUrl() {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
+        LambdaQueryWrapper<JgVehicleInformation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgVehicleInformation::getIsDelete, false)
+                .isNull(JgVehicleInformation::getUseRegistrationFormUrl)
+                .ne(JgVehicleInformation::getStatus, "已作废");
+        List<JgVehicleInformation> vehicleInformations = this.list(queryWrapper);
+        if(CollUtil.isNotEmpty(vehicleInformations)){
+            for (JgVehicleInformation vehicleInformation : vehicleInformations) {
+                JgVehicleInformationVo jgVehicleInformationVo = this.queryBySequenceNbr(vehicleInformation.getSequenceNbr(), reginParams);
+                String jsonString = JSONObject.toJSONString(jgVehicleInformationVo);
+                JSONObject jsonObject = JSONObject.parseObject(jsonString);
+                jsonObject.put("userName",jgVehicleInformationVo.getCreateUserName());
+                Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", jsonObject);
+                if(Objects.nonNull(vehicle)){
+                    LambdaUpdateWrapper<JgVehicleInformation> wrapper = new LambdaUpdateWrapper<>();
+                    wrapper.set(JgVehicleInformation::getUseRegistrationFormUrl,String.valueOf(vehicle.get("useRegistrationFormUrl")))
+                            .eq(JgVehicleInformation::getSequenceNbr,jgVehicleInformationVo.getSequenceNbr());
+                    this.update(wrapper);
+                }
+            }
+        }
+    }
 }
\ No newline at end of file