fix(设备创建) ： 事务回滚

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

@@ -159,7 +159,7 @@ public class DataDockController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "工业 、公用、长输管道批量保存", notes = "工业 、公用、长输管道批量保存")
     @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<?> savePipingData(@RequestBody Map<String, Object> paramMap) {
-        return ResponseHelper.buildResponse(dataDockService.savePipingData(paramMap, getSelectedOrgInfo().getCompany()));
+        return ResponseHelper.buildResponse(dataDockService.savePipingData(paramMap, getSelectedOrgInfo()));
     }
 
     /**

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

@@ -1970,7 +1970,7 @@ public class DataDockServiceImpl {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Object savePipingData(Map<String, Object> paramMap, CompanyBo company) {
+    public Object savePipingData(Map<String, Object> paramMap, ReginParams reginParams) {
         // 获取数据
         List<String> records = new ArrayList<>();
         try {
@@ -1998,7 +1998,6 @@ public class DataDockServiceImpl {
                     }
                 }
             }
-            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             // 监管——历史——管道——批量
             String dataSource = "jg_his_gd_pl";
             // 公共参数提取
@@ -2041,7 +2040,7 @@ public class DataDockServiceImpl {
                     }
                 }
             }
-            this.createResumePipeline(proCon.getSequenceNbr(), String.format(pipelineRoutePath, proCon.getSequenceNbr() + ""), company);
+            this.createResumePipeline(proCon.getSequenceNbr(), String.format(pipelineRoutePath, proCon.getSequenceNbr() + ""), reginParams.getCompany());
             eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_PROJECT.name(), Sets.newHashSet(proCon.getSequenceNbr() + ""), EquipCreateOrEditEvent.EquipType.project));
             return Boolean.TRUE;
         } catch (Exception e) {