Merge branch 'feature-lihb-20250610' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

blade-service/blade-business/src/main/java/org/springblade/business/controller/PrivateStandardController.java

@@ -203,8 +203,8 @@ public class PrivateStandardController {
     @ApiOperation(value = "规范更新")
     @GetMapping("/standardUpdate")
     @ApiImplicitParam(name = "id", value = "规范文件id", required = true)
-    public R<Boolean> standardUpdate(Long id) {
-        boolean b = this.privateStandardService.standardUpdate(id);
+    public R<Long> standardUpdate(Long id) {
+        Long b = this.privateStandardService.standardUpdate(id);
         return R.data(b);
     }
 

blade-service/blade-business/src/main/java/org/springblade/business/service/PrivateStandardService.java

@@ -24,5 +24,5 @@ public interface PrivateStandardService extends IService<PrivateStandard> {
 
     boolean updateTypeByTwo(List<PrivateStandardDTO> data, List<Long> delIds, List<Long> delFileIds, MultipartFile[] files);
 
-    boolean standardUpdate(Long id);
+    Long standardUpdate(Long id);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/PrivateStandardServiceImpl.java

@@ -298,7 +298,7 @@ public class PrivateStandardServiceImpl extends ServiceImpl<PrivateStandardMappe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean standardUpdate(Long id) {
+    public Long standardUpdate(Long id) {
         BladeUser user = SecureUtil.getUser();
         //获取当前规范文件信息
         PrivateStandard privateStandard = baseMapper.selectById(id);
@@ -337,44 +337,48 @@ public class PrivateStandardServiceImpl extends ServiceImpl<PrivateStandardMappe
         privateStandard.setCreateTime(LocalDateTime.now());
         privateStandard.setCreateUser(user.getUserId());
 
-        //修改之前的规则为过期
-        baseMapper.updateStatus(privateStandard.getParentId());
-
-        baseMapper.insert(privateStandard);
-
-        //旧id与新id的映射关系
-        Map<Long, Long> map = new HashMap<>();
-        standardInfos.forEach(f -> {
-            Long newInfoId = SnowFlakeUtil.getId();
-            map.put(f.getId(),newInfoId);
-        });
-        standardInfos.forEach(f -> {
-            f.setId(map.get(f.getId()));
-            f.setParentId(map.get(f.getParentId())==null?0:map.get(f.getParentId()));
-            f.setStandardId(newId);
-            f.setCreateTime(DateTime.now());
-            f.setCreateUser(user.getUserId());
-            standardInfoMapper.insert(f);
-        });
-
-
-        standardInfoJoins.forEach(f -> {
-            f.setId(SnowFlakeUtil.getId());
-            f.setStandardInfoLeftId(map.get(f.getStandardInfoLeftId()));
-            f.setStandardInfoRightId(map.get(f.getStandardInfoRightId()));
-            f.setCreateTime(DateTime.now());
-            f.setCreateUser(user.getUserId());
-            standardInfoJoinMapper.insert(f);
-        });
-
-        standardInfoPrivateJoins.forEach(f -> {
-            f.setId(SnowFlakeUtil.getId());
-            f.setStandardInfoId(map.get(f.getStandardInfoId()));
-            f.setCreateTime(DateTime.now());
-            f.setCreateUser(user.getUserId());
-            standardInfoPrivateJoinMapper.insert(f);
-        });
+        try {
+            //修改之前的规则为过期
+            baseMapper.updateStatus(privateStandard.getParentId());
+
+            baseMapper.insert(privateStandard);
+
+            //旧id与新id的映射关系
+            Map<Long, Long> map = new HashMap<>();
+            standardInfos.forEach(f -> {
+                Long newInfoId = SnowFlakeUtil.getId();
+                map.put(f.getId(),newInfoId);
+            });
+            standardInfos.forEach(f -> {
+                f.setId(map.get(f.getId()));
+                f.setParentId(map.get(f.getParentId())==null?0:map.get(f.getParentId()));
+                f.setStandardId(newId);
+                f.setCreateTime(DateTime.now());
+                f.setCreateUser(user.getUserId());
+                standardInfoMapper.insert(f);
+            });
+
+
+            standardInfoJoins.forEach(f -> {
+                f.setId(SnowFlakeUtil.getId());
+                f.setStandardInfoLeftId(map.get(f.getStandardInfoLeftId()));
+                f.setStandardInfoRightId(map.get(f.getStandardInfoRightId()));
+                f.setCreateTime(DateTime.now());
+                f.setCreateUser(user.getUserId());
+                standardInfoJoinMapper.insert(f);
+            });
 
+            standardInfoPrivateJoins.forEach(f -> {
+                f.setId(SnowFlakeUtil.getId());
+                f.setStandardInfoId(map.get(f.getStandardInfoId()));
+                f.setCreateTime(DateTime.now());
+                f.setCreateUser(user.getUserId());
+                standardInfoPrivateJoinMapper.insert(f);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException("复制失败");
+        }
 
 
         //文件集合
@@ -409,7 +413,7 @@ public class PrivateStandardServiceImpl extends ServiceImpl<PrivateStandardMappe
         }
 
         standardFileService.saveBatch(standardFiles);
-        return true;
+        return newId;
     }
 }