修改字段类型 精度丢失

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/domain/enforce/obj/EnforceObjArchitecture.java

@@ -33,6 +33,6 @@ public class EnforceObjArchitecture {
      * 远程监控建筑ID
      */
     @TableField(updateStrategy = FieldStrategy.ALWAYS, insertStrategy = FieldStrategy.ALWAYS)
-    private Long architectureId;
+    private String architectureId;
 
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforceJobDTO.java

@@ -116,5 +116,5 @@ public class EnforceJobDTO extends EnforceJob {
      * 远程监控建筑ID
      */
     @TableField(exist = false)
-    private Long architectureId;
+    private String architectureId;
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/enforce/obj/IEnforceObjArchitectureService.java

@@ -5,6 +5,6 @@ import com.zfjg.manage.api.domain.enforce.obj.EnforceObjArchitecture;
 
 
 public interface IEnforceObjArchitectureService extends IService<EnforceObjArchitecture> {
-    void checkAndUpdateEnforceObjArchitecture(String enforceObjId, Long architectureId, String architectureName);
+    void checkAndUpdateEnforceObjArchitecture(String enforceObjId, String architectureId, String architectureName);
 
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceHandbookServiceImpl.java

@@ -31,14 +31,13 @@ import java.util.stream.Collectors;
 
 /**
  * 【请填写功能名称】Service业务层处理
- * 
+ *
  * @author mxkj
  * @date 2022-12-06
  */
 @Service
 @Slf4j
-public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMapper, EnforceHandbook> implements IEnforceHandbookService
-{
+public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMapper, EnforceHandbook> implements IEnforceHandbookService {
 
     @Autowired
     private IEnforceJobNodeItemService enforceJobNodeItemService;
@@ -47,7 +46,7 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
     private EnforceHandbookProblemMapper enforceHandbookProblemMapper;
 
     @Override
-    public List<EnforceHandBookResultDTO> mergeJobItem2HandBook(Long jobId,IEnforceJobService enforceJobService) {
+    public List<EnforceHandBookResultDTO> mergeJobItem2HandBook(Long jobId, IEnforceJobService enforceJobService) {
         Optional<EnforceJobDTO> jobOptional = enforceJobService.find(jobId);
         if (!jobOptional.isPresent()) {
             throw new ServiceException("无效的JOB_ID", 400);
@@ -90,11 +89,11 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
     @Override
     public Optional<EnforceHandbookDTO> find(long id) {
         EnforceHandbook enforceHandbook = baseMapper.selectById(id);
-        if (StringUtils.isNull(enforceHandbook) || enforceHandbook.getIsDeleted().equals(DeleteStatusEnum.DELETED.getStatus())){
+        if (StringUtils.isNull(enforceHandbook) || enforceHandbook.getIsDeleted().equals(DeleteStatusEnum.DELETED.getStatus())) {
             return Optional.empty();
         }
         EnforceHandbookDTO dto = new EnforceHandbookDTO();
-        BeanUtils.copyProperties(enforceHandbook,dto);
+        BeanUtils.copyProperties(enforceHandbook, dto);
         return Optional.of(dto);
     }
 
@@ -105,7 +104,7 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
     @Transactional
     public int createEnforceHandbook(EnforceHandbookDTO enforceHandbookDTO) {
         EnforceHandbook entity = new EnforceHandbook();
-        BeanUtils.copyProperties(enforceHandbookDTO,entity);
+        BeanUtils.copyProperties(enforceHandbookDTO, entity);
         entity.setIsDeleted(Long.valueOf(DeleteStatusEnum.NOT_DELETED.getStatus()));
         final SysUser user = SecurityUtils.getLoginUser().getSysUser();
         SecurityUtils.getUid();
@@ -135,14 +134,14 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
     /**
      * 删除手册信息
      *
-     * @param id  (required)
+     * @param id (required)
      * @return Success (status code 200)
      */
     @Override
     @Transactional
     public int deleteEnforceHandbook(Long id) {
         EnforceHandbook handbook = getById(id);
-        if (StringUtils.isNull(handbook)){
+        if (StringUtils.isNull(handbook)) {
             throw new ServiceException("数据不存咋！");
         }
         handbook.setIsDeleted(Long.valueOf(DeleteStatusEnum.DELETED.getStatus()));
@@ -161,17 +160,17 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
             throw new ServiceException("数据不存在！");
         }
         final EnforceHandbookDTO enforceHandbookDTO = new EnforceHandbookDTO();
-        BeanUtils.copyProperties(enforceHandbookWithBLOBs,enforceHandbookDTO);
+        BeanUtils.copyProperties(enforceHandbookWithBLOBs, enforceHandbookDTO);
 
         LambdaQueryWrapper<EnforceHandbookProblem> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(EnforceHandbookProblem::getIsDeleted,DeleteStatusEnum.NOT_DELETED.getStatus()).eq(EnforceHandbookProblem::getEnforceHandbookId,id);
+        wrapper.eq(EnforceHandbookProblem::getIsDeleted, DeleteStatusEnum.NOT_DELETED.getStatus()).eq(EnforceHandbookProblem::getEnforceHandbookId, id);
         final List<EnforceHandbookProblem> enforceHandbookProblems = enforceHandbookProblemMapper.selectList(wrapper);
         if (StringUtils.isEmpty(enforceHandbookProblems)) {
             enforceHandbookDTO.setProblems(Collections.emptyList());
         } else {
             enforceHandbookDTO.setProblems(enforceHandbookProblems.stream().map(o -> {
                 EnforceHandbookProblemDTO dto = new EnforceHandbookProblemDTO();
-                BeanUtils.copyProperties(o,dto);
+                BeanUtils.copyProperties(o, dto);
                 return dto;
             }).collect(Collectors.toList()));
         }
@@ -184,32 +183,32 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
     @Override
     public List<EnforceHandbookDTO> getEnforceHandbooks(EnforceHandbookQuery query) {
         List<EnforceHandbookDTO> list = baseMapper.getEnforceHandbooks(query);
-        if (StringUtils.isNotEmpty(list)){
+        if (StringUtils.isNotEmpty(list)) {
             setProblems(list);
         }
         return list;
     }
 
-    public void setProblems(List<EnforceHandbookDTO> list){
+    public void setProblems(List<EnforceHandbookDTO> list) {
         LambdaQueryWrapper<EnforceHandbookProblem> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(EnforceHandbookProblem::getIsDeleted,DeleteStatusEnum.NOT_DELETED.getStatus());
+        wrapper.eq(EnforceHandbookProblem::getIsDeleted, DeleteStatusEnum.NOT_DELETED.getStatus());
         final List<EnforceHandbookProblem> enforceHandbookProblems = enforceHandbookProblemMapper.selectList(wrapper);
         if (CollectionUtils.isEmpty(enforceHandbookProblems)) {
             return;
         }
         Map<Long, EnforceHandbookDTO> map = new HashMap<>();
-        list.forEach(e-> map.put(e.getId(),e));
+        list.forEach(e -> map.put(e.getId(), e));
         enforceHandbookProblems.forEach(e -> {
             final EnforceHandbookDTO enforceHandbook = map.get(e.getEnforceHandbookId());
-            if(StringUtils.isNull(enforceHandbook)){
+            if (StringUtils.isNull(enforceHandbook)) {
                 return;
             }
             List<EnforceHandbookProblemDTO> problems = enforceHandbook.getProblems();
-            if (CollectionUtils.isEmpty(problems)){
+            if (CollectionUtils.isEmpty(problems)) {
                 problems = new ArrayList<>();
             }
             EnforceHandbookProblemDTO problemDTO = new EnforceHandbookProblemDTO();
-            BeanUtils.copyProperties(e,problemDTO);
+            BeanUtils.copyProperties(e, problemDTO);
             problems.add(problemDTO);
             enforceHandbook.setProblems(problems);
         });
@@ -221,9 +220,9 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
     @Override
     public List<EnforceHandbookDTO> getEnforceHandbooksByTree() {
         LambdaQueryWrapper<EnforceHandbook> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(EnforceHandbook::getEnforceType,"0");
+        wrapper.eq(EnforceHandbook::getEnforceType, "0");
         List<EnforceHandbook> handbooks = baseMapper.selectList(wrapper);
-        if (StringUtils.isEmpty(handbooks)){
+        if (StringUtils.isEmpty(handbooks)) {
             return Collections.emptyList();
         }
         List<EnforceHandbookDTO> dtoList = handbooks.stream().map(o -> {
@@ -262,11 +261,11 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
     @Override
     public int putEnforceHandbook(EnforceHandbookDTO enforceHandbookDTO) {
         Long id = enforceHandbookDTO.getId();
-        if (StringUtils.isNull(id)){
+        if (StringUtils.isNull(id)) {
             throw new ServiceException("数据不存在！");
         }
         EnforceHandbook enforceHandbook = baseMapper.selectById(id);
-        if (StringUtils.isNull(enforceHandbook)){
+        if (StringUtils.isNull(enforceHandbook)) {
             throw new ServiceException("数据不存在！");
         }
         enforceHandbookDTO.setUpdateTime(new Date());
@@ -290,12 +289,18 @@ public class EnforceHandbookServiceImpl extends ServiceImpl<EnforceHandbookMappe
 
     public void saveProblem(EnforceHandbookProblemDTO enforceHandbookProblemDTO) {
         EnforceHandbookProblem enforceHandbookProblem = new EnforceHandbookProblem();
-        BeanUtils.copyProperties(enforceHandbookProblemDTO,enforceHandbookProblem);
+        BeanUtils.copyProperties(enforceHandbookProblemDTO, enforceHandbookProblem);
 
         enforceHandbookProblem.setCreateTime(new Date());
         enforceHandbookProblem.setUpdateTime(new Date());
         enforceHandbookProblem.setIsDeleted(Long.valueOf(DeleteStatusEnum.NOT_DELETED.getStatus()));
-        enforceHandbookProblemMapper.insert(enforceHandbookProblem);
+        if (Objects.isNull(enforceHandbookProblem.getId())) {
+            enforceHandbookProblemMapper.insert(enforceHandbookProblem);
+        } else {
+            enforceHandbookProblemMapper.updateById(enforceHandbookProblem);
+        }
+
+
         enforceHandbookProblemDTO.setId(enforceHandbookProblem.getId());
     }
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/obj/EnforceObjArchitectureServiceImpl.java

@@ -20,7 +20,7 @@ public class EnforceObjArchitectureServiceImpl extends ServiceImpl<EnforceObjArc
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void checkAndUpdateEnforceObjArchitecture(String enforceObjId, Long architectureId, String architectureName) {
+    public void checkAndUpdateEnforceObjArchitecture(String enforceObjId, String architectureId, String architectureName) {
         if (StrUtil.isBlank(architectureName)) return;
         EnforceObjArchitecture enforceObjArchitecture = getById(enforceObjId);
         if (Objects.nonNull(enforceObjArchitecture)) {