同步数据中台bug

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/equippipe/EquipPipeMapper.java

@@ -159,8 +159,6 @@ public interface EquipPipeMapper extends BaseMapperX<EquipPipeDO> {
                 .set(EquipPipeDO::getStandard, updateObj.getStandard())
                 .set(EquipPipeDO::getUpdateTime, LocalDateTime.now())
                 .set(EquipPipeDO::getUpdater, updateObj.getUpdater())
-                .set(EquipPipeDO::getCreateTime, updateObj.getCreateTime())
-                .set(EquipPipeDO::getCreator, updateObj.getCreator())
                 .eq(EquipPipeDO::getId, updateObj.getId())
         );
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboiler/EquipBoilerServiceImpl.java

@@ -172,42 +172,42 @@ public class EquipBoilerServiceImpl extends ServiceImpl<EquipBoilerMapper, Equip
             }
 
             try {
-                EquipBoilerSaveReqVO oldEquipBoilerSaveReqVO = BeanUtils.toBean(oldEquipBoilerDO, EquipBoilerSaveReqVO.class);
-                EquipBoilerSaveReqVO updateReqVO = BeanUtils.toBean(equipBoilerDO, EquipBoilerSaveReqVO.class);
-
-                oldEquipBoilerSaveReqVO.setEquipDistrictName(AreaUtils.getAreaName(oldEquipBoilerSaveReqVO.getEquipDistrict()));
-                oldEquipBoilerSaveReqVO.setEquipStreetName(AreaUtils.getAreaName(oldEquipBoilerSaveReqVO.getEquipStreet()));
-
-                updateReqVO.setEquipDistrictName(AreaUtils.getAreaName(updateReqVO.getEquipDistrict()));
-                updateReqVO.setEquipStreetName(AreaUtils.getAreaName(updateReqVO.getEquipStreet()));
-
-                if (!deptIds.isEmpty()) {
-                    Map<String, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
-                    DeptRespDTO deptRespDTO = deptMap.get(oldEquipBoilerDO.getRelatedDepartment());
-                    if (deptRespDTO != null) {
-                        oldEquipBoilerSaveReqVO.setRelatedDepartmentName(deptRespDTO.getName());
-                    }
-                    deptRespDTO = deptMap.get(equipBoilerDO.getRelatedDepartment());
-                    if (deptRespDTO != null) {
-                        updateReqVO.setRelatedDepartmentName(deptRespDTO.getName());
-                    }
-                }
-
-                String beforeJson = objectMapper.writeValueAsString(oldEquipBoilerSaveReqVO);
-                String afterJson = objectMapper.writeValueAsString(updateReqVO);
-
-                // 之前的记录数
-                Long count = boilerEquipOperationRecordMapper.selectCount(BoilerEquipOperationRecordDO::getEquipCode, oldEquipBoilerDO.getEquipCode());
-
-                BoilerEquipOperationRecordDO record = new BoilerEquipOperationRecordDO();
-                record.setVersion(oldEquipBoilerDO.getEquipCode() + "-" + (count + 1));
-                record.setType(300);
-                record.setReason("数据中台更新");
-                record.setEquipId(equipBoilerDO.getId());
-                record.setEquipCode(oldEquipBoilerDO.getEquipCode());
-                record.setBeforeJson(beforeJson);
-                record.setAfterJson(afterJson);
-                boilerEquipOperationRecordMapper.insert(record);
+//                EquipBoilerSaveReqVO oldEquipBoilerSaveReqVO = BeanUtils.toBean(oldEquipBoilerDO, EquipBoilerSaveReqVO.class);
+//                EquipBoilerSaveReqVO updateReqVO = BeanUtils.toBean(equipBoilerDO, EquipBoilerSaveReqVO.class);
+//
+//                oldEquipBoilerSaveReqVO.setEquipDistrictName(AreaUtils.getAreaName(oldEquipBoilerSaveReqVO.getEquipDistrict()));
+//                oldEquipBoilerSaveReqVO.setEquipStreetName(AreaUtils.getAreaName(oldEquipBoilerSaveReqVO.getEquipStreet()));
+//
+//                updateReqVO.setEquipDistrictName(AreaUtils.getAreaName(updateReqVO.getEquipDistrict()));
+//                updateReqVO.setEquipStreetName(AreaUtils.getAreaName(updateReqVO.getEquipStreet()));
+//
+//                if (!deptIds.isEmpty()) {
+//                    Map<String, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
+//                    DeptRespDTO deptRespDTO = deptMap.get(oldEquipBoilerDO.getRelatedDepartment());
+//                    if (deptRespDTO != null) {
+//                        oldEquipBoilerSaveReqVO.setRelatedDepartmentName(deptRespDTO.getName());
+//                    }
+//                    deptRespDTO = deptMap.get(equipBoilerDO.getRelatedDepartment());
+//                    if (deptRespDTO != null) {
+//                        updateReqVO.setRelatedDepartmentName(deptRespDTO.getName());
+//                    }
+//                }
+//
+//                String beforeJson = objectMapper.writeValueAsString(oldEquipBoilerSaveReqVO);
+//                String afterJson = objectMapper.writeValueAsString(updateReqVO);
+//
+//                // 之前的记录数
+//                Long count = boilerEquipOperationRecordMapper.selectCount(BoilerEquipOperationRecordDO::getEquipCode, oldEquipBoilerDO.getEquipCode());
+//
+//                BoilerEquipOperationRecordDO record = new BoilerEquipOperationRecordDO();
+//                record.setVersion(oldEquipBoilerDO.getEquipCode() + "-" + (count + 1));
+//                record.setType(300);
+//                record.setReason("数据中台更新");
+//                record.setEquipId(equipBoilerDO.getId());
+//                record.setEquipCode(oldEquipBoilerDO.getEquipCode());
+//                record.setBeforeJson(beforeJson);
+//                record.setAfterJson(afterJson);
+//                boilerEquipOperationRecordMapper.insert(record);
 
             } catch (Exception e) {
                 log.error("操作记录新增失败", e);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipe/EquipPipeServiceImpl.java

@@ -161,22 +161,22 @@ public class EquipPipeServiceImpl extends ServiceImpl<EquipPipeMapper, EquipPipe
             }
         }
 
-        String beforeJson = objectMapper.writeValueAsString(oldPipeEquipSaveReqVO);
-        String afterJson = objectMapper.writeValueAsString(updateReqVO);
-
-        // 之前的记录数
-        Long count = pipeEquipmentOperationRecordMapper.selectCount(PipeEquipmentOperationRecordDO::getPipeId, updateReqVO.getId());
-
-        PipeEquipmentOperationRecordDO record = new PipeEquipmentOperationRecordDO();
-        record.setVersion(updateReqVO.getProjectNo()+"-"+(count+1));
-        record.setReason("数据中台更新");
-
-        record.setPipeId(updateObj.getId());
-        record.setProjectNo(oldPipeEquipSaveReqVO.getProjectNo());
-        record.setBeforeJson(beforeJson);
-        record.setAfterJson(afterJson);
-        pipeEquipmentOperationRecordMapper.insert(record);
-
+//        String beforeJson = objectMapper.writeValueAsString(oldPipeEquipSaveReqVO);
+//        String afterJson = objectMapper.writeValueAsString(updateReqVO);
+//
+//        // 之前的记录数
+//        Long count = pipeEquipmentOperationRecordMapper.selectCount(PipeEquipmentOperationRecordDO::getPipeId, updateReqVO.getId());
+//
+//        PipeEquipmentOperationRecordDO record = new PipeEquipmentOperationRecordDO();
+//        record.setVersion(updateReqVO.getProjectNo()+"-"+(count+1));
+//        record.setReason("数据中台更新");
+//
+//        record.setPipeId(updateObj.getId());
+//        record.setProjectNo(oldPipeEquipSaveReqVO.getProjectNo());
+//        record.setBeforeJson(beforeJson);
+//        record.setAfterJson(afterJson);
+//        pipeEquipmentOperationRecordMapper.insert(record);
+//
         equipPipeMapper.update(updateObj);
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/dto/BoilerDto.java

@@ -667,4 +667,6 @@ public class BoilerDto {
     public String WATERSAMPLINGDATE_NEW;
 
     public String DEPARTMENT;
+
+    public String STREET;
 }