pssr 优化

master/src/main/java/com/ruoyi/project/apply/controller/TApplyLockController.java

@@ -160,10 +160,10 @@ public class TApplyLockController extends BaseController {
                     units.add("530");
                 }
             }
-            if (aboveall.getIncludePublic() == 1) {
+//            if (aboveall.getIncludePublic() == 1) {
                 posts = new ArrayList<>();
                 posts.add("公共区域");
-            }
+//            }
             tApplyLock.setPosts(posts);
             tApplyLock.setUnits(units);
         }

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

@@ -122,9 +122,9 @@ public class TPssrAirtightController extends BaseController {
                     }else if (j == 4) {
                         entity.setStandard(cellValue);
                     }else if (j == 5) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 6) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -233,7 +233,7 @@ public class TPssrAirtightController extends BaseController {
         }
         tPssrAirtight.setApproveStatus(0L);
         check(tPssrAirtight);
-        return toAjax(insertOrUpdate(tPssrAirtight));
+        return toAjax(tPssrAirtightService.insertTPssrAirtight(tPssrAirtight));
     }
 
     //导入时判断更新或新增
@@ -509,8 +509,8 @@ public class TPssrAirtightController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 10, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 11, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(12).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(13).setCellValue(t.getRemarks());

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

@@ -114,9 +114,9 @@ public class TPssrAnalyzerController extends BaseController {
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
                     }else if (j == 2) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 3) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -237,8 +237,8 @@ public class TPssrAnalyzerController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(7).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(8).setCellValue(t.getRemarks());
@@ -286,7 +286,7 @@ public class TPssrAnalyzerController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrAnalyzer.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrAnalyzer));
+        return toAjax(tPssrAnalyzerService.insertTPssrAnalyzer(tPssrAnalyzer));
     }
 
     //导入时判断更新或新增

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

@@ -132,9 +132,9 @@ public class TPssrBlindController extends BaseController {
                     } else if (j == 10) {
                         entity.setStartupStatus(cellValue);
                     }else if (j == 11) {
-                        entity.setInConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setInConfirm1(cellValue);
                     }else if (j == 12) {
-                        entity.setInConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setInConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -283,8 +283,8 @@ public class TPssrBlindController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 14, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 15, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(16).setCellValue(DateUtils.dateTime(t.getInstallDate()));
                 row.createCell(17).setCellValue(t.getRemarks());
@@ -334,7 +334,7 @@ public class TPssrBlindController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrBlind.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrBlind));
+        return toAjax(tPssrBlindService.insertTPssrBlind(tPssrBlind));
     }
 
     //导入时判断更新或新增

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

@@ -125,9 +125,9 @@ public class TPssrCircuitController extends BaseController {
                     } else if (j == 7) {
                         entity.setRightStatus(cellValue);
                     }else if (j == 8) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 9) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -254,8 +254,8 @@ public class TPssrCircuitController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 10, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(13).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(14).setCellValue(t.getRemarks());
@@ -318,7 +318,7 @@ public class TPssrCircuitController extends BaseController {
             tPssrCircuit.setCurrentStatusRight("否");
         }
         tPssrCircuit.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrCircuit));
+        return toAjax(tPssrCircuitService.insertTPssrCircuit(tPssrCircuit));
     }
 
     //导入时判断更新或新增

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

@@ -117,9 +117,9 @@ public class TPssrCleaningController extends BaseController {
                     } else if (j == 2) {
                         entity.setDevType(cellValue);
                     }else if (j == 3) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 4) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -341,7 +341,7 @@ public class TPssrCleaningController extends BaseController {
         }
         tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));
         tPssrCleaning.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrCleaning));
+        return toAjax(tPssrCleaningService.insertTPssrCleaning(tPssrCleaning));
     }
 
     //导入时判断更新或新增

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

@@ -130,9 +130,9 @@ public class TPssrFrameController extends BaseController {
                     } else if (j == 9) {
                         entity.setRemarks(cellValue);
                     }else if (j == 10) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 11) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -257,8 +257,8 @@ public class TPssrFrameController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 9, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 10, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(11).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(12).setCellValue(t.getRemarks());

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

@@ -82,7 +82,7 @@ public class TPssrFrameModelController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TPssrFrameModel tPssrFrameModel)
     {
-        return toAjax(insertOrUpdate(tPssrFrameModel));
+        return toAjax(tPssrFrameModelService.insertTPssrFrameModel(tPssrFrameModel));
     }
 
 

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

@@ -118,9 +118,9 @@ public class TPssrFranklinismController extends BaseController {
                     } else if (j == 3) {
                         entity.setRemarks(cellValue);
                     }else if (j == 4) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 5) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -239,8 +239,8 @@ public class TPssrFranklinismController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(5).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(6).setCellValue(t.getRemarks());

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

@@ -110,9 +110,9 @@ public class TPssrGasdetectorController extends BaseController {
                     if (j == 0) {
                         entity.setDevNo(cellValue);
                     }else if (j == 1) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 2) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -233,8 +233,8 @@ public class TPssrGasdetectorController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(7).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(8).setCellValue(t.getRemarks());
@@ -282,7 +282,7 @@ public class TPssrGasdetectorController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrGasdetector.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrGasdetector));
+        return toAjax(tPssrGasdetectorService.insertTPssrGasdetector(tPssrGasdetector));
     }
 
     //导入时判断更新或新增

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

@@ -118,9 +118,9 @@ public class TPssrHygieneController extends BaseController {
                     } else if (j == 3) {
                         entity.setRemarks(cellValue);
                     }else if (j == 4) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 5) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -239,8 +239,8 @@ public class TPssrHygieneController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(5).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(6).setCellValue(t.getRemarks());

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

@@ -126,9 +126,9 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                             entity.setDevType("2");
                         }
                     }else if (j == 3) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 4) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -266,8 +266,8 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(10).setCellValue(t.getRemarks());
@@ -329,8 +329,8 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(9).setCellValue(t.getRemarks());
@@ -392,8 +392,8 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(9).setCellValue(t.getRemarks());
@@ -441,7 +441,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrInstrumentCalibration.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrInstrumentCalibration));
+        return toAjax(tPssrInstrumentCalibrationService.insertTPssrInstrumentCalibration(tPssrInstrumentCalibration));
     }
 
     //导入时判断更新或新增

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

@@ -114,9 +114,9 @@ public class TPssrLaboratoryController extends BaseController {
                     } else if (j == 2) {
                         entity.setSerialNumber(cellValue);
                     }else if (j == 3) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 4) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -238,8 +238,8 @@ public class TPssrLaboratoryController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(9).setCellValue(t.getRemarks());
@@ -288,7 +288,7 @@ public class TPssrLaboratoryController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrLaboratory.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrLaboratory));
+        return toAjax(tPssrLaboratoryService.insertTPssrLaboratory(tPssrLaboratory));
     }
 
     //导入时判断更新或新增

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

@@ -158,8 +158,8 @@ public class TPssrLightingController extends BaseController {
                     String confirm2 =  sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(5).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(6).setCellValue(t.getRemarks());

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

@@ -11,33 +11,32 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.apply.domain.TApplyLock;
 import com.ruoyi.project.apply.service.ITApplyLockService;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrLock;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrLockMapper;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
 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;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -70,10 +69,94 @@ public class TPssrLockController extends BaseController {
     @Autowired
     private ITApplyLockService tApplyLockService;
 
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
     @Autowired
     private ISysUserService sysUserService;
     private String forShort = "sksgfmzt";
 
+    @PreAuthorize("@ss.hasPermi('pssr:lock:add')")
+    @PostMapping("/importData")
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow = new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TPssrLock> list = new ArrayList<TPssrLock>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //部门查询
+        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        int failNumber = 0;
+        for (int i = 2; i <= rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                int cellNum = row.getLastCellNum();
+                TPssrLock entity = new TPssrLock();
+                entity.setDeptId(sysUserService.selectUserById(getUserId()).getDeptId());
+                entity.setSubId(subId);
+                entity.setApproveStatus(0L);
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        entity.setUnit(cellValue);
+                    } else if (j == 1) {
+                        entity.setLockPost(cellValue);
+                    } else if (j == 2) {
+                        entity.setPidNo(cellValue);
+                    } else if (j == 3) {
+                        entity.setLockCode(cellValue);
+                    } else if (j == 4) {
+                        entity.setMedium(cellValue);
+                    } else if (j == 5) {
+                        entity.setPosition(cellValue);
+                    }else if (j == 6) {
+                        entity.setRiskLevel(cellValue);
+                    }else if (j == 7) {
+                        entity.setLockSize(cellValue);
+                    }else if (j == 8) {
+                        entity.setPidStatus(cellValue);
+                    }else if (j == 9) {
+                        entity.setLockeder(cellValue);
+                    }else if (j == 10) {
+                        entity.setConfirm(cellValue);
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            } catch (Exception e) {
+                failNumber++;
+                failRow.add(i + 1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TPssrLock t : list
+        ) {
+            failNum++;
+            try {
+                tPssrLockService.insertTPssrLock(t);
+                successNumber++;
+            } catch (Exception e) {
+                failNumber++;
+                logger.info("e:" + e);
+                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));
+        return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
+    }
+
     /**
      * 查询锁开锁关阀门状态列表
      */
@@ -173,8 +256,8 @@ public class TPssrLockController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 15, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 16, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(17).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(18).setCellValue(t.getRemarks());

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

@@ -263,8 +263,7 @@ public class TPssrMaterialController extends BaseController {
                     String confirm = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm, rowIndex, 4, 0.25, 1);
                 }
-            } catch (NumberFormatException e) {
-                throw new RuntimeException(e);
+            } catch (Exception e) {
             }
             for (int i = 0; i < 5; i++) {
                 title4.getCell(i).setCellStyle(originalStyleCopy);

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

@@ -120,9 +120,9 @@ public class TPssrMeasureController extends BaseController {
                     } else if (j == 2) {
                         entity.setProMeasure(cellValue);
                     }else if (j == 3) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 4) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -245,8 +245,8 @@ public class TPssrMeasureController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(10).setCellValue(t.getRemarks());
@@ -295,7 +295,7 @@ public class TPssrMeasureController extends BaseController {
         tPssrMeasure.setApproveStatus(0L);
         tPssrMeasure.setCreaterCode(String.valueOf(getUserId()));
         tPssrMeasure.setCreatedate(new Date());
-        return toAjax(insertOrUpdate(tPssrMeasure));
+        return toAjax(tPssrMeasureService.insertTPssrMeasure(tPssrMeasure));
     }
 
     //导入时判断更新或新增

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

@@ -168,8 +168,8 @@ public class TPssrMocController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(10).setCellValue(t.getRemarks());
@@ -216,7 +216,7 @@ public class TPssrMocController extends BaseController {
         if (StringUtils.isNotEmpty(tPssrMoc.getConfirm1())&&tPssrMoc.getConfirm1().equals(tPssrMoc.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
-        return toAjax(insertOrUpdate(tPssrMoc));
+        return toAjax(tPssrMocService.insertTPssrMoc(tPssrMoc));
     }
 
     //导入时判断更新或新增

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

@@ -113,9 +113,9 @@ public class TPssrMotorController extends BaseController {
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
                     }else if (j == 2) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 3) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -236,8 +236,8 @@ public class TPssrMotorController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(7).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(8).setCellValue(t.getRemarks());
@@ -285,7 +285,7 @@ public class TPssrMotorController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrMotor.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrMotor));
+        return toAjax(tPssrMotorService.insertTPssrMotor(tPssrMotor));
     }
 
     //导入时判断更新或新增

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

@@ -119,9 +119,9 @@ public class TPssrNitrogenController extends BaseController {
                     } else if (j == 3) {
                         entity.setDewPointValue(cellValue);
                     }else if (j == 4) {
-                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm1(cellValue);
                     }else if (j == 5) {
-                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -245,8 +245,8 @@ public class TPssrNitrogenController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 8, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 9, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(10).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(11).setCellValue(t.getRemarks());
@@ -295,7 +295,7 @@ public class TPssrNitrogenController extends BaseController {
         }
         tPssrNitrogen.setApproveStatus(0L);
         this.verifySatndard(tPssrNitrogen);
-        return toAjax(insertOrUpdate(tPssrNitrogen));
+        return toAjax(tPssrNitrogenService.insertTPssrNitrogen(tPssrNitrogen));
     }
 
     //导入时判断更新或新增

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

@@ -192,8 +192,8 @@ public class TPssrOverhaulExchangerController extends BaseController {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
                     String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(7).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
                 row.createCell(8).setCellValue(t.getRemarks());

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

@@ -331,8 +331,8 @@ public class TPssrOverhaulFilterController extends BaseController {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getRespPerson()));
                     String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 9, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
                 row.createCell(10).setCellValue(t.getRemarks());

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

@@ -324,8 +324,8 @@ public class TPssrOverhaulTowerController extends BaseController {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
                     String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(7).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
                 row.createCell(8).setCellValue(t.getRemarks());

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

@@ -356,8 +356,8 @@ public class TPssrOverhaulValveController extends BaseController {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getIdentifyingPerson()));
                     String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getDoneDate()));
                 row.createCell(10).setCellValue(t.getRemarks());

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

@@ -214,8 +214,8 @@ public class TPssrPipeController extends BaseController {
                     String confirm2 =  sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(10).setCellValue(t.getRemarks());
@@ -264,7 +264,7 @@ public class TPssrPipeController extends BaseController {
         tPssrPipe.setApproveStatus(0L);
         tPssrPipe.setCreatedate(new Date());
         tPssrPipe.setCreaterCode(getUserId().toString());
-        return toAjax(insertOrUpdate(tPssrPipe));
+        return toAjax(tPssrPipeService.insertTPssrPipe(tPssrPipe));
     }
 
     //导入时判断更新或新增

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

@@ -155,8 +155,8 @@ public class TPssrPowerController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(5).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(6).setCellValue(t.getRemarks());

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

@@ -155,8 +155,8 @@ public class TPssrProgrammeController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(8).setCellValue(t.getRemarks());
 

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

@@ -125,6 +125,10 @@ public class TPssrProtectionController extends BaseController {
                         }
                     } else if (j == 3) {
                         entity.setRemarks(cellValue);
+                    } else if (j == 4) {
+                        entity.setConfirm1(cellValue);
+                    } else if (j == 5) {
+                        entity.setConfirm2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -243,8 +247,8 @@ public class TPssrProtectionController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(5).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(6).setCellValue(t.getRemarks());

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

@@ -158,8 +158,8 @@ public class TPssrPublicController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(7).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(8).setCellValue(t.getRemarks());

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

@@ -121,6 +121,10 @@ public class TPssrPumpCleaningController extends BaseController {
                         entity.setPosition(cellValue);
                     } else if (j == 2) {
                         entity.setFilterNumber(cellValue);
+                    } else if (j == 3) {
+                        entity.setConfirmer1(cellValue);
+                    } else if (j == 4) {
+                        entity.setConfirmer2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -243,8 +247,8 @@ public class TPssrPumpCleaningController extends BaseController {
                     String confirm2 =  sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(9).setCellValue(t.getRemarks());
@@ -293,7 +297,7 @@ public class TPssrPumpCleaningController extends BaseController {
         tPssrPumpCleaning.setApproveStatus(0L);
         tPssrPumpCleaning.setCreatedate(new Date());
         tPssrPumpCleaning.setCreaterCode(String.valueOf(getUserId()));
-        return toAjax(insertOrUpdate(tPssrPumpCleaning));
+        return toAjax(tPssrPumpCleaningService.insertTPssrPumpCleaning(tPssrPumpCleaning));
     }
 
     //导入时判断更新或新增

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

@@ -121,6 +121,10 @@ public class TPssrPumpFillController extends BaseController {
                         entity.setDevNo(cellValue);
                     } else if (j == 2) {
                         entity.setLubricatingPart(cellValue);
+                    } else if (j == 3) {
+                        entity.setConfirmer1(cellValue);
+                    } else if (j == 4) {
+                        entity.setConfirmer2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -244,8 +248,8 @@ public class TPssrPumpFillController extends BaseController {
                     String confirm2 =  sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(10).setCellValue(t.getRemarks());
@@ -294,7 +298,7 @@ public class TPssrPumpFillController extends BaseController {
         tPssrPumpFill.setApproveStatus(0L);
         tPssrPumpFill.setCreatedate(new Date());
         tPssrPumpFill.setCreaterCode(String.valueOf(getUserId()));
-        return toAjax(insertOrUpdate(tPssrPumpFill));
+        return toAjax(tPssrPumpFillService.insertTPssrPumpFill(tPssrPumpFill));
     }
 
     //导入时判断更新或新增

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

@@ -119,6 +119,10 @@ public class TPssrPumpOverhaulController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
+                    } else if (j == 2) {
+                        entity.setConfirmer1(cellValue);
+                    } else if (j == 3) {
+                        entity.setConfirmer2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -240,8 +244,8 @@ public class TPssrPumpOverhaulController extends BaseController {
                     String confirm2 =  sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(7).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(8).setCellValue(t.getRemarks());
@@ -290,7 +294,7 @@ public class TPssrPumpOverhaulController extends BaseController {
         tPssrPumpOverhaul.setApproveStatus(0L);
         tPssrPumpOverhaul.setCreatedate(new Date());
         tPssrPumpOverhaul.setCreaterCode(String.valueOf(getUserId()));
-        return toAjax(insertOrUpdate(tPssrPumpOverhaul));
+        return toAjax(tPssrPumpOverhaulService.insertTPssrPumpOverhaul(tPssrPumpOverhaul));
     }
 
     //导入时判断更新或新增

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

@@ -118,6 +118,10 @@ public class TPssrSafetyBleedController extends BaseController {
                         entity.setInstallLocation(cellValue);
                     } else if (j == 4) {
                         entity.setSetPressure(cellValue);
+                    } else if (j == 5) {
+                        entity.setConfirmer1(cellValue);
+                    } else if (j == 6) {
+                        entity.setConfirmer2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -244,8 +248,8 @@ public class TPssrSafetyBleedController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(13).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
                 row.createCell(14).setCellValue(t.getRemarks());
@@ -292,7 +296,7 @@ public class TPssrSafetyBleedController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBleed.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrSafetyBleed));
+        return toAjax(tPssrSafetyBleedService.insertTPssrSafetyBleed(tPssrSafetyBleed));
     }
 
     //导入时判断更新或新增

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

@@ -118,6 +118,10 @@ public class TPssrSafetyBreathController extends BaseController {
                         entity.setInstallLocation(cellValue);
                     } else if (j == 4) {
                         entity.setSetPressure(cellValue);
+                    } else if (j == 5) {
+                        entity.setConfirmer1(cellValue);
+                    } else if (j == 6) {
+                        entity.setConfirmer2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -244,8 +248,8 @@ public class TPssrSafetyBreathController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(13).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
                 row.createCell(14).setCellValue(t.getRemarks());
@@ -292,7 +296,7 @@ public class TPssrSafetyBreathController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBreath.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrSafetyBreath));
+        return toAjax(tPssrSafetyBreathService.insertTPssrSafetyBreath(tPssrSafetyBreath));
     }
 
     //导入时判断更新或新增

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

@@ -116,6 +116,10 @@ public class TPssrSafetyBrustController extends BaseController {
                         entity.setInstallLocation(cellValue);
                     } else if (j == 4) {
                         entity.setSetPressure(cellValue);
+                    } else if (j == 5) {
+                        entity.setConfirmer1(cellValue);
+                    } else if (j == 6) {
+                        entity.setConfirmer2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -242,8 +246,8 @@ public class TPssrSafetyBrustController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(13).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
                 row.createCell(14).setCellValue(t.getRemarks());
@@ -290,7 +294,7 @@ public class TPssrSafetyBrustController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBrust.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrSafetyBrust));
+        return toAjax(tPssrSafetyBrustService.insertTPssrSafetyBrust(tPssrSafetyBrust));
     }
 
     //导入时判断更新或新增

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

@@ -114,6 +114,10 @@ public class TPssrSafetyFlamearresterController extends BaseController {
                         entity.setDevNo(cellValue);
                     } else if (j == 2) {
                         entity.setInstallLocation(cellValue);
+                    } else if (j == 3) {
+                        entity.setConfirmer1(cellValue);
+                    } else if (j == 4) {
+                        entity.setConfirmer2(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -236,8 +240,8 @@ public class TPssrSafetyFlamearresterController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
                 row.createCell(10).setCellValue(t.getRemarks());
@@ -284,7 +288,7 @@ public class TPssrSafetyFlamearresterController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyFlamearrester.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrSafetyFlamearrester));
+        return toAjax(tPssrSafetyFlamearresterService.insertTPssrSafetyFlamearrester(tPssrSafetyFlamearrester));
     }
 
     //导入时判断更新或新增

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

@@ -187,8 +187,8 @@ public class TPssrSafetyValveController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 12, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 13, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(14).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
                 row.createCell(15).setCellValue(t.getRemarks());
@@ -235,7 +235,7 @@ public class TPssrSafetyValveController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyValve.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrSafetyValve));
+        return toAjax(tPssrSafetyValveService.insertTPssrSafetyValve(tPssrSafetyValve));
     }
 
     //导入时判断更新或新增

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

@@ -160,8 +160,8 @@ public class TPssrTorchvocController extends BaseController {
                     String confirm2 =  sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(5).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(6).setCellValue(t.getRemarks());

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

@@ -170,8 +170,8 @@ public class TPssrVesselController extends BaseController {
                     String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
+                } catch (Exception e) {
+
                 }
                 row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
                 row.createCell(10).setCellValue(t.getRemarks());
@@ -220,7 +220,7 @@ public class TPssrVesselController extends BaseController {
         tPssrVessel.setApproveStatus(0L);
         tPssrVessel.setCreatedate(new Date());
         tPssrVessel.setCreaterCode(getUserId().toString());
-        return toAjax(insertOrUpdate(tPssrVessel));
+        return toAjax(tPssrVesselService.insertTPssrVessel(tPssrVessel));
     }
 
     //导入时判断更新或新增

ui/src/views/pssr/cleaning/index.vue

@@ -287,7 +287,7 @@
             <el-radio v-model="row.result" label="✖">✖</el-radio>
           </template>
         </el-table-column>
-        <el-table-column label="操作"  align="center" width="50">
+        <el-table-column label="操作" align="center" width="50">
           <template #default="{ row, column, $index }">
             <el-button type="text" @click="removeContentList($index)">删除</el-button>
           </template>
@@ -423,6 +423,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getPssrUser} from "@/api/pssr/aboveall";
 import {doApprove} from "@/api/pssr/approve";
 import PssrFile from "@/views/pssr/file/index.vue";
+import {listFile} from "@/api/pssr/file";
 
 export default {
   dicts: ['pssr_approve_status'],
@@ -549,10 +550,10 @@ export default {
   },
   methods: {
     // 处理子项的编辑
-    removeContentList(index){
+    removeContentList(index) {
       console.log(this.form.contentList)
       console.log(index)
-      this.form.contentList.splice(index,1);
+      this.form.contentList.splice(index, 1);
     },
     /** 查询设备清洁列表 */
     getList() {
@@ -678,6 +679,14 @@ export default {
         this.getFileList()
       }
     },
+    getFileList() {
+      listFile(this.doc.queryParams).then(response => {
+        this.doc.fileList = response.rows;
+        this.doc.fileList.forEach(item => {
+          item.fileUrl = process.env.VUE_APP_BASE_API + item.fileUrl;
+        });
+      });
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

ui/src/views/pssr/lock/index.vue

@@ -73,6 +73,17 @@
         >删除
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:lock:edit']"
+        >导入
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -342,6 +353,7 @@
       </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
+    <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload
@@ -349,7 +361,7 @@
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :action="upload.url"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -362,9 +374,12 @@
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport"/>
-          是否更新已经存在的用户数据
+          <!--<el-checkbox v-model="upload.updateSupport"/>-->
+          <!--是否更新已经存在的用户数据-->
           <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+          <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+            <input name="type" :value="upload.type" hidden/>
+          </form>
         </div>
         <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
@@ -374,6 +389,7 @@
       </div>
     </el-dialog>
 
+
     <!-- 附件对话框 -->
     <pssr-file v-if="doc.visible" ref="pssrFile"/>
     <el-dialog :close-on-click-modal="false" v-dialogDrag title="现场照片" :visible.sync="doc.open" width="1000px"
@@ -482,6 +498,10 @@ export default {
       approveOpen: false,
       // 用户导入参数
       upload: {
+        //下载模板请求地址
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        //下载模板类型
+        type: 'pssrblind',
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
@@ -493,7 +513,7 @@ export default {
         // 设置上传的请求头部
         headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/pssr/lock/importData"
+        url: process.env.VUE_APP_BASE_API + "/pssr/lock/importData?subId=" + this.subId
       },
       // 查询参数
       queryParams: {

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -163,7 +163,7 @@
                     :show-type="getTagType(scope.row.approveStatus)"/>
         </template>
       </el-table-column>
-      <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
+      <el-table-column label="位号/管线号" align="center" prop="tagNo" v-if="devType!=5" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="PI&D图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>

ui/src/views/pssr/overhaulFilter/index.vue

@@ -19,15 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="管线号" prop="isoDwgNo">
-        <el-input
-          v-model="queryParams.isoDwgNo"
-          placeholder="请输入管线号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="管线号" prop="isoDwgNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.isoDwgNo"-->
+<!--          placeholder="请输入管线号"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -165,8 +165,8 @@
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="过滤网位置" align="center" prop="strainerLocation" :show-overflow-tooltip="true"/>
       <el-table-column label="P&ID号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="管线号" align="center" prop="isoDwgNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="法兰尺寸" align="center" prop="flangeSize" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="管线号" align="center" prop="isoDwgNo" :show-overflow-tooltip="true"/>-->
+<!--      <el-table-column label="法兰尺寸" align="center" prop="flangeSize" :show-overflow-tooltip="true"/>-->
       <el-table-column label="更换/清洗" align="center" prop="changeClean" :show-overflow-tooltip="true"/>
       <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
@@ -228,12 +228,12 @@
         <el-form-item label="P&ID号" prop="pidNo">
           <el-input v-model="form.pidNo"  type="textarea" placeholder="请输入P&ID号"/>
         </el-form-item>
-        <el-form-item label="管线号" prop="isoDwgNo">
-          <el-input v-model="form.isoDwgNo" placeholder="请输入管线号"/>
-        </el-form-item>
-        <el-form-item label="法兰尺寸" prop="flangeSize">
-          <el-input v-model="form.flangeSize" placeholder="请输入法兰尺寸"/>
-        </el-form-item>
+<!--        <el-form-item label="管线号" prop="isoDwgNo">-->
+<!--          <el-input v-model="form.isoDwgNo" placeholder="请输入管线号"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="法兰尺寸" prop="flangeSize">-->
+<!--          <el-input v-model="form.flangeSize" placeholder="请输入法兰尺寸"/>-->
+<!--        </el-form-item>-->
         <el-form-item label="更换/清洗" prop="changeClean">
           <el-radio-group v-model="form.changeClean">
             <el-radio label="更换">更换</el-radio>