Explorar el Código

PSSR优化import

jiangbiao hace 6 meses
padre
commit
20247fa3fb
Se han modificado 17 ficheros con 35 adiciones y 4 borrados
  1. 3 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java
  2. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java
  3. 3 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java
  4. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java
  5. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java
  6. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPatrolController.java
  7. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java
  8. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java
  9. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java
  10. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java
  11. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java
  12. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java
  13. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java
  14. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java
  15. 1 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyController.java
  16. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java
  17. 2 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSubcontentController.java

+ 3 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -15,6 +15,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrMoc;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrMocMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictDataService;
@@ -33,6 +34,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,7 @@ import java.util.*;
 @RequestMapping("/pssr/moc")
 public class TPssrMocController extends BaseController {
     @Resource
-     private TPssrMocMapper tPssrMocMapper;
+    private TPssrMocMapper tPssrMocMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

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

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrMotor;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrMotorMapper;
 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;

+ 3 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.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.TPssrOverhaulFilterMapper;
 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;
@@ -46,7 +48,7 @@ import java.util.*;
 @RequestMapping("/pssr/overhaulFilter")
 public class TPssrOverhaulFilterController extends BaseController {
     @Resource
-     private TPssrOverhaulFilterMapper tPssrOverhaulFilterMapper;
+    private TPssrOverhaulFilterMapper tPssrOverhaulFilterMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.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.TPssrOverhaulPipeMapper;
 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.*;
 
 /**

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.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.TPssrOverhaulValveMapper;
 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;

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

@@ -9,12 +9,14 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.patrol.patrol.service.ITPatrolMainService;
 import com.ruoyi.project.patrol.patrol.service.ITPatrolPlanService;
 import com.ruoyi.project.pssr.domain.TPssrPatrol;
+import com.ruoyi.project.pssr.mapper.TPssrPatrolMapper;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrPatrolService;
 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.List;
 
 /**

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

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPower;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrPowerMapper;
 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;

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

@@ -14,6 +14,7 @@ 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.mapper.TPssrProtectionMapper;
 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;

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

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPublic;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.mapper.TPssrPublicMapper;
 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;

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.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.TPssrPumpCleaningMapper;
 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;

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

@@ -14,6 +14,7 @@ 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.mapper.TPssrPumpFillMapper;
 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;

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

@@ -10,6 +10,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.TPssrSafetyBleed;
+import com.ruoyi.project.pssr.mapper.TPssrSafetyBleedMapper;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBleedService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -25,6 +26,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;

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

@@ -10,6 +10,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.TPssrSafetyBreath;
+import com.ruoyi.project.pssr.mapper.TPssrSafetyBreathMapper;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBreathService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -25,6 +26,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;

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

@@ -10,6 +10,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.TPssrSafetyBrust;
+import com.ruoyi.project.pssr.mapper.TPssrSafetyBrustMapper;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBrustService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -25,6 +26,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;

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

@@ -19,13 +19,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 @RestController
 @RequestMapping("/pssr/safety")
 public class TPssrSafetyController extends BaseController {
-    @Resource
-     private TPssrSafetyMapper tPssrSafetyMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 

+ 2 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.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.TPssrSafetyValve;
+import com.ruoyi.project.pssr.mapper.TPssrSafetyValveMapper;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyValveService;
 import com.ruoyi.project.pssr.service.ITPssrTurndownService;
@@ -23,6 +24,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;

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

@@ -16,6 +16,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrAboveall;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.mapper.TPssrSubcontentMapper;
 import com.ruoyi.project.pssr.service.ITPssrAboveallService;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
@@ -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.File;
 import java.io.IOException;
 import java.io.InputStream;