Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java

@@ -204,7 +204,7 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
         String equListCode = (String) paramMap.get("EQU_LIST");
         String equCategoryCode = (String) paramMap.get("EQU_CATEGORY");
         String equDefineCode = (String) paramMap.get("EQU_DEFINE");
-        String equipSource = (String) paramMap.get("EQUIP_SOURCE");
+        String dataSource = (String) paramMap.get("DATA_SOURCE");
 
         Date date = new Date();
         String record = UUID.randomUUID().toString();
@@ -215,9 +215,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
         BeanUtils.copyProperties(data, useInfo);
         useInfo.setRecord(record);
         useInfo.setRecDate(date);
-        useInfo.setDataSource(equipSource != null ? equipSource : "jg");//区分历史设备和新增设备
+        useInfo.setDataSource(dataSource != null ? dataSource : "jg");//区分历史设备和新增设备
         useInfo.setEquState(null);
-        useInfo.setIsIntoManagement(equipSource != null);//历史气瓶导入为已纳管设备
+        useInfo.setIsIntoManagement(dataSource != null);//历史气瓶导入为已纳管设备
         // 使用单位信息
         if("个人主体".equals(company.getCompanyType())){
             useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);