1.使用登记单据变更功能

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

@@ -28,7 +28,7 @@ public class BizDataChangeController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/{bizType}/save")
     @ApiOperation(value = "业务数据变更保存", httpMethod = "POST")
-    public ResponseModel<String> save(String applyNo,
+    public ResponseModel<String> save(@RequestParam String applyNo,
                                       @PathVariable String bizType,
                                       @RequestBody RequestChangeData changeData) {
         bizDataChangeService.save(applyNo, bizType, changeData);

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

@@ -61,15 +61,15 @@ public class EquipChangeDataUpdateService {
         updateWrapper.eq(IdxBizJgDesignInfo::getRecord, record);
         updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDate, DateUtil.parse(equipDesignChangeDataDto.getDesignDate(), "yyyy-MM-dd"));
         updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignDoc(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignDoc());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitCreditCode(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignUnitCreditCode());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitName(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignUnitName());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUseDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignUseDate());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignLicenseNum(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignLicenseNum());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalUnit(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getAppraisalUnit());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getOtherAccessoriesDes(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getOtherAccessoriesDes());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getAppraisalDate());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDrawingDo(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDrawingDo());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignStandard(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignStandard());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitCreditCode(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignUnitCreditCode, equipDesignChangeDataDto.getDesignUnitCreditCode());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitName(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignUnitName, equipDesignChangeDataDto.getDesignUnitName());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUseDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignUseDate, equipDesignChangeDataDto.getDesignUseDate());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignLicenseNum(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignLicenseNum, equipDesignChangeDataDto.getDesignLicenseNum());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalUnit(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getAppraisalUnit, equipDesignChangeDataDto.getAppraisalUnit());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getOtherAccessoriesDes(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getOtherAccessoriesDes, equipDesignChangeDataDto.getOtherAccessoriesDes());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getAppraisalDate, equipDesignChangeDataDto.getAppraisalDate());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDrawingDo(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDrawingDo, equipDesignChangeDataDto.getDrawingDo());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignStandard(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignStandard, equipDesignChangeDataDto.getDesignStandard());
         idxBizJgDesignInfoMapper.update(null, updateWrapper);
     }
 
@@ -125,7 +125,7 @@ public class EquipChangeDataUpdateService {
     public void updateTechParamByRecord(String tableName, String record, List<ChangeDataDto> changeDataDtos) {
         List<DynamicColumnDto> columns = changeDataDtos.stream().map(c->{
             DynamicColumnDto  columnDto = new DynamicColumnDto();
-            columnDto.setColumnName(StrUtil.toUnderlineCase(c.getColumnKey()));
+            columnDto.setColumnName(String.format("\"%s\"",StrUtil.toUnderlineCase(c.getColumnKey()).toUpperCase()));
             columnDto.setColumnValue(c.getColumnNewValue());
             return columnDto;
         }).collect(Collectors.toList());

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,7 +15,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IBizDataChangeHandleStrategy;
-import com.yeejoin.amos.boot.module.jg.api.vo.ChangeDataVo;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
@@ -125,9 +125,9 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
         EquipRegisterChangeDataDto registerChangeDataDto = new EquipRegisterChangeDataDto();
         EquipDesignChangeDataDto equipDesignChangeDataDto = new EquipDesignChangeDataDto();
         EquipFactoryChangeDataDto equipFactoryChangeDataDto = new EquipFactoryChangeDataDto();
-        BeanUtil.copyProperties(changeData, registerChangeDataDto);
-        BeanUtil.copyProperties(changeData, equipFactoryChangeDataDto);
-        BeanUtil.copyProperties(changeData, equipDesignChangeDataDto);
+        BeanUtil.copyProperties(JSON.parseObject(JSONObject.toJSONString(changeData)), registerChangeDataDto);
+        BeanUtil.copyProperties(JSON.parseObject(JSONObject.toJSONString(changeData)), equipFactoryChangeDataDto);
+        BeanUtil.copyProperties(JSON.parseObject(JSONObject.toJSONString(changeData)), equipDesignChangeDataDto);
         buildChangeFields(record, equipDesignChangeDataDto, equipFactoryChangeDataDto, registerChangeDataDto, allChangeColumns);
         // 设备制造、设计、注册信息业务处理落库
         this.dealBizDataForEquip(record, registerChangeDataDto);
@@ -204,13 +204,22 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
         re.putAll(BeanUtil.beanToMap(designChangeDataDto));
         re.putAll(BeanUtil.beanToMap(techParamsFieldDto));
         this.castJsonFields(re);
-        return re;
+        return this.cast2UnderCase(re);
+    }
+
+    private Map<String, Object> cast2UnderCase(Map<String, Object> re) {
+        // 由于历史遗留问题，和前端保存统一，要转成大写下滑线驼峰
+        Map<String, Object> result = new HashMap<>();
+        re.forEach((k, v) -> {
+            result.put(CharSequenceUtil.toUnderlineCase(k).toUpperCase(), v);
+        });
+        return result;
     }
 
     private void castJsonFields(Map<String, Object> re) {
         jsonFields.forEach(field -> {
-            if (re.containsKey(field)) {
-                re.put(field, JSON.parse((String) re.get(field)));
+            if (re.containsKey(field) && re.get(field) instanceof String) {
+                re.put(field, JSON.parse((String)re.get(field)));
             }
         });
     }
@@ -275,7 +284,6 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
     }
 
 
-
     private List<ChangeDataDto> convertBeanField2Column2(Object beanData, String record) {
         List<ChangeDataDto> changeData = new ArrayList<>();
         Group group = beanData.getClass().getAnnotation(Group.class);
@@ -291,9 +299,16 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
                     changeDataDto.setColumnFamily(group.value());
                     changeDataDto.setColumnLabel(fieldName);
                     changeDataDto.setChangeId(record);
-                    String value = (String) field.get(beanData);
-                    changeDataDto.setColumnNewValue(value);
-                    changeDataDto.setColumnOldValue(value);
+                    Object oV = field.get(beanData);
+                    if(oV instanceof String) {
+                        String value = (String) field.get(beanData);
+                        changeDataDto.setColumnNewValue(value);
+                        changeDataDto.setColumnOldValue(value);
+                    } else if (oV instanceof Integer) {
+                        String value = String.valueOf(field.get(beanData));
+                        changeDataDto.setColumnNewValue(value);
+                        changeDataDto.setColumnOldValue(value);
+                    }
                     changeData.add(changeDataDto);
                 }
             } catch (IllegalAccessException e) {
@@ -354,7 +369,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
 
     private String buildTableName(Class<?> clazz) {
         Group group = clazz.getAnnotation(Group.class);
-        return String.format("%s_%s", "idx_biz_jg", group);
+        return String.format("\"%s_%s\"", "idx_biz_jg", group.value());
     }
 
     private void updateTechParamInfo(EquipRegisterChangeDataDto equipRegisterChangeDataDto, String record, Map<String, Object> changeData, List<ChangeDataDto> allChange) {
@@ -377,7 +392,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
             case YLRQ:
                 // 压力容器
                 TechParamsVesselChangeFieldDto newVessel = new TechParamsVesselChangeFieldDto();
-                BeanUtil.copyProperties(changeData, newVessel);
+                BeanUtil.copyProperties(changeData, newVessel, true);
                 IdxBizJgTechParamsVessel techParamsVessel = iIdxBizJgTechParamsVesselService.getOneData(record);
                 TechParamsVesselChangeFieldDto oldVessel = BeanUtil.copyProperties(techParamsVessel, TechParamsVesselChangeFieldDto.class);
                 // 字段行转列
@@ -393,7 +408,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
             case DT:
                 // 电梯
                 TechParamsElevatorChangeFieldDto newElevator = new TechParamsElevatorChangeFieldDto();
-                BeanUtil.copyProperties(changeData, newElevator);
+                BeanUtil.copyProperties(changeData, newElevator, true);
 
                 IdxBizJgTechParamsElevator techParamsElevator = iIdxBizJgTechParamsElevatorService.getOneData(record);
                 TechParamsElevatorChangeFieldDto oldElevator = BeanUtil.copyProperties(techParamsElevator, TechParamsElevatorChangeFieldDto.class);
@@ -410,7 +425,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
             case QZJX:
                 // 起重机械
                 TechParamsLiftingChangeFieldDto newLifting = new TechParamsLiftingChangeFieldDto();
-                BeanUtil.copyProperties(changeData, newLifting);
+                BeanUtil.copyProperties(changeData, newLifting, true);
 
                 IdxBizJgTechParamsLifting techParamsLifting = iIdxBizJgTechParamsLiftingService.getOneData(record);
                 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
@@ -428,7 +443,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
             case CC:
                 // 场（厂）内专用机动车辆
                 TechParamsVehicleChangeFieldDto newVehicle = new TechParamsVehicleChangeFieldDto();
-                BeanUtil.copyProperties(changeData, newVehicle);
+                BeanUtil.copyProperties(changeData, newVehicle, true);
 
                 IdxBizJgTechParamsVehicle techParamsVehicle = iIdxBizJgTechParamsVehicleService.getOneData(record);
                 TechParamsVehicleChangeFieldDto oldVehicle = BeanUtil.copyProperties(techParamsVehicle, TechParamsVehicleChangeFieldDto.class);
@@ -445,7 +460,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
             case YLSS:
                 // 大型游乐设施
                 TechParamsRidesChangeFieldDto newRides = new TechParamsRidesChangeFieldDto();
-                BeanUtil.copyProperties(changeData, newRides);
+                BeanUtil.copyProperties(changeData, newRides, true);
 
                 IdxBizJgTechParamsRides techParamsRides = iIdxBizJgTechParamsRidesService.getOneData(record);
                 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
@@ -463,7 +478,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
             case YLGD:
                 // 压力管道
                 TechParamsPipelineChangeFieldDto newPipeline = new TechParamsPipelineChangeFieldDto();
-                BeanUtil.copyProperties(changeData, newPipeline);
+                BeanUtil.copyProperties(changeData, newPipeline, true);
 
                 IdxBizJgTechParamsPipeline techParamsPipeline = iIdxBizJgTechParamsPipelineService.getOneData(record);
                 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
@@ -481,7 +496,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
             case KYSD:
                 // 客运索道
                 TechParamsRopewayChangeFieldDto newRopeway = new TechParamsRopewayChangeFieldDto();
-                BeanUtil.copyProperties(changeData, newRopeway);
+                BeanUtil.copyProperties(changeData, newRopeway, true);
 
                 IdxBizJgTechParamsRopeway techParamsRopeway = iIdxBizJgTechParamsRopewayService.getOneData(record);
                 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
@@ -507,7 +522,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
 
     private static TechParamsBoilerChangeFieldDto getTechParamsBoilerChangeField(Map<String, Object> changeData) {
         TechParamsBoilerChangeFieldDto newBoiler = new TechParamsBoilerChangeFieldDto();
-        BeanUtil.copyProperties(changeData, newBoiler);
+        BeanUtil.copyProperties(changeData, newBoiler, true);
         return newBoiler;
     }
 

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,14 +27,12 @@ public class UseRegisterUpdateService {
 
     private final JgUseRegistrationServiceImpl useRegistrationService;
 
-    private final CommonServiceImpl commonService;
 
     private final JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
 
-    public UseRegisterUpdateService(IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, JgUseRegistrationServiceImpl useRegistrationService, CommonServiceImpl commonService, JgRegistrationHistoryServiceImpl jgRegistrationHistoryService) {
+    public UseRegisterUpdateService(IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, JgUseRegistrationServiceImpl useRegistrationService, JgRegistrationHistoryServiceImpl jgRegistrationHistoryService) {
         this.idxBizJgRegisterInfoMapper = idxBizJgRegisterInfoMapper;
         this.useRegistrationService = useRegistrationService;
-        this.commonService = commonService;
         this.jgRegistrationHistoryService = jgRegistrationHistoryService;
     }
 
@@ -87,8 +86,29 @@ public class UseRegisterUpdateService {
         }
         jsonObject.put("useRegistrationCode", jgUseRegistration.getUseRegistrationCode());
         // 转化 附件 字段
-        commonService.convertStringToJsonobject(jsonObject, JgUseRegistrationServiceImpl.jsonFields);
+        this.convertStringToJsonObject(jsonObject, JgUseRegistrationServiceImpl.jsonFields);
         return jsonObject;
     }
 
+    public void convertStringToJsonObject(Object obj, String[] jsonFields) {
+        if (obj instanceof JSONObject) {
+            JSONObject jsonObject = (JSONObject) obj;
+            for (String field : jsonFields) {
+                if (jsonObject.get(field) != null && jsonObject.get(field) instanceof String) {
+                    jsonObject.put(field, JSON.parse(JSONObject.toJSONString(jsonObject.get(field))));
+                }
+            }
+        } else if (obj instanceof Map) {
+            Map<String, Object> map = (Map<String, Object>) obj;
+            for (String field : jsonFields) {
+                if (map.containsKey(field) && map.get(field) instanceof String) {
+                    map.put(field, JSON.parse(JSONObject.toJSONString(map.get(field))));
+                }
+            }
+        } else {
+            // 处理其他类型
+            System.out.println("Unsupported Object Type");
+        }
+    }
+
 }