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

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.Date;
@@ -95,6 +96,12 @@ public class UseFlagParamDto {
      */
     private String cylinderNumOrVolume;
 
+
+    /**
+     * 充装介质--车用气瓶专用
+     */
+    private String fillingMedium;
+
     /**
      * 申请编号
      */

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IPdfService;
@@ -21,6 +22,7 @@ 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.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -373,4 +375,39 @@ public class CommonController extends BaseController {
     }
 
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/use-flag-test")
+    @ApiOperation(httpMethod = "GET", value = "使用标志生成测试", notes = "使用标志生成测试")
+    public ResponseModel<String> getUserPhone(HttpServletResponse response) {
+        UseFlagParamDto useFlagParamDto = buildUseFlagParam();
+        commonService.useFlagGenerate(useFlagParamDto, response);
+        return ResponseHelper.buildResponse("succese");
+    }
+
+    private UseFlagParamDto buildUseFlagParam(){
+        UseFlagParamDto useFlagParamDto = new UseFlagParamDto();
+        useFlagParamDto.setEquList("设备种类名称");
+        useFlagParamDto.setEquListCode("0000");
+        useFlagParamDto.setEquipCode("10001101");
+//        useFlagParamDto.setEquipDefine("设备品种");
+        useFlagParamDto.setUseUnitName("使用单位名称");
+        useFlagParamDto.setEquipCategory("设备类别名称");
+        useFlagParamDto.setUseInnerCode("单位内编号");
+        useFlagParamDto.setReceiveOrgName("登记机关");
+        useFlagParamDto.setInspectionUnitName("检验机构名称");
+        useFlagParamDto.setUseRegistrationCode("11111");
+        useFlagParamDto.setNextInspectionDate(new Date());
+        useFlagParamDto.setMaintenanceUnitName("维保单位名称");
+        useFlagParamDto.setEmergencyTel("17792961611");
+        useFlagParamDto.setCarNumber("车牌号");
+        useFlagParamDto.setFactoryNumber("产品编号");
+        useFlagParamDto.setCylinderNumOrVolume("12");
+        useFlagParamDto.setFillingMedium("氮气");
+        useFlagParamDto.setApplyNo("101");
+        return useFlagParamDto;
+    }
+
+
+
 }

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

@@ -53,7 +53,7 @@ public class JgUseRegistrationController extends BaseController {
                 String.valueOf(map.get("instanceId")),
                 String.valueOf(map.get("operate")),
                 String.valueOf(map.get("comment")),
-                String.valueOf(map.get("licensePlateNum")));
+                String.valueOf(map.getOrDefault("carNumber","")));
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -353,18 +353,19 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     public void useFlagGenerate(UseFlagParamDto useFlagParamDto, HttpServletResponse response) {
-        if (useFlagParamDto == null) {
-            throw new IllegalArgumentException("参数不能为空");
-        }
-        Map<String, Object> paramMap;
-        paramMap = Bean.BeantoMap(useFlagParamDto);
-        // 设置二维码
+        Objects.requireNonNull(useFlagParamDto, "参数不能为空");
+
+        Map<String, Object> paramMap = Bean.BeantoMap(useFlagParamDto);
+        // 二维码设置
         setQrCode(useFlagParamDto, paramMap);
+        // 日期设置
         setNextDate(useFlagParamDto, paramMap);
+
         String ftlPath = this.getFtlPathByBiz(useFlagParamDto);
         if (StringUtils.isEmpty(ftlPath)) {
-            throw new BadRequest("无法找到使用标志");
+            throw new BadRequest("无法找到使用标志模板！");
         }
+
         File pdfFile = null;
         try {
             pdfFile = this.wordToPdf("特种设备使用标志_", ftlPath, paramMap);
@@ -373,17 +374,18 @@ public class CommonServiceImpl implements ICommonService {
             FileExporter.exportFile(FileExporter.FileType.valueOf("pdf"), docTitle, bytes, response);
         } catch (Exception e) {
             log.error("特种设备使用标志生成失败", e);
-            throw new RuntimeException(e);
+            throw new RuntimeException("特种设备使用标志生成失败", e);
         } finally {
             if (pdfFile != null) {
-                pdfFile.deleteOnExit();
+                pdfFile.delete();
             }
         }
     }
 
+
     private void setNextDate(UseFlagParamDto useFlagParamDto, Map<String, Object> paramMap) {
         if (useFlagParamDto.getNextInspectionDate() != null) {
-            paramMap.put("year", DateUtil.year(useFlagParamDto.getNextInspectionDate()));
+            paramMap.put("year", DateUtil.year(useFlagParamDto.getNextInspectionDate()) + "");
             paramMap.put("month", DateUtil.month(useFlagParamDto.getNextInspectionDate()) + 1);
         }
     }
@@ -563,12 +565,16 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public List<Map<String, Object>> getUnitListByType(String type) {
 
-        if (type.equals("use")) {
-            type = "使用单位";
-        } else if (type.equals("maintenance")) {
-            type = "安装改造维修单位";
-        } else if (type.equals("inspection")) {
-            type = "检验检测机构";
+        switch (type) {
+            case "use":
+                type = "使用单位";
+                break;
+            case "maintenance":
+                type = "安装改造维修单位";
+                break;
+            case "inspection":
+                type = "检验检测机构";
+                break;
         }
         return commonMapper.getUnitListByType(type);
     }
@@ -1394,7 +1400,7 @@ public class CommonServiceImpl implements ICommonService {
     /**
      * 生成使用登记编号
      *
-     * @param equipId 设备id
+     * @param equipId                设备id
      * @param supervisoryCompanyCode 接收机构单位代码
      * @return 使用登记编号
      */
@@ -1414,7 +1420,7 @@ public class CommonServiceImpl implements ICommonService {
                 String equipType2MidDigits;
                 if (ValidationUtil.isEmpty(equDefine)) {
                     // 没有设备品种的设备取设备类别代码中间两位
-                    equipType2MidDigits = equCategory.substring(1,3);
+                    equipType2MidDigits = equCategory.substring(1, 3);
                 } else {
                     // 设备品种代码中间两位
                     equipType2MidDigits = equDefine.substring(1, 3);

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

@@ -19,7 +19,6 @@ import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
-import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;

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

@@ -428,7 +428,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
     }
 
-    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst,String licensePlateNum) {
+    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst,String carNumber) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = workflowResultDto.getNextExecutorRoleIds();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -436,7 +436,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             taskCode = workflowResultDto.getNextTaskCode();
         }
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
-        jgUseRegistration.setLicensePlateNum(licensePlateNum);
         LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda().eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
         JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
         jgUseRegistration.setEquipId(jgUseRegistrationEq.getEquId());
@@ -446,6 +445,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setInstanceStatus(workflowResultDto.getExecutorRoleIds());
             jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
         }
+        if (!ObjectUtils.isEmpty(carNumber)){
+            //更新安全追溯-场内车辆中的“车牌号字段”
+            LambdaUpdateWrapper<IdxBizJgRegisterInfo> wrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
+                    .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
+            IdxBizJgRegisterInfo idxBizJgRegisterInfo = new IdxBizJgRegisterInfo();
+            idxBizJgRegisterInfo.setCarNumber(carNumber);
+            idxBizJgRegisterInfoMapper.update(idxBizJgRegisterInfo,wrapper);
+        }
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             jgUseRegistration.setNextExecuteIds(role);
             jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
@@ -612,7 +619,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
 
-    public void flowExecute(Long id, String instanceId, String operate, String comment,String licensePlateNum) {
+    public void flowExecute(Long id, String instanceId, String operate, String comment,String carNumber) {
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
         // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
@@ -638,7 +645,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
         if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
             WorkflowResultDto workflowResultDto = resultDto.get(0);
-            updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, Boolean.FALSE,licensePlateNum);
+            updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, Boolean.FALSE,carNumber);
         }
     }
 
@@ -713,7 +720,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.remove("submit");
             jsonObject.remove("instanceId");
             // 补充"车牌号"字段
-            jsonObject.put("licensePlateNum", jgUseRegistration.getLicensePlateNum());
+            LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
+            IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
+            jsonObject.put("carNumber",idxBizJgRegisterInfo.getCarNumber());
             return jsonObject;
         }
         // 基本信息 + 制造信息

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgTechParamsVehicleDto.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 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;
-import java.util.Date;
 
 /**
  * 安全追溯-场内车辆
@@ -16,10 +15,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="IdxBizJgTechParamsVehicleDto", description="安全追溯-场内车辆")
-public class IdxBizJgTechParamsVehicleDto  extends BaseDto {
+@ApiModel(value = "IdxBizJgTechParamsVehicleDto", description = "安全追溯-场内车辆")
+public class IdxBizJgTechParamsVehicleDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsVehicle.java

@@ -2,14 +2,10 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.checkerframework.checker.units.qual.A;
-
-import java.util.Date;
 
 /**
  * 安全追溯-场内车辆