pssr：

-导入验证唯一性

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -225,7 +225,21 @@ public class TPssrAirtightController extends BaseController {
         }
         tPssrAirtight.setApproveStatus(0L);
         check(tPssrAirtight);
-        return toAjax(tPssrAirtightService.insertTPssrAirtight(tPssrAirtight));
+        return toAjax(insertOrUpdate(tPssrAirtight));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrAirtight item) {
+        TPssrAirtight entity = new TPssrAirtight();
+        entity.setSubId(item.getSubId());
+        entity.setSystemName(item.getSystemName());
+        List<TPssrAirtight> list = tPssrAirtightService.selectTPssrAirtightList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrAirtightService.updateTPssrAirtight(item);
+        }else{
+            return tPssrAirtightService.insertTPssrAirtight(item);
+        }
     }
 
     private void check(TPssrAirtight tPssrAirtight){

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -278,7 +278,21 @@ public class TPssrAnalyzerController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrAnalyzer.setApproveStatus(0L);
-        return toAjax(tPssrAnalyzerService.insertTPssrAnalyzer(tPssrAnalyzer));
+        return toAjax(insertOrUpdate(tPssrAnalyzer));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrAnalyzer item) {
+        TPssrAnalyzer entity = new TPssrAnalyzer();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrAnalyzer> list = tPssrAnalyzerService.selectTPssrAnalyzerList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrAnalyzerService.updateTPssrAnalyzer(item);
+        } else {
+            return tPssrAnalyzerService.insertTPssrAnalyzer(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -326,9 +326,23 @@ public class TPssrBlindController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrBlind.setApproveStatus(0L);
-        return toAjax(tPssrBlindService.insertTPssrBlind(tPssrBlind));
+        return toAjax(insertOrUpdate(tPssrBlind));
     }
 
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrBlind item) {
+        TPssrBlind entity = new TPssrBlind();
+        entity.setSubId(item.getSubId());
+        entity.setPipelineNo(item.getPipelineNo());
+        List<TPssrBlind> list = tPssrBlindService.selectTPssrBlindList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrBlindService.updateTPssrBlind(item);
+        }else {
+            return tPssrBlindService.insertTPssrBlind(item);
+
+        } }
+
     /**
      * 修改盲板
      */

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -310,7 +310,21 @@ public class TPssrCircuitController extends BaseController {
             tPssrCircuit.setCurrentStatusRight("否");
         }
         tPssrCircuit.setApproveStatus(0L);
-        return toAjax(tPssrCircuitService.insertTPssrCircuit(tPssrCircuit));
+        return toAjax(insertOrUpdate(tPssrCircuit));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrCircuit item) {
+        TPssrCircuit entity = new TPssrCircuit();
+        entity.setSubId(item.getSubId());
+        entity.setPipelineNo(item.getPipelineNo());
+        List<TPssrCircuit> list = tPssrCircuitService.selectTPssrCircuitList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrCircuitService.updateTPssrCircuit(item);
+        } else {
+            return tPssrCircuitService.insertTPssrCircuit(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -333,7 +333,21 @@ public class TPssrCleaningController extends BaseController {
         }
         tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));
         tPssrCleaning.setApproveStatus(0L);
-        return toAjax(tPssrCleaningService.insertTPssrCleaning(tPssrCleaning));
+        return toAjax(insertOrUpdate(tPssrCleaning));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrCleaning item) {
+        TPssrCleaning entity = new TPssrCleaning();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrCleaning> list = tPssrCleaningService.selectTPssrCleaningList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrCleaningService.updateTPssrCleaning(item);
+        } else {
+            return tPssrCleaningService.insertTPssrCleaning(item);
+        }
     }
 
     private List<TPssrCleaningVo> genList(String devType) {

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -298,7 +298,21 @@ public class TPssrFrameController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrFrame.setApproveStatus(0L);
-        return toAjax(tPssrFrameService.insertTPssrFrame(tPssrFrame));
+        return toAjax(insertOrUpdate(tPssrFrame));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrFrame item) {
+        TPssrFrame entity = new TPssrFrame();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrFrame> list = tPssrFrameService.selectTPssrFrameList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrFrameService.updateTPssrFrame(item);
+        } else {
+            return tPssrFrameService.insertTPssrFrame(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -274,7 +274,21 @@ public class TPssrGasdetectorController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrGasdetector.setApproveStatus(0L);
-        return toAjax(tPssrGasdetectorService.insertTPssrGasdetector(tPssrGasdetector));
+        return toAjax(insertOrUpdate(tPssrGasdetector));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrGasdetector item) {
+        TPssrGasdetector entity = new TPssrGasdetector();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrGasdetector> list = tPssrGasdetectorService.selectTPssrGasdetectorList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrGasdetectorService.updateTPssrGasdetector(item);
+        } else {
+            return tPssrGasdetectorService.insertTPssrGasdetector(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -425,7 +425,21 @@ public class TPssrInstrumentCalibrationController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrInstrumentCalibration.setApproveStatus(0L);
-        return toAjax(tPssrInstrumentCalibrationService.insertTPssrInstrumentCalibration(tPssrInstrumentCalibration));
+        return toAjax(insertOrUpdate(tPssrInstrumentCalibration));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrInstrumentCalibration item) {
+        TPssrInstrumentCalibration entity = new TPssrInstrumentCalibration();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrInstrumentCalibration> list = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(item);
+        } else {
+            return tPssrInstrumentCalibrationService.insertTPssrInstrumentCalibration(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -280,7 +280,21 @@ public class TPssrLaboratoryController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrLaboratory.setApproveStatus(0L);
-        return toAjax(tPssrLaboratoryService.insertTPssrLaboratory(tPssrLaboratory));
+        return toAjax(insertOrUpdate(tPssrLaboratory));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrLaboratory item) {
+        TPssrLaboratory entity = new TPssrLaboratory();
+        entity.setSubId(item.getSubId());
+        entity.setInstrumentNumber(item.getInstrumentNumber());
+        List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrLaboratoryService.updateTPssrLaboratory(item);
+        } else {
+            return tPssrLaboratoryService.insertTPssrLaboratory(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -287,7 +287,21 @@ public class TPssrMeasureController extends BaseController {
         tPssrMeasure.setApproveStatus(0L);
         tPssrMeasure.setCreaterCode(String.valueOf(getUserId()));
         tPssrMeasure.setCreatedate(new Date());
-        return toAjax(tPssrMeasureService.insertTPssrMeasure(tPssrMeasure));
+        return toAjax(insertOrUpdate(tPssrMeasure));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrMeasure item) {
+        TPssrMeasure entity = new TPssrMeasure();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrMeasure> list = tPssrMeasureService.selectTPssrMeasureList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrMeasureService.updateTPssrMeasure(item);
+        } else {
+            return tPssrMeasureService.insertTPssrMeasure(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -212,7 +212,21 @@ public class TPssrMocController extends BaseController {
         if (StringUtils.isNotEmpty(tPssrMoc.getConfirm1())&&tPssrMoc.getConfirm1().equals(tPssrMoc.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
-        return toAjax(tPssrMocService.insertTPssrMoc(tPssrMoc));
+        return toAjax(insertOrUpdate(tPssrMoc));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrMoc item) {
+        TPssrMoc entity = new TPssrMoc();
+        entity.setSubId(item.getSubId());
+        entity.setMocNo(item.getMocNo());
+        List<TPssrMoc> list = tPssrMocService.selectTPssrMocList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrMocService.updateTPssrMoc(item);
+        } else {
+            return tPssrMocService.insertTPssrMoc(item);
+        }
     }
 
     @PreAuthorize("@ss.hasPermi('pssr:moc:add')")

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -277,7 +277,21 @@ public class TPssrMotorController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrMotor.setApproveStatus(0L);
-        return toAjax(tPssrMotorService.insertTPssrMotor(tPssrMotor));
+        return toAjax(insertOrUpdate(tPssrMotor));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrMotor item) {
+        TPssrMotor entity = new TPssrMotor();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrMotor> list = tPssrMotorService.selectTPssrMotorList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrMotorService.updateTPssrMotor(item);
+        } else {
+            return tPssrMotorService.insertTPssrMotor(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -52,7 +52,7 @@ import java.util.*;
 @RequestMapping("/pssr/nitrogen")
 public class TPssrNitrogenController extends BaseController {
     @Resource
-     private TPssrNitrogenMapper tPssrNitrogenMapper;
+    private TPssrNitrogenMapper tPssrNitrogenMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -82,12 +82,11 @@ public class TPssrNitrogenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:add')")
     @PostMapping("/importData")
-    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
-    {
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TPssrNitrogen> list = new ArrayList<TPssrNitrogen>();
@@ -124,9 +123,9 @@ public class TPssrNitrogenController extends BaseController {
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
-                failRow.add(i+1);
+                failRow.add(i + 1);
             }
         }
         int successNumber = 0;
@@ -137,16 +136,16 @@ public class TPssrNitrogenController extends BaseController {
             try {
                 this.add(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
-                failRow.add(failNum+1);
+                failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
     }
 
@@ -166,16 +165,16 @@ public class TPssrNitrogenController extends BaseController {
                         .taskAssignee(getUserId().toString())
                         .processInstanceId(approve.getProcessId()).singleResult();
                 if (task != null) {
-                    if (task.getName().equals("确认人1")){
+                    if (task.getName().equals("确认人1")) {
                         tPssrNitrogen.setConfirm1(getUserId().toString());
-                    }else if (task.getName().equals("确认人2")){
-                       tPssrNitrogen.setConfirm2(getUserId().toString());
+                    } else if (task.getName().equals("确认人2")) {
+                        tPssrNitrogen.setConfirm2(getUserId().toString());
                     }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("待办确认人查询报错：{}",e.getMessage());
+            logger.error("待办确认人查询报错：{}", e.getMessage());
         }
         startPage();
         List<TPssrNitrogen> list = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
@@ -223,7 +222,7 @@ public class TPssrNitrogenController extends BaseController {
                 row.setHeight((short) 800);
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getSystemName());
-                row.createCell(2).setCellValue(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM,t.getSamplingDate()));
+                row.createCell(2).setCellValue(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, t.getSamplingDate()));
                 row.createCell(3).setCellValue(t.getSampleName());
                 row.createCell(4).setCellValue(t.getOxygen());
                 row.createCell(5).setCellValue(t.getDewPoint());
@@ -252,7 +251,7 @@ public class TPssrNitrogenController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_12_氮气置换"  + ".xlsx";
+            filename = "PSSR_12_氮气置换" + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -271,8 +270,8 @@ public class TPssrNitrogenController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrNitrogen item = tPssrNitrogenService.selectTPssrNitrogenById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dqzh"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dqzh"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dqzh"));
         return AjaxResult.success(item);
     }
 
@@ -283,12 +282,26 @@ public class TPssrNitrogenController extends BaseController {
     @Log(title = "系统氮气置换", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrNitrogen tPssrNitrogen) {
-        if (StringUtils.isNotEmpty(tPssrNitrogen.getConfirm1())&&tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())) {
+        if (StringUtils.isNotEmpty(tPssrNitrogen.getConfirm1()) && tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrNitrogen.setApproveStatus(0L);
         this.verifySatndard(tPssrNitrogen);
-        return toAjax(tPssrNitrogenService.insertTPssrNitrogen(tPssrNitrogen));
+        return toAjax(insertOrUpdate(tPssrNitrogen));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrNitrogen item) {
+        TPssrNitrogen entity = new TPssrNitrogen();
+        entity.setSubId(item.getSubId());
+        entity.setSystemName(item.getSystemName());
+        List<TPssrNitrogen> list = tPssrNitrogenService.selectTPssrNitrogenList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrNitrogenService.updateTPssrNitrogen(item);
+        } else {
+            return tPssrNitrogenService.insertTPssrNitrogen(item);
+        }
     }
 
     /**
@@ -309,25 +322,25 @@ public class TPssrNitrogenController extends BaseController {
             } else {
                 standard = "否";
             }
-        } else if (StringUtils.isNotEmpty(oxygen)&&StringUtils.isEmpty(dewPoint)&&StringUtils.isEmpty(dewPointValue) ) {//判断氧气
+        } else if (StringUtils.isNotEmpty(oxygen) && StringUtils.isEmpty(dewPoint) && StringUtils.isEmpty(dewPointValue)) {//判断氧气
             //氧气不为空 露点值为空 标准也为空
             if (new BigDecimal(oxygen).compareTo(new BigDecimal(0.2)) == -1) {
                 standard = "是";
             } else {
                 standard = "否";
             }
-        } else if (StringUtils.isEmpty(oxygen)&&StringUtils.isNotEmpty(dewPointValue) ) {//判断氧气
+        } else if (StringUtils.isEmpty(oxygen) && StringUtils.isNotEmpty(dewPointValue)) {//判断氧气
             //氧气为空 标准不为空
             if (StringUtils.isEmpty(dewPoint)) {
                 standard = "否";
-            } else  {
+            } else {
                 if (new BigDecimal(dewPoint).compareTo(new BigDecimal(dewPointValue)) == -1) {
                     standard = "是";
                 } else {
                     standard = "否";
                 }
             }
-        }else{
+        } else {
             standard = "否";
         }
         tPssrNitrogen.setStandard(standard);
@@ -342,9 +355,9 @@ public class TPssrNitrogenController extends BaseController {
     public AjaxResult edit(@RequestBody TPssrNitrogen tPssrNitrogen) {
         TPssrNitrogen entity = tPssrNitrogenService.selectTPssrNitrogenById(tPssrNitrogen.getId());
         if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
-            return  AjaxResult.error("当前状态不可修改！");
+            return AjaxResult.error("当前状态不可修改！");
         }
-        if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())){
+        if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrFileService.updateFileRelevance(tPssrNitrogen.getFileIds(), "dqzh", tPssrNitrogen.getId(), tPssrNitrogen.getSubId());
@@ -360,7 +373,7 @@ public class TPssrNitrogenController extends BaseController {
     @Log(title = "系统氮气置换", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrNitrogen tPssrNitrogen) {
-        if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())){
+        if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         return toAjax(tPssrNitrogenMapper.updateTPssrNitrogenByIds(tPssrNitrogen));
@@ -405,7 +418,7 @@ public class TPssrNitrogenController extends BaseController {
         if (tPssrNitrogen.getIds() != null && tPssrNitrogen.getIds().length > 0) {
             for (Long id : tPssrNitrogen.getIds()) {
                 TPssrNitrogen item = tPssrNitrogenService.selectTPssrNitrogenById(id);
-                if (item.getStandard().equals("否")){
+                if (item.getStandard().equals("否")) {
                     return AjaxResult.error("氮气置换不合格，请重新确认！");
                 }
                 item.setApproveStatus(approveStatus);
@@ -418,7 +431,7 @@ public class TPssrNitrogenController extends BaseController {
             lock.setSubId(tPssrNitrogen.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrNitrogen item : tPssrNitrogenService.selectTPssrNitrogenList(lock)) {
-                if (item.getStandard().equals("否")){
+                if (item.getStandard().equals("否")) {
                     return AjaxResult.error("氮气置换不合格，请重新确认！");
                 }
                 if (queryStatus == 3) {

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -232,7 +232,21 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulExchanger tPssrOverhaulExchanger) {
         tPssrOverhaulExchanger.setApproveStatus(0L);
-        return toAjax(tPssrOverhaulExchangerService.insertTPssrOverhaulExchanger(tPssrOverhaulExchanger));
+        return toAjax(insertOrUpdate(tPssrOverhaulExchanger));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrOverhaulExchanger item) {
+        TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
+        entity.setSubId(item.getSubId());
+        entity.setTagNo(item.getTagNo());
+        List<TPssrOverhaulExchanger> list = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrOverhaulExchangerService.updateTPssrOverhaulExchanger(item);
+        }else{
+            return tPssrOverhaulExchangerService.insertTPssrOverhaulExchanger(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -370,7 +370,21 @@ public class TPssrOverhaulFilterController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter) {
         tPssrOverhaulFilter.setApproveStatus(0L);
-        return toAjax(tPssrOverhaulFilterService.insertTPssrOverhaulFilter(tPssrOverhaulFilter));
+        return toAjax(insertOrUpdate(tPssrOverhaulFilter));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrOverhaulFilter item) {
+        TPssrOverhaulFilter entity = new TPssrOverhaulFilter();
+        entity.setSubId(item.getSubId());
+        entity.setIsoDwgNo(item.getIsoDwgNo());
+        List<TPssrOverhaulFilter> list = tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrOverhaulFilterService.updateTPssrOverhaulFilter(item);
+        } else {
+            return tPssrOverhaulFilterService.insertTPssrOverhaulFilter(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java

@@ -192,7 +192,21 @@ public class TPssrOverhaulPipeController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulPipe tPssrOverhaulPipe) {
         tPssrOverhaulPipe.setApproveStatus(0L);
-        return toAjax(tPssrOverhaulPipeService.insertTPssrOverhaulPipe(tPssrOverhaulPipe));
+        return toAjax(insertOrUpdate(tPssrOverhaulPipe));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrOverhaulPipe item) {
+        TPssrOverhaulPipe entity = new TPssrOverhaulPipe();
+        entity.setSubId(item.getSubId());
+        entity.setPipelineNo(item.getPipelineNo());
+        List<TPssrOverhaulPipe> list = tPssrOverhaulPipeService.selectTPssrOverhaulPipeList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrOverhaulPipeService.updateTPssrOverhaulPipe(item);
+        } else {
+            return tPssrOverhaulPipeService.insertTPssrOverhaulPipe(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -363,7 +363,21 @@ public class TPssrOverhaulTowerController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulTower tPssrOverhaulTower) {
         tPssrOverhaulTower.setApproveStatus(0L);
-        return toAjax(tPssrOverhaulTowerService.insertTPssrOverhaulTower(tPssrOverhaulTower));
+        return toAjax(insertOrUpdate(tPssrOverhaulTower));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrOverhaulTower item) {
+        TPssrOverhaulTower entity = new TPssrOverhaulTower();
+        entity.setSubId(item.getSubId());
+        entity.setTagNo(item.getTagNo());
+        List<TPssrOverhaulTower> list = tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrOverhaulTowerService.updateTPssrOverhaulTower(item);
+        } else {
+            return tPssrOverhaulTowerService.insertTPssrOverhaulTower(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -395,7 +395,21 @@ public class TPssrOverhaulValveController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
         tPssrOverhaulValve.setApproveStatus(0L);
-        return toAjax(tPssrOverhaulValveService.insertTPssrOverhaulValve(tPssrOverhaulValve));
+        return toAjax(insertOrUpdate(tPssrOverhaulValve));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrOverhaulValve item) {
+        TPssrOverhaulValve entity = new TPssrOverhaulValve();
+        entity.setSubId(item.getSubId());
+        entity.setValvePosition(item.getValvePosition());
+        List<TPssrOverhaulValve> list = tPssrOverhaulValveService.selectTPssrOverhaulValveList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrOverhaulValveService.updateTPssrOverhaulValve(item);
+        } else {
+            return tPssrOverhaulValveService.insertTPssrOverhaulValve(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -260,7 +260,21 @@ public class TPssrPipeController extends BaseController {
         tPssrPipe.setApproveStatus(0L);
         tPssrPipe.setCreatedate(new Date());
         tPssrPipe.setCreaterCode(getUserId().toString());
-        return toAjax(tPssrPipeService.insertTPssrPipe(tPssrPipe));
+        return toAjax(insertOrUpdate(tPssrPipe));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrPipe item) {
+        TPssrPipe entity = new TPssrPipe();
+        entity.setSubId(item.getSubId());
+        entity.setPipelineNo(item.getPipelineNo());
+        List<TPssrPipe> list = tPssrPipeService.selectTPssrPipeList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrPipeService.updateTPssrPipe(item);
+        } else {
+            return tPssrPipeService.insertTPssrPipe(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -289,7 +289,21 @@ public class TPssrPumpCleaningController extends BaseController {
         tPssrPumpCleaning.setApproveStatus(0L);
         tPssrPumpCleaning.setCreatedate(new Date());
         tPssrPumpCleaning.setCreaterCode(String.valueOf(getUserId()));
-        return toAjax(tPssrPumpCleaningService.insertTPssrPumpCleaning(tPssrPumpCleaning));
+        return toAjax(insertOrUpdate(tPssrPumpCleaning));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrPumpCleaning item) {
+        TPssrPumpCleaning entity = new TPssrPumpCleaning();
+        entity.setSubId(item.getSubId());
+        entity.setPosition(item.getPosition());
+        List<TPssrPumpCleaning> list = tPssrPumpCleaningService.selectTPssrPumpCleaningList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrPumpCleaningService.updateTPssrPumpCleaning(item);
+        } else {
+            return tPssrPumpCleaningService.insertTPssrPumpCleaning(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -290,7 +290,21 @@ public class TPssrPumpFillController extends BaseController {
         tPssrPumpFill.setApproveStatus(0L);
         tPssrPumpFill.setCreatedate(new Date());
         tPssrPumpFill.setCreaterCode(String.valueOf(getUserId()));
-        return toAjax(tPssrPumpFillService.insertTPssrPumpFill(tPssrPumpFill));
+        return toAjax(insertOrUpdate(tPssrPumpFill));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrPumpFill item) {
+        TPssrPumpFill entity = new TPssrPumpFill();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrPumpFill> list = tPssrPumpFillService.selectTPssrPumpFillList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrPumpFillService.updateTPssrPumpFill(item);
+        } else {
+            return tPssrPumpFillService.insertTPssrPumpFill(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -286,7 +286,21 @@ public class TPssrPumpOverhaulController extends BaseController {
         tPssrPumpOverhaul.setApproveStatus(0L);
         tPssrPumpOverhaul.setCreatedate(new Date());
         tPssrPumpOverhaul.setCreaterCode(String.valueOf(getUserId()));
-        return toAjax(tPssrPumpOverhaulService.insertTPssrPumpOverhaul(tPssrPumpOverhaul));
+        return toAjax(insertOrUpdate(tPssrPumpOverhaul));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrPumpOverhaul item) {
+        TPssrPumpOverhaul entity = new TPssrPumpOverhaul();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrPumpOverhaul> list = tPssrPumpOverhaulService.selectTPssrPumpOverhaulList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrPumpOverhaulService.updateTPssrPumpOverhaul(item);
+        } else {
+            return tPssrPumpOverhaulService.insertTPssrPumpOverhaul(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java

@@ -25,6 +25,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -287,7 +288,21 @@ public class TPssrSafetyBleedController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBleed.setApproveStatus(0L);
-        return toAjax(tPssrSafetyBleedService.insertTPssrSafetyBleed(tPssrSafetyBleed));
+        return toAjax(insertOrUpdate(tPssrSafetyBleed));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrSafetyBleed item) {
+        TPssrSafetyBleed entity = new TPssrSafetyBleed();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrSafetyBleed> list = tPssrSafetyBleedService.selectTPssrSafetyBleedList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrSafetyBleedService.updateTPssrSafetyBleed(item);
+        } else {
+            return tPssrSafetyBleedService.insertTPssrSafetyBleed(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java

@@ -25,6 +25,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -287,7 +288,21 @@ public class TPssrSafetyBreathController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBreath.setApproveStatus(0L);
-        return toAjax(tPssrSafetyBreathService.insertTPssrSafetyBreath(tPssrSafetyBreath));
+        return toAjax(insertOrUpdate(tPssrSafetyBreath));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrSafetyBreath item) {
+        TPssrSafetyBreath entity = new TPssrSafetyBreath();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrSafetyBreath> list = tPssrSafetyBreathService.selectTPssrSafetyBreathList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrSafetyBreathService.updateTPssrSafetyBreath(item);
+        } else {
+            return tPssrSafetyBreathService.insertTPssrSafetyBreath(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -25,6 +25,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -285,7 +286,21 @@ public class TPssrSafetyBrustController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBrust.setApproveStatus(0L);
-        return toAjax(tPssrSafetyBrustService.insertTPssrSafetyBrust(tPssrSafetyBrust));
+        return toAjax(insertOrUpdate(tPssrSafetyBrust));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrSafetyBrust item) {
+        TPssrSafetyBrust entity = new TPssrSafetyBrust();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrSafetyBrust> list = tPssrSafetyBrustService.selectTPssrSafetyBrustList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrSafetyBrustService.updateTPssrSafetyBrust(item);
+        } else {
+            return tPssrSafetyBrustService.insertTPssrSafetyBrust(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java

@@ -25,6 +25,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -279,7 +280,21 @@ public class TPssrSafetyFlamearresterController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyFlamearrester.setApproveStatus(0L);
-        return toAjax(tPssrSafetyFlamearresterService.insertTPssrSafetyFlamearrester(tPssrSafetyFlamearrester));
+        return toAjax(insertOrUpdate(tPssrSafetyFlamearrester));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrSafetyFlamearrester item) {
+        TPssrSafetyFlamearrester entity = new TPssrSafetyFlamearrester();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrSafetyFlamearrester> list = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrSafetyFlamearresterService.updateTPssrSafetyFlamearrester(item);
+        } else {
+            return tPssrSafetyFlamearresterService.insertTPssrSafetyFlamearrester(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java

@@ -22,6 +22,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -230,7 +231,21 @@ public class TPssrSafetyValveController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyValve.setApproveStatus(0L);
-        return toAjax(tPssrSafetyValveService.insertTPssrSafetyValve(tPssrSafetyValve));
+        return toAjax(insertOrUpdate(tPssrSafetyValve));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrSafetyValve item) {
+        TPssrSafetyValve entity = new TPssrSafetyValve();
+        entity.setSubId(item.getSubId());
+        entity.setDevNo(item.getDevNo());
+        List<TPssrSafetyValve> list = tPssrSafetyValveService.selectTPssrSafetyValveList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrSafetyValveService.updateTPssrSafetyValve(item);
+        } else {
+            return tPssrSafetyValveService.insertTPssrSafetyValve(item);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -216,7 +216,21 @@ public class TPssrVesselController extends BaseController {
         tPssrVessel.setApproveStatus(0L);
         tPssrVessel.setCreatedate(new Date());
         tPssrVessel.setCreaterCode(getUserId().toString());
-        return toAjax(tPssrVesselService.insertTPssrVessel(tPssrVessel));
+        return toAjax(insertOrUpdate(tPssrVessel));
+    }
+
+    //导入时判断更新或新增
+    private int insertOrUpdate(TPssrVessel item) {
+        TPssrVessel entity = new TPssrVessel();
+        entity.setSubId(item.getSubId());
+        entity.setVesselNo(item.getVesselNo());
+        List<TPssrVessel> list = tPssrVesselService.selectTPssrVesselList(entity);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setId(list.get(0).getId());
+            return tPssrVesselService.updateTPssrVessel(item);
+        } else {
+            return tPssrVesselService.insertTPssrVessel(item);
+        }
     }
 
     /**