refactor(jg): 优化设备信息处理和安全问题追踪

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

@@ -115,7 +115,7 @@ public class EquipInfoExcelDto extends BaseDto {
     private String whetherSphericalTank;
 
     @ApiModelProperty(value = "是否撬装式压力容器")
-    @ExcelProperty(value = "是否撬装式压力容器")
+    @ExcelProperty(value = "是否撬装式压力容器", converter = VehicleCylinderConverter.class)
     private String whetherSkidMountedPressureVessel;
 
     @ApiModelProperty(value = "是否车用气瓶")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -100,6 +100,7 @@ public class PieLineDataChangeServiceImpl {
         updateWrapper.set(IdxBizJgProjectContraption::getOrgName, projectContraptionChangeDataDtoNew.getOrgName());
         updateWrapper.set(IdxBizJgProjectContraption::getUseRegistrationCode, projectContraptionChangeDataDtoNew.getUseRegistrationCode());
         updateWrapper.set(IdxBizJgProjectContraption::getProductQualificationCertificate, projectContraptionChangeDataDtoNew.getProductQualificationCertificate());
+        updateWrapper.set(IdxBizJgProjectContraption::getUseDate, projectContraptionChangeDataDtoNew.getUseDate());
         updateWrapper.set(BaseEntity::getRecDate, new Date());
         updateWrapper.eq(BaseEntity::getSequenceNbr, projectContraptionChangeDataDtoNew.getProjectContraptionId());
         idxBizJgProjectContraptionServiceImpl.update(null, updateWrapper);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleProjectEquipChangeProcess.java

@@ -10,8 +10,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
-import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
-import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
 import com.yeejoin.amos.boot.module.jg.biz.edit.esUpdate.service.EsUpdateService;
@@ -230,6 +228,7 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
         IdxBizJgUseInfo useInfoNew = new IdxBizJgUseInfo();
         BeanUtil.copyProperties(useInfoOld, useInfoNew, true);
         BeanUtil.copyProperties(updatePieLine, useInfoNew, true);
+        useInfoNew.setUseDate(projectContraptionChangeDataDto.getUseDate());
         useInfoNew.setSequenceNbr(useInfoOld.getSequenceNbr());
         setNewUseAddressInfo(projectContraptionChangeDataDto, useInfoNew);
         // 冗余的字典名称字段更新

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

@@ -207,13 +207,14 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 safetyProblemTracing.setSourceType(json.getString("sourceType"));
                 safetyProblemTracing.setSourceTypeCode(json.getString("sourceTypeCode"));
                 safetyProblemTracing.setSourceId(json.getString("problemSourceId"));
-                safetyProblemTracing.setProblemTime(new Date());
+                safetyProblemTracing.setProblemTime(getProblemTime(json));
                 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("superviseCode", "").toString());
                 safetyProblemTracing.setGoverningBodyOrgCode(json.getOrDefault("superviseOrgCode", "").toString());
+                safetyProblemTracing.setUserName(ValidationUtil.isEmpty(json.getString("userName")) ? null : json.getString("userName"));
                 safetyProblemTracing.setCreateDate(new Date());
                 safetyProblemTracing.setProblemStatus(SafetyProblemStatusEnum.UNHANDLED.getName());
                 safetyProblemTracing.setProblemStatusCode(SafetyProblemStatusEnum.UNHANDLED.getCode());