Browse Source

ly PSSR 批量

ly 6 months ago
parent
commit
3e4d050307
46 changed files with 155 additions and 41 deletions
  1. 5 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java
  2. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAlarmController.java
  3. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java
  4. 8 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java
  5. 5 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java
  6. 7 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java
  7. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrContentModelController.java
  8. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java
  9. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java
  10. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java
  11. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java
  12. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java
  13. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentTestController.java
  14. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java
  15. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java
  16. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLockController.java
  17. 0 3
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java
  18. 0 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java
  19. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java
  20. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java
  21. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java
  22. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java
  23. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java
  24. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java
  25. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java
  26. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java
  27. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java
  28. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPatrolController.java
  29. 4 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java
  30. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java
  31. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProgrammeController.java
  32. 6 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java
  33. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java
  34. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java
  35. 5 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java
  36. 4 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java
  37. 2 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java
  38. 2 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java
  39. 2 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java
  40. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyController.java
  41. 0 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java
  42. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java
  43. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSubcontentController.java
  44. 1 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java
  45. 7 14
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTurndownController.java
  46. 5 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

+ 5 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -11,9 +11,9 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrAirtight;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrAirtight;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrAirtightMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -32,6 +32,7 @@ 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;
@@ -72,6 +73,9 @@ public class TPssrAirtightController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Resource
+    private TPssrAirtightMapper tPssrAirtightMapper;
+
     private String forShort = "qm";
 
     /**

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAlarmController.java

@@ -9,6 +9,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrAlarm;
+import com.ruoyi.project.pssr.mapper.TPssrAlarmMapper;
 import com.ruoyi.project.pssr.service.ITPssrAlarmService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@ 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.IOException;
 import java.util.Date;
 import java.util.List;
@@ -33,7 +35,8 @@ public class TPssrAlarmController extends BaseController {
     private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrAlarmService tPssrAlarmService;
-
+    @Resource
+    private TPssrAlarmMapper tPssrAlarmMapper;
     /**
      * 查询报警联锁值确认列表
      */

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrAnalyzer;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrAnalyzerMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -60,6 +62,8 @@ public class TPssrAnalyzerController extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    @Resource
+    private TPssrAnalyzerMapper tPssrAnalyzerMapper;
 
     private String forShort = "zxfxy";
 

+ 8 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -8,8 +8,11 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrBlind;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrBlindMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -28,6 +31,7 @@ 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;
@@ -47,6 +51,9 @@ public class TPssrBlindController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
 
+    @Resource
+    private TPssrBlindMapper tPssrBlindMapper;
+
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 5 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -11,9 +11,9 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrCircuit;
-import com.ruoyi.project.pssr.domain.TPssrCircuit;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrCircuitMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -32,6 +32,7 @@ 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;
@@ -51,6 +52,9 @@ public class TPssrCircuitController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
 
+    @Resource
+    private TPssrCircuitMapper tPssrCircuitMapper;
+
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 7 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -9,8 +9,11 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrCleaning;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrCleaningMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -29,6 +32,7 @@ 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;
@@ -47,7 +51,8 @@ import java.util.*;
 public class TPssrCleaningController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrCleaningMapper tPssrCleaningMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrContentModelController.java

@@ -9,6 +9,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrContentModel;
+import com.ruoyi.project.pssr.mapper.TPssrContentModelMapper;
 import com.ruoyi.project.pssr.service.ITPssrContentModelService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import org.apache.poi.ss.usermodel.Cell;
@@ -20,6 +21,7 @@ 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.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -36,6 +38,8 @@ import java.util.List;
 public class TPssrContentModelController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+    @Resource
+    private TPssrContentModelMapper tPssrContentModelMapper;
     @Autowired
     private ITPssrContentModelService tPssrContentModelService;
 

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrFrame;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrFrameMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,7 +48,8 @@ import java.util.*;
 public class TPssrFrameController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrFrameMapper tPssrFrameMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrFranklinism;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrFranklinismMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,7 +48,8 @@ import java.util.*;
 public class TPssrFranklinismController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrFranklinismMapper tPssrFranklinismMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrGasdetector;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrGasdetectorMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,7 +48,8 @@ import java.util.*;
 public class TPssrGasdetectorController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrGasdetectorMapper tPssrGasdetectorMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -13,6 +13,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrHygiene;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrHygieneMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -31,6 +32,7 @@ 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;
@@ -49,7 +51,8 @@ import java.util.*;
 public class TPssrHygieneController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrHygieneMapper tPssrHygieneMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrInstrumentCalibrationMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,7 +48,8 @@ import java.util.*;
 public class TPssrInstrumentCalibrationController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrInstrumentCalibrationMapper tPssrInstrumentCalibrationMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentTestController.java

@@ -9,6 +9,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrInstrumentTest;
+import com.ruoyi.project.pssr.mapper.TPssrInstrumentTestMapper;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrInstrumentTestService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@ 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.IOException;
 import java.util.Date;
 import java.util.List;
@@ -31,6 +33,8 @@ import java.util.List;
 public class TPssrInstrumentTestController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
+    @Resource
+    private TPssrInstrumentTestMapper tPssrInstrumentTestMapper;
     @Autowired
     private ITPssrInstrumentTestService tPssrInstrumentTestService;
 

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -13,6 +13,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrLaboratory;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrLaboratoryMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -31,6 +32,7 @@ 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;
@@ -49,7 +51,8 @@ import java.util.*;
 public class TPssrLaboratoryController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrLaboratoryMapper tPssrLaboratoryMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrLighting;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrLightingMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,7 +48,8 @@ import java.util.*;
 public class TPssrLightingController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrLightingMapper tPssrLightingMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLockController.java

@@ -15,6 +15,7 @@ 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.mapper.TPssrLockMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -32,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -49,7 +51,8 @@ import java.util.*;
 public class TPssrLockController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
+    @Resource
+    private TPssrLockMapper tPssrLockMapper;
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 0 - 3
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -10,7 +10,6 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.*;
-import com.ruoyi.project.pssr.domain.TPssrMaterial;
 import com.ruoyi.project.pssr.mapper.TPssrMaterialMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
@@ -25,7 +24,6 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +31,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.swing.*;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

+ 0 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -49,7 +49,6 @@ import java.util.*;
 public class TPssrMeasureController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
-
     @Autowired
     private ITPssrTurndownService tPssrTurndownService;
     @Autowired

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -48,6 +48,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/moc")
 public class TPssrMocController extends BaseController {
+    @Resource
+     private TPssrMocMapper tPssrMocMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -44,6 +44,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/motor")
 public class TPssrMotorController extends BaseController {
+    @Resource
+     private TPssrMotorMapper tPssrMotorMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -11,9 +11,9 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrNitrogen;
-import com.ruoyi.project.pssr.domain.TPssrNitrogen;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrNitrogenMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -32,6 +32,7 @@ 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;
@@ -49,6 +50,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/nitrogen")
 public class TPssrNitrogenController extends BaseController {
+    @Resource
+     private TPssrNitrogenMapper tPssrNitrogenMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -14,6 +14,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrOverhaulExchangerMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -32,6 +33,7 @@ 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;
@@ -48,6 +50,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulExchanger")
 public class TPssrOverhaulExchangerController extends BaseController {
+    @Resource
+     private TPssrOverhaulExchangerMapper tPssrOverhaulExchangerMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -45,6 +45,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulFilter")
 public class TPssrOverhaulFilterController extends BaseController {
+    @Resource
+     private TPssrOverhaulFilterMapper tPssrOverhaulFilterMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java

@@ -29,6 +29,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulPipe")
 public class TPssrOverhaulPipeController extends BaseController {
+    @Resource
+     private TPssrOverhaulPipeMapper tPssrOverhaulPipeMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java

@@ -8,6 +8,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.mapper.TPssrOverhaulPumpMapper;
 import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -29,6 +31,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulPump")
 public class TPssrOverhaulPumpController extends BaseController {
+    @Resource
+     private TPssrOverhaulPumpMapper tPssrOverhaulPumpMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.mapper.TPssrOverhaulTowerMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -29,6 +30,7 @@ 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;
@@ -45,6 +47,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulTower")
 public class TPssrOverhaulTowerController extends BaseController {
+    @Resource
+     private TPssrOverhaulTowerMapper tPssrOverhaulTowerMapper;
         @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -45,6 +45,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulValve")
 public class TPssrOverhaulValveController extends BaseController {
+    @Resource
+     private TPssrOverhaulValveMapper tPssrOverhaulValveMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPatrolController.java

@@ -26,6 +26,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/patrol")
 public class TPssrPatrolController extends BaseController {
+    @Resource
+     private TPssrPatrolMapper tPssrPatrolMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
     @Autowired

+ 4 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -10,8 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPipe;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrPipeMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.sems.domain.TSpecdevYlgd;
@@ -57,6 +59,7 @@ public class TPssrPipeController extends BaseController {
     private ITPssrPipeService tPssrPipeService;
     @Resource
     private TSpecdevYlgdMapper tSpecdevYlgdMapper;
+
     @Resource
     private TPssrPipeMapper tPssrPipeMapper;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java

@@ -44,6 +44,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/power")
 public class TPssrPowerController extends BaseController {
+    @Resource
+     private TPssrPowerMapper tPssrPowerMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProgrammeController.java

@@ -13,6 +13,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrProgramme;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrProgrammeMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -31,6 +32,7 @@ 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;
@@ -46,6 +48,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/programme")
 public class TPssrProgrammeController extends BaseController {
+    @Resource
+     private TPssrProgrammeMapper tPssrProgrammeMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 6 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java

@@ -10,7 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrProtection;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -45,6 +48,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/protection")
 public class TPssrProtectionController extends BaseController {
+    @Resource
+     private TPssrProtectionMapper tPssrProtectionMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -44,6 +44,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/public")
 public class TPssrPublicController extends BaseController {
+    @Resource
+     private TPssrPublicMapper tPssrPublicMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -45,6 +45,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/pumpCleaning")
 public class TPssrPumpCleaningController extends BaseController {
+    @Resource
+     private TPssrPumpCleaningMapper tPssrPumpCleaningMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 5 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -10,8 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPumpFill;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -46,6 +48,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/pumpFill")
 public class TPssrPumpFillController extends BaseController {
+    @Resource
+     private TPssrPumpFillMapper tPssrPumpFillMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 4 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.mapper.TPssrPumpOverhaulMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -29,6 +30,7 @@ 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;
@@ -45,6 +47,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/pumpOverhaul")
 public class TPssrPumpOverhaulController extends BaseController {
+    @Resource
+     private TPssrPumpOverhaulMapper tPssrPumpOverhaulMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java

@@ -10,7 +10,6 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
-import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBleedService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -43,6 +42,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyBleed")
 public class TPssrSafetyBleedController extends BaseController {
+    @Resource
+     private TPssrSafetyBleedMapper tPssrSafetyBleedMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java

@@ -10,7 +10,6 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
-import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBreathService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -43,6 +42,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyBreath")
 public class TPssrSafetyBreathController extends BaseController {
+    @Resource
+     private TPssrSafetyBreathMapper tPssrSafetyBreathMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -10,7 +10,6 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
-import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBrustService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -43,6 +42,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyBrust")
 public class TPssrSafetyBrustController extends BaseController {
+    @Resource
+     private TPssrSafetyBrustMapper tPssrSafetyBrustMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyController.java

@@ -24,6 +24,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/safety")
 public class TPssrSafetyController extends BaseController {
+    @Resource
+     private TPssrSafetyMapper tPssrSafetyMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 0 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java

@@ -10,7 +10,6 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
-import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyFlamearresterService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java

@@ -38,6 +38,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyValve")
 public class TPssrSafetyValveController extends BaseController {
+    @Resource
+     private TPssrSafetyValveMapper tPssrSafetyValveMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSubcontentController.java

@@ -47,6 +47,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/pssr/subcontent")
 public class TPssrSubcontentController extends BaseController {
+    @Resource
+     private TPssrSubcontentMapper tPssrSubcontentMapper;
     @Autowired
     private ITPssrSubcontentService tPssrSubcontentService;
     @Autowired

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java

@@ -41,6 +41,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/torchvoc")
 public class TPssrTorchvocController extends BaseController {
+
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 7 - 14
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTurndownController.java

@@ -1,24 +1,17 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
-import com.ruoyi.project.pssr.service.ITPssrTurndownService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.service.ITPssrTurndownService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * PSSR驳回原因Controller

+ 5 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.mapper.TPssrVesselMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
@@ -30,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,6 +47,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/vessel")
 public class TPssrVesselController extends BaseController {
+    @Resource
+    private TPssrVesselMapper tPssrVesselMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -55,7 +59,7 @@ public class TPssrVesselController extends BaseController {
 
     @Autowired
     private ITPssrSubcontentService tPssrSubcontentService;
-    @Autowired
+    @Resource
     private TSpecdevYlrqMapper tSpecdevYlrqMapper;
 
     @Autowired