Pārlūkot izejas kodu

删除 Service 接口抽象层。

tom 5 mēneši atpakaļ
vecāks
revīzija
192a149c6a
45 mainītis faili ar 48 papildinājumiem un 1080 dzēšanām
  1. 0 11
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/AddOnDeptController.java
  2. 2 4
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/AddOnUserController.java
  3. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/FaultController.java
  4. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/MajorController.java
  5. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamCollectionController.java
  6. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamCollectionDeptController.java
  7. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamCompRequestController.java
  8. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamController.java
  9. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamFaultController.java
  10. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/SeatController.java
  11. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/SimController.java
  12. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/SimMsgController.java
  13. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TaskController.java
  14. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TaskFaultController.java
  15. 2 2
      ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TeacherController.java
  16. 0 67
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IAddOnDeptService.java
  17. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IAddOnUserService.java
  18. 0 74
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IFaultService.java
  19. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IMajorService.java
  20. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamCollectionDeptService.java
  21. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamCollectionService.java
  22. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamCompRequestService.java
  23. 0 62
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamFaultService.java
  24. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamService.java
  25. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/ISeatService.java
  26. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/ISimMsgService.java
  27. 0 61
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/ISimService.java
  28. 0 72
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/ITaskFaultService.java
  29. 0 74
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/ITaskService.java
  30. 1 14
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/AddOnDeptService.java
  31. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/AddOnUserService.java
  32. 2 11
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/FaultService.java
  33. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/MajorService.java
  34. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCollectionDeptService.java
  35. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCollectionService.java
  36. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCompRequestService.java
  37. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamFaultService.java
  38. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamService.java
  39. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SeatService.java
  40. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SimMsgService.java
  41. 1 8
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SimService.java
  42. 2 4
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/StudentService.java
  43. 1 13
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskFaultService.java
  44. 4 14
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskService.java
  45. 0 5
      ruoyi-sim/src/main/java/com/ruoyi/sim/service/my/MajorMyService.java

+ 0 - 11
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/AddOnDeptController.java

@@ -1,19 +1,8 @@
 package com.ruoyi.sim.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.sim.service.IAddOnDeptService;
-import com.ruoyi.system.service.ISysDeptService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 
 @RestController
 //@RequestMapping("/sim/add-on-dept")

+ 2 - 4
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/AddOnUserController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.AddOnUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,14 +12,11 @@ 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.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.AddOnUser;
-import com.ruoyi.sim.service.IAddOnUserService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 // @RequestMapping("/sim/add_on_user")
 public class AddOnUserController extends BaseController {
     @Autowired
-    private IAddOnUserService addOnUserService;
+    private AddOnUserService addOnUserService;
 
     /**
      * 查询用户附加列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/FaultController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.FaultService;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.Fault;
-import com.ruoyi.sim.service.IFaultService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/fault")
 public class FaultController extends BaseController {
     @Autowired
-    private IFaultService faultService;
+    private FaultService faultService;
 
     /**
      * 查询故障列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/MajorController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.MajorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,7 +22,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.Major;
-import com.ruoyi.sim.service.IMajorService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -36,7 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api("专业Controller")
 public class MajorController extends BaseController {
     @Autowired
-    private IMajorService majorService;
+    private MajorService majorService;
 
     /**
      * 查询专业列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamCollectionController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.RealExamCollectionService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.RealExamCollection;
-import com.ruoyi.sim.service.IRealExamCollectionService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/real-exam-collection")
 public class RealExamCollectionController extends BaseController {
     @Autowired
-    private IRealExamCollectionService realExamCollectionService;
+    private RealExamCollectionService realExamCollectionService;
 
     /**
      * 查询考试集合列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamCollectionDeptController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.RealExamCollectionDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.RealExamCollectionDept;
-import com.ruoyi.sim.service.IRealExamCollectionDeptService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/real-exam-collection-dept")
 public class RealExamCollectionDeptController extends BaseController {
     @Autowired
-    private IRealExamCollectionDeptService realExamCollectionDeptService;
+    private RealExamCollectionDeptService realExamCollectionDeptService;
 
     /**
      * 查询考试集合班级关联列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamCompRequestController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.RealExamCompRequestService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.RealExamCompRequest;
-import com.ruoyi.sim.service.IRealExamCompRequestService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/real-exam-comp-request")
 public class RealExamCompRequestController extends BaseController {
     @Autowired
-    private IRealExamCompRequestService realExamCompRequestService;
+    private RealExamCompRequestService realExamCompRequestService;
 
     /**
      * 查询考试更换件关联列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.RealExamService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.RealExam;
-import com.ruoyi.sim.service.IRealExamService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/real-exam")
 public class RealExamController extends BaseController {
     @Autowired
-    private IRealExamService realExamService;
+    private RealExamService realExamService;
 
     /**
      * 查询考试列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamFaultController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.RealExamFaultService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.RealExamFault;
-import com.ruoyi.sim.service.IRealExamFaultService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/real-exam-fault")
 public class RealExamFaultController extends BaseController {
     @Autowired
-    private IRealExamFaultService realExamFaultService;
+    private RealExamFaultService realExamFaultService;
 
     /**
      * 查询考试故障关联列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/SeatController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.SeatService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.Seat;
-import com.ruoyi.sim.service.ISeatService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/seat")
 public class SeatController extends BaseController {
     @Autowired
-    private ISeatService seatService;
+    private SeatService seatService;
 
     /**
      * 查询座列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/SimController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.SimService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.Sim;
-import com.ruoyi.sim.service.ISimService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/sim")
 public class SimController extends BaseController {
     @Autowired
-    private ISimService simService;
+    private SimService simService;
 
     /**
      * 查询模拟器列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/SimMsgController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.SimMsgService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.SimMsg;
-import com.ruoyi.sim.service.ISimMsgService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -33,7 +33,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/sim_msg")
 public class SimMsgController extends BaseController {
     @Autowired
-    private ISimMsgService simMsgService;
+    private SimMsgService simMsgService;
 
     /**
      * 查询模拟器报文列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TaskController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.sim.domain.vo.TaskVo;
+import com.ruoyi.sim.service.impl.TaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.Task;
-import com.ruoyi.sim.service.ITaskService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -35,7 +35,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api("任务Controller")
 public class TaskController extends BaseController {
     @Autowired
-    private ITaskService taskService;
+    private TaskService taskService;
 
     /**
      * 查询任务列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TaskFaultController.java

@@ -3,6 +3,7 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.sim.service.impl.TaskFaultService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.TaskFault;
-import com.ruoyi.sim.service.ITaskFaultService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/sim/task-fault")
 public class TaskFaultController extends BaseController {
     @Autowired
-    private ITaskFaultService taskFaultService;
+    private TaskFaultService taskFaultService;
 
     /**
      * 查询任务故障关联列表

+ 2 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TeacherController.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sim.domain.Clazz;
 import com.ruoyi.sim.domain.Major;
-import com.ruoyi.sim.service.IAddOnDeptService;
+import com.ruoyi.sim.service.impl.AddOnDeptService;
 import com.ruoyi.sim.service.impl.Consts;
 import com.ruoyi.sim.service.impl.TeacherService;
 import com.ruoyi.system.mapper.SysDeptMapper;
@@ -143,7 +143,7 @@ public class TeacherController extends BaseController {
     @Autowired
     private SysDeptMapper deptMapper;
     @Autowired
-    private IAddOnDeptService addOnDeptService;
+    private AddOnDeptService addOnDeptService;
 
     /**
      * 获取班级/部门列表

+ 0 - 67
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IAddOnDeptService.java

@@ -1,67 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.sim.domain.AddOnDept;
-import com.ruoyi.sim.domain.Clazz;
-import com.ruoyi.sim.domain.Major;
-
-/**
- * 部门附加Service接口
- *
- * @author tom
- * @date 2024-12-13
- */
-public interface IAddOnDeptService {
-    /**
-     * 查询部门附加
-     *
-     * @param deptId 部门附加主键
-     * @return 部门附加
-     */
-    public AddOnDept selectAddOnDeptByDeptId(Long deptId);
-
-    /**
-     * 查询部门附加列表
-     *
-     * @param addOnDept 部门附加
-     * @return 部门附加集合
-     */
-    public List<AddOnDept> selectAddOnDeptList(AddOnDept addOnDept);
-
-    /**
-     * 新增部门附加
-     *
-     * @param addOnDept 部门附加
-     * @return 结果
-     */
-    public int insertAddOnDept(AddOnDept addOnDept);
-
-    /**
-     * 修改部门附加
-     *
-     * @param addOnDept 部门附加
-     * @return 结果
-     */
-    public int updateAddOnDept(AddOnDept addOnDept);
-
-    /**
-     * 批量删除部门附加
-     *
-     * @param deptIds 需要删除的部门附加主键集合
-     * @return 结果
-     */
-    public int deleteAddOnDeptByDeptIds(Long[] deptIds);
-
-    /**
-     * 删除部门附加信息
-     *
-     * @param deptId 部门附加主键
-     * @return 结果
-     */
-    public int deleteAddOnDeptByDeptId(Long deptId);
-
-    // -------------------------------- tom add  --------------------------------
-    public Major selectMajorByDeptId(Long deptId);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IAddOnUserService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.AddOnUser;
-
-/**
- * 用户附加Service接口
- *
- * @author tom
- * @date 2024-12-15
- */
-public interface IAddOnUserService {
-    /**
-     * 查询用户附加
-     *
-     * @param userId 用户附加主键
-     * @return 用户附加
-     */
-    public AddOnUser selectAddOnUserByUserId(Long userId);
-
-    /**
-     * 查询用户附加列表
-     *
-     * @param addOnUser 用户附加
-     * @return 用户附加集合
-     */
-    public List<AddOnUser> selectAddOnUserList(AddOnUser addOnUser);
-
-    /**
-     * 新增用户附加
-     *
-     * @param addOnUser 用户附加
-     * @return 结果
-     */
-    public int insertAddOnUser(AddOnUser addOnUser);
-
-    /**
-     * 修改用户附加
-     *
-     * @param addOnUser 用户附加
-     * @return 结果
-     */
-    public int updateAddOnUser(AddOnUser addOnUser);
-
-    /**
-     * 批量删除用户附加
-     *
-     * @param userIds 需要删除的用户附加主键集合
-     * @return 结果
-     */
-    public int deleteAddOnUserByUserIds(Long[] userIds);
-
-    /**
-     * 删除用户附加信息
-     *
-     * @param userId 用户附加主键
-     * @return 结果
-     */
-    public int deleteAddOnUserByUserId(Long userId);
-}

+ 0 - 74
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IFaultService.java

@@ -1,74 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.sim.domain.Fault;
-
-/**
- * 故障Service接口
- *
- * @author tom
- * @date 2024-12-15
- */
-public interface IFaultService {
-    /**
-     * 查询故障
-     *
-     * @param faultId 故障主键
-     * @return 故障
-     */
-    public Fault selectFaultByFaultId(String faultId);
-
-    /**
-     * 查询故障列表
-     *
-     * @param fault 故障
-     * @return 故障集合
-     */
-    public List<Fault> selectFaultList(Fault fault);
-
-    /**
-     * 新增故障
-     *
-     * @param fault 故障
-     * @return 结果
-     */
-    public int insertFault(Fault fault);
-
-    /**
-     * 修改故障
-     *
-     * @param fault 故障
-     * @return 结果
-     */
-    public int updateFault(Fault fault);
-
-    /**
-     * 批量删除故障
-     *
-     * @param faultIds 需要删除的故障主键集合
-     * @return 结果
-     */
-    public int deleteFaultByFaultIds(String[] faultIds);
-
-    /**
-     * 删除故障信息
-     *
-     * @param faultId 故障主键
-     * @return 结果
-     */
-    public int deleteFaultByFaultId(String faultId);
-
-    // -------------------------------- tom add  --------------------------------
-
-    /**
-     * 查询故障列表tree
-     *
-     * @param fault 故障
-     * @return 故障集合
-     */
-    public AjaxResult selectAllTreeViaSimType(String simType);
-
-    public boolean checkSimTypeOk(String simType);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IMajorService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.Major;
-
-/**
- * 专业Service接口
- *
- * @author tom
- * @date 2024-12-11
- */
-public interface IMajorService {
-    /**
-     * 查询专业
-     *
-     * @param majorId 专业主键
-     * @return 专业
-     */
-    public Major selectMajorByMajorId(Long majorId);
-
-    /**
-     * 查询专业列表
-     *
-     * @param major 专业
-     * @return 专业集合
-     */
-    public List<Major> selectMajorList(Major major);
-
-    /**
-     * 新增专业
-     *
-     * @param major 专业
-     * @return 结果
-     */
-    public int insertMajor(Major major);
-
-    /**
-     * 修改专业
-     *
-     * @param major 专业
-     * @return 结果
-     */
-    public int updateMajor(Major major);
-
-    /**
-     * 批量删除专业
-     *
-     * @param majorIds 需要删除的专业主键集合
-     * @return 结果
-     */
-    public int deleteMajorByMajorIds(Long[] majorIds);
-
-    /**
-     * 删除专业信息
-     *
-     * @param majorId 专业主键
-     * @return 结果
-     */
-    public int deleteMajorByMajorId(Long majorId);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamCollectionDeptService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.RealExamCollectionDept;
-
-/**
- * 考试集合班级关联Service接口
- *
- * @author tom
- * @date 2024-12-13
- */
-public interface IRealExamCollectionDeptService {
-    /**
-     * 查询考试集合班级关联
-     *
-     * @param relId 考试集合班级关联主键
-     * @return 考试集合班级关联
-     */
-    public RealExamCollectionDept selectRealExamCollectionDeptByRelId(Long relId);
-
-    /**
-     * 查询考试集合班级关联列表
-     *
-     * @param realExamCollectionDept 考试集合班级关联
-     * @return 考试集合班级关联集合
-     */
-    public List<RealExamCollectionDept> selectRealExamCollectionDeptList(RealExamCollectionDept realExamCollectionDept);
-
-    /**
-     * 新增考试集合班级关联
-     *
-     * @param realExamCollectionDept 考试集合班级关联
-     * @return 结果
-     */
-    public int insertRealExamCollectionDept(RealExamCollectionDept realExamCollectionDept);
-
-    /**
-     * 修改考试集合班级关联
-     *
-     * @param realExamCollectionDept 考试集合班级关联
-     * @return 结果
-     */
-    public int updateRealExamCollectionDept(RealExamCollectionDept realExamCollectionDept);
-
-    /**
-     * 批量删除考试集合班级关联
-     *
-     * @param relIds 需要删除的考试集合班级关联主键集合
-     * @return 结果
-     */
-    public int deleteRealExamCollectionDeptByRelIds(Long[] relIds);
-
-    /**
-     * 删除考试集合班级关联信息
-     *
-     * @param relId 考试集合班级关联主键
-     * @return 结果
-     */
-    public int deleteRealExamCollectionDeptByRelId(Long relId);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamCollectionService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.RealExamCollection;
-
-/**
- * 考试集合Service接口
- *
- * @author tom
- * @date 2024-12-13
- */
-public interface IRealExamCollectionService {
-    /**
-     * 查询考试集合
-     *
-     * @param examCollectionId 考试集合主键
-     * @return 考试集合
-     */
-    public RealExamCollection selectRealExamCollectionByExamCollectionId(Long examCollectionId);
-
-    /**
-     * 查询考试集合列表
-     *
-     * @param realExamCollection 考试集合
-     * @return 考试集合集合
-     */
-    public List<RealExamCollection> selectRealExamCollectionList(RealExamCollection realExamCollection);
-
-    /**
-     * 新增考试集合
-     *
-     * @param realExamCollection 考试集合
-     * @return 结果
-     */
-    public int insertRealExamCollection(RealExamCollection realExamCollection);
-
-    /**
-     * 修改考试集合
-     *
-     * @param realExamCollection 考试集合
-     * @return 结果
-     */
-    public int updateRealExamCollection(RealExamCollection realExamCollection);
-
-    /**
-     * 批量删除考试集合
-     *
-     * @param examCollectionIds 需要删除的考试集合主键集合
-     * @return 结果
-     */
-    public int deleteRealExamCollectionByExamCollectionIds(Long[] examCollectionIds);
-
-    /**
-     * 删除考试集合信息
-     *
-     * @param examCollectionId 考试集合主键
-     * @return 结果
-     */
-    public int deleteRealExamCollectionByExamCollectionId(Long examCollectionId);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamCompRequestService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.RealExamCompRequest;
-
-/**
- * 考试更换件关联Service接口
- *
- * @author tom
- * @date 2024-12-15
- */
-public interface IRealExamCompRequestService {
-    /**
-     * 查询考试更换件关联
-     *
-     * @param relId 考试更换件关联主键
-     * @return 考试更换件关联
-     */
-    public RealExamCompRequest selectRealExamCompRequestByRelId(Long relId);
-
-    /**
-     * 查询考试更换件关联列表
-     *
-     * @param realExamCompRequest 考试更换件关联
-     * @return 考试更换件关联集合
-     */
-    public List<RealExamCompRequest> selectRealExamCompRequestList(RealExamCompRequest realExamCompRequest);
-
-    /**
-     * 新增考试更换件关联
-     *
-     * @param realExamCompRequest 考试更换件关联
-     * @return 结果
-     */
-    public int insertRealExamCompRequest(RealExamCompRequest realExamCompRequest);
-
-    /**
-     * 修改考试更换件关联
-     *
-     * @param realExamCompRequest 考试更换件关联
-     * @return 结果
-     */
-    public int updateRealExamCompRequest(RealExamCompRequest realExamCompRequest);
-
-    /**
-     * 批量删除考试更换件关联
-     *
-     * @param relIds 需要删除的考试更换件关联主键集合
-     * @return 结果
-     */
-    public int deleteRealExamCompRequestByRelIds(Long[] relIds);
-
-    /**
-     * 删除考试更换件关联信息
-     *
-     * @param relId 考试更换件关联主键
-     * @return 结果
-     */
-    public int deleteRealExamCompRequestByRelId(Long relId);
-}

+ 0 - 62
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamFaultService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.RealExamFault;
-
-/**
- * 考试故障关联Service接口
- *
- * @author tom
- * @date 2024-12-15
- */
-public interface IRealExamFaultService {
-    /**
-     * 查询考试故障关联
-     *
-     * @param refId 考试故障关联主键
-     * @return 考试故障关联
-     */
-    public RealExamFault selectRealExamFaultByRefId(Long refId);
-
-    /**
-     * 查询考试故障关联列表
-     *
-     * @param realExamFault 考试故障关联
-     * @return 考试故障关联集合
-     */
-    public List<RealExamFault> selectRealExamFaultList(RealExamFault realExamFault);
-
-    /**
-     * 新增考试故障关联
-     *
-     * @param realExamFault 考试故障关联
-     * @return 结果
-     */
-    public int insertRealExamFault(RealExamFault realExamFault);
-
-    /**
-     * 修改考试故障关联
-     *
-     * @param realExamFault 考试故障关联
-     * @return 结果
-     */
-    public int updateRealExamFault(RealExamFault realExamFault);
-
-    /**
-     * 批量删除考试故障关联
-     *
-     * @param refIds 需要删除的考试故障关联主键集合
-     * @return 结果
-     */
-    public int deleteRealExamFaultByRefIds(Long[] refIds);
-
-    /**
-     * 删除考试故障关联信息
-     *
-     * @param refId 考试故障关联主键
-     * @return 结果
-     */
-    public int deleteRealExamFaultByRefId(Long refId);
-}
-

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IRealExamService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.RealExam;
-
-/**
- * 考试Service接口
- *
- * @author tom
- * @date 2024-12-15
- */
-public interface IRealExamService {
-    /**
-     * 查询考试
-     *
-     * @param examId 考试主键
-     * @return 考试
-     */
-    public RealExam selectRealExamByExamId(Long examId);
-
-    /**
-     * 查询考试列表
-     *
-     * @param realExam 考试
-     * @return 考试集合
-     */
-    public List<RealExam> selectRealExamList(RealExam realExam);
-
-    /**
-     * 新增考试
-     *
-     * @param realExam 考试
-     * @return 结果
-     */
-    public int insertRealExam(RealExam realExam);
-
-    /**
-     * 修改考试
-     *
-     * @param realExam 考试
-     * @return 结果
-     */
-    public int updateRealExam(RealExam realExam);
-
-    /**
-     * 批量删除考试
-     *
-     * @param examIds 需要删除的考试主键集合
-     * @return 结果
-     */
-    public int deleteRealExamByExamIds(Long[] examIds);
-
-    /**
-     * 删除考试信息
-     *
-     * @param examId 考试主键
-     * @return 结果
-     */
-    public int deleteRealExamByExamId(Long examId);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/ISeatService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.Seat;
-
-/**
- * 座Service接口
- *
- * @author tom
- * @date 2024-12-13
- */
-public interface ISeatService {
-    /**
-     * 查询座
-     *
-     * @param seatId 座主键
-     * @return 座
-     */
-    public Seat selectSeatBySeatId(Long seatId);
-
-    /**
-     * 查询座列表
-     *
-     * @param seat 座
-     * @return 座集合
-     */
-    public List<Seat> selectSeatList(Seat seat);
-
-    /**
-     * 新增座
-     *
-     * @param seat 座
-     * @return 结果
-     */
-    public int insertSeat(Seat seat);
-
-    /**
-     * 修改座
-     *
-     * @param seat 座
-     * @return 结果
-     */
-    public int updateSeat(Seat seat);
-
-    /**
-     * 批量删除座
-     *
-     * @param seatIds 需要删除的座主键集合
-     * @return 结果
-     */
-    public int deleteSeatBySeatIds(Long[] seatIds);
-
-    /**
-     * 删除座信息
-     *
-     * @param seatId 座主键
-     * @return 结果
-     */
-    public int deleteSeatBySeatId(Long seatId);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/ISimMsgService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.SimMsg;
-
-/**
- * 模拟器报文Service接口
- *
- * @author tom
- * @date 2024-12-11
- */
-public interface ISimMsgService {
-    /**
-     * 查询模拟器报文
-     *
-     * @param simMsgId 模拟器报文主键
-     * @return 模拟器报文
-     */
-    public SimMsg selectSimMsgBySimMsgId(Long simMsgId);
-
-    /**
-     * 查询模拟器报文列表
-     *
-     * @param simMsg 模拟器报文
-     * @return 模拟器报文集合
-     */
-    public List<SimMsg> selectSimMsgList(SimMsg simMsg);
-
-    /**
-     * 新增模拟器报文
-     *
-     * @param simMsg 模拟器报文
-     * @return 结果
-     */
-    public int insertSimMsg(SimMsg simMsg);
-
-    /**
-     * 修改模拟器报文
-     *
-     * @param simMsg 模拟器报文
-     * @return 结果
-     */
-    public int updateSimMsg(SimMsg simMsg);
-
-    /**
-     * 批量删除模拟器报文
-     *
-     * @param simMsgIds 需要删除的模拟器报文主键集合
-     * @return 结果
-     */
-    public int deleteSimMsgBySimMsgIds(Long[] simMsgIds);
-
-    /**
-     * 删除模拟器报文信息
-     *
-     * @param simMsgId 模拟器报文主键
-     * @return 结果
-     */
-    public int deleteSimMsgBySimMsgId(Long simMsgId);
-}

+ 0 - 61
ruoyi-sim/src/main/java/com/ruoyi/sim/service/ISimService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.Sim;
-
-/**
- * 模拟器Service接口
- *
- * @author tom
- * @date 2024-12-13
- */
-public interface ISimService {
-    /**
-     * 查询模拟器
-     *
-     * @param simId 模拟器主键
-     * @return 模拟器
-     */
-    public Sim selectSimBySimId(Long simId);
-
-    /**
-     * 查询模拟器列表
-     *
-     * @param sim 模拟器
-     * @return 模拟器集合
-     */
-    public List<Sim> selectSimList(Sim sim);
-
-    /**
-     * 新增模拟器
-     *
-     * @param sim 模拟器
-     * @return 结果
-     */
-    public int insertSim(Sim sim);
-
-    /**
-     * 修改模拟器
-     *
-     * @param sim 模拟器
-     * @return 结果
-     */
-    public int updateSim(Sim sim);
-
-    /**
-     * 批量删除模拟器
-     *
-     * @param simIds 需要删除的模拟器主键集合
-     * @return 结果
-     */
-    public int deleteSimBySimIds(Long[] simIds);
-
-    /**
-     * 删除模拟器信息
-     *
-     * @param simId 模拟器主键
-     * @return 结果
-     */
-    public int deleteSimBySimId(Long simId);
-}

+ 0 - 72
ruoyi-sim/src/main/java/com/ruoyi/sim/service/ITaskFaultService.java

@@ -1,72 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.TaskFault;
-
-/**
- * 任务故障关联Service接口
- *
- * @author tom
- * @date 2024-12-13
- */
-public interface ITaskFaultService {
-    /**
-     * 查询任务故障关联
-     *
-     * @param relId 任务故障关联主键
-     * @return 任务故障关联
-     */
-    public TaskFault selectTaskFaultByRelId(Long relId);
-
-    /**
-     * 查询任务故障关联列表
-     *
-     * @param taskFault 任务故障关联
-     * @return 任务故障关联集合
-     */
-    public List<TaskFault> selectTaskFaultList(TaskFault taskFault);
-
-    /**
-     * 新增任务故障关联
-     *
-     * @param taskFault 任务故障关联
-     * @return 结果
-     */
-    public int insertTaskFault(TaskFault taskFault);
-
-    /**
-     * 修改任务故障关联
-     *
-     * @param taskFault 任务故障关联
-     * @return 结果
-     */
-    public int updateTaskFault(TaskFault taskFault);
-
-    /**
-     * 批量删除任务故障关联
-     *
-     * @param relIds 需要删除的任务故障关联主键集合
-     * @return 结果
-     */
-    public int deleteTaskFaultByRelIds(Long[] relIds);
-
-    /**
-     * 删除任务故障关联信息
-     *
-     * @param relId 任务故障关联主键
-     * @return 结果
-     */
-    public int deleteTaskFaultByRelId(Long relId);
-
-    // -------------------------------- tom add  --------------------------------
-    public TaskFault selectUniqueTaskFault(Long taskId, String faultId);
-
-    public int insertTaskFault(Long taskId, String faultId, String flag);
-
-    public int updateTaskFault(Long relId, Long taskId, String faultId, String flag);
-
-    public int insertOrUpdateTaskFault(TaskFault taskFault);
-
-    public int deleteTaskFaultByTaskId(Long taskId);
-}

+ 0 - 74
ruoyi-sim/src/main/java/com/ruoyi/sim/service/ITaskService.java

@@ -1,74 +0,0 @@
-package com.ruoyi.sim.service;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.sim.domain.Task;
-import com.ruoyi.sim.domain.vo.TaskVo;
-
-/**
- * 任务Service接口
- *
- * @author tom
- * @date 2024-12-13
- */
-public interface ITaskService {
-    /**
-     * 查询任务
-     *
-     * @param taskId 任务主键
-     * @return 任务
-     */
-    public Task selectTaskByTaskId(Long taskId);
-
-    /**
-     * 查询任务列表
-     *
-     * @param task 任务
-     * @return 任务集合
-     */
-    public List<Task> selectTaskList(Task task);
-
-    /**
-     * 新增任务
-     *
-     * @param task 任务
-     * @return 结果
-     */
-    public AjaxResult insertTask(TaskVo task);
-
-    /**
-     * 修改任务
-     *
-     * @param task 任务
-     * @return 结果
-     */
-    public int updateTask(Task task);
-
-    /**
-     * 批量删除任务
-     *
-     * @param taskIds 需要删除的任务主键集合
-     * @return 结果
-     */
-    public int deleteTaskByTaskIds(Long[] taskIds);
-
-    /**
-     * 删除任务信息
-     *
-     * @param taskId 任务主键
-     * @return 结果
-     */
-    public int deleteTaskByTaskId(Long taskId);
-
-    // -------------------------------- tom add  --------------------------------
-    public AjaxResult getInfoForAdd(String simType);
-
-    /**
-     * 新增任务附带选择故障
-     *
-     * @param task 任务
-     * @return 结果
-     */
-    public int insertTaskWithFault(Task task);
-}

+ 1 - 14
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/AddOnDeptServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/AddOnDeptService.java

@@ -1,20 +1,13 @@
 package com.ruoyi.sim.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.sim.domain.Clazz;
 import com.ruoyi.sim.domain.Major;
 import com.ruoyi.sim.mapper.MajorMapper;
-import com.ruoyi.sim.service.IMajorService;
-import com.ruoyi.system.mapper.SysDeptMapper;
-import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.AddOnDeptMapper;
 import com.ruoyi.sim.domain.AddOnDept;
-import com.ruoyi.sim.service.IAddOnDeptService;
 
 /**
  * 部门附加Service业务层处理
@@ -23,7 +16,7 @@ import com.ruoyi.sim.service.IAddOnDeptService;
  * @date 2024-12-13
  */
 @Service
-public class AddOnDeptServiceImpl implements IAddOnDeptService {
+public class AddOnDeptService  {
     @Autowired
     private AddOnDeptMapper addOnDeptMapper;
 
@@ -33,7 +26,6 @@ public class AddOnDeptServiceImpl implements IAddOnDeptService {
      * @param deptId 部门附加主键
      * @return 部门附加
      */
-    @Override
     public AddOnDept selectAddOnDeptByDeptId(Long deptId) {
         return addOnDeptMapper.selectAddOnDeptByDeptId(deptId);
     }
@@ -44,7 +36,6 @@ public class AddOnDeptServiceImpl implements IAddOnDeptService {
      * @param addOnDept 部门附加
      * @return 部门附加
      */
-    @Override
     public List<AddOnDept> selectAddOnDeptList(AddOnDept addOnDept) {
         return addOnDeptMapper.selectAddOnDeptList(addOnDept);
     }
@@ -55,7 +46,6 @@ public class AddOnDeptServiceImpl implements IAddOnDeptService {
      * @param addOnDept 部门附加
      * @return 结果
      */
-    @Override
     public int insertAddOnDept(AddOnDept addOnDept) {
         return addOnDeptMapper.insertAddOnDept(addOnDept);
     }
@@ -66,7 +56,6 @@ public class AddOnDeptServiceImpl implements IAddOnDeptService {
      * @param addOnDept 部门附加
      * @return 结果
      */
-    @Override
     public int updateAddOnDept(AddOnDept addOnDept) {
         return addOnDeptMapper.updateAddOnDept(addOnDept);
     }
@@ -77,7 +66,6 @@ public class AddOnDeptServiceImpl implements IAddOnDeptService {
      * @param deptIds 需要删除的部门附加主键
      * @return 结果
      */
-    @Override
     public int deleteAddOnDeptByDeptIds(Long[] deptIds) {
         return addOnDeptMapper.deleteAddOnDeptByDeptIds(deptIds);
     }
@@ -88,7 +76,6 @@ public class AddOnDeptServiceImpl implements IAddOnDeptService {
      * @param deptId 部门附加主键
      * @return 结果
      */
-    @Override
     public int deleteAddOnDeptByDeptId(Long deptId) {
         return addOnDeptMapper.deleteAddOnDeptByDeptId(deptId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/AddOnUserServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/AddOnUserService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.AddOnUserMapper;
 import com.ruoyi.sim.domain.AddOnUser;
-import com.ruoyi.sim.service.IAddOnUserService;
 
 /**
  * 用户附加Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.IAddOnUserService;
  * @date 2024-12-15
  */
 @Service
-public class AddOnUserServiceImpl implements IAddOnUserService {
+public class AddOnUserService   {
     @Autowired
     private AddOnUserMapper addOnUserMapper;
 
@@ -26,7 +25,6 @@ public class AddOnUserServiceImpl implements IAddOnUserService {
      * @param userId 用户附加主键
      * @return 用户附加
      */
-    @Override
     public AddOnUser selectAddOnUserByUserId(Long userId) {
         return addOnUserMapper.selectAddOnUserByUserId(userId);
     }
@@ -37,7 +35,6 @@ public class AddOnUserServiceImpl implements IAddOnUserService {
      * @param addOnUser 用户附加
      * @return 用户附加
      */
-    @Override
     public List<AddOnUser> selectAddOnUserList(AddOnUser addOnUser) {
         return addOnUserMapper.selectAddOnUserList(addOnUser);
     }
@@ -48,7 +45,6 @@ public class AddOnUserServiceImpl implements IAddOnUserService {
      * @param addOnUser 用户附加
      * @return 结果
      */
-    @Override
     public int insertAddOnUser(AddOnUser addOnUser) {
         addOnUser.setCreateTime(DateUtils.getNowDate());
         return addOnUserMapper.insertAddOnUser(addOnUser);
@@ -60,7 +56,6 @@ public class AddOnUserServiceImpl implements IAddOnUserService {
      * @param addOnUser 用户附加
      * @return 结果
      */
-    @Override
     public int updateAddOnUser(AddOnUser addOnUser) {
         addOnUser.setUpdateTime(DateUtils.getNowDate());
         return addOnUserMapper.updateAddOnUser(addOnUser);
@@ -72,7 +67,6 @@ public class AddOnUserServiceImpl implements IAddOnUserService {
      * @param userIds 需要删除的用户附加主键
      * @return 结果
      */
-    @Override
     public int deleteAddOnUserByUserIds(Long[] userIds) {
         return addOnUserMapper.deleteAddOnUserByUserIds(userIds);
     }
@@ -83,7 +77,6 @@ public class AddOnUserServiceImpl implements IAddOnUserService {
      * @param userId 用户附加主键
      * @return 结果
      */
-    @Override
     public int deleteAddOnUserByUserId(Long userId) {
         return addOnUserMapper.deleteAddOnUserByUserId(userId);
     }

+ 2 - 11
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/FaultServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/FaultService.java

@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.FaultMapper;
 import com.ruoyi.sim.domain.Fault;
-import com.ruoyi.sim.service.IFaultService;
 
 /**
  * 故障Service业务层处理
@@ -24,7 +23,7 @@ import com.ruoyi.sim.service.IFaultService;
  * @date 2024-12-15
  */
 @Service
-public class FaultServiceImpl implements IFaultService {
+public class FaultService {
     @Autowired
     private FaultMapper faultMapper;
 
@@ -34,7 +33,6 @@ public class FaultServiceImpl implements IFaultService {
      * @param faultId 故障主键
      * @return 故障
      */
-    @Override
     public Fault selectFaultByFaultId(String faultId) {
         return faultMapper.selectFaultByFaultId(faultId);
     }
@@ -45,7 +43,6 @@ public class FaultServiceImpl implements IFaultService {
      * @param fault 故障
      * @return 故障
      */
-    @Override
     public List<Fault> selectFaultList(Fault fault) {
         return faultMapper.selectFaultList(fault);
     }
@@ -56,7 +53,6 @@ public class FaultServiceImpl implements IFaultService {
      * @param fault 故障
      * @return 结果
      */
-    @Override
     public int insertFault(Fault fault) {
         fault.setCreateTime(DateUtils.getNowDate());
         return faultMapper.insertFault(fault);
@@ -68,7 +64,6 @@ public class FaultServiceImpl implements IFaultService {
      * @param fault 故障
      * @return 结果
      */
-    @Override
     public int updateFault(Fault fault) {
         fault.setUpdateTime(DateUtils.getNowDate());
         return faultMapper.updateFault(fault);
@@ -80,7 +75,6 @@ public class FaultServiceImpl implements IFaultService {
      * @param faultIds 需要删除的故障主键
      * @return 结果
      */
-    @Override
     public int deleteFaultByFaultIds(String[] faultIds) {
         return faultMapper.deleteFaultByFaultIds(faultIds);
     }
@@ -91,21 +85,19 @@ public class FaultServiceImpl implements IFaultService {
      * @param faultId 故障主键
      * @return 结果
      */
-    @Override
     public int deleteFaultByFaultId(String faultId) {
         return faultMapper.deleteFaultByFaultId(faultId);
     }
 
     // -------------------------------- tom add  --------------------------------
 
-    private static final Logger log = LoggerFactory.getLogger(FaultServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(FaultService.class);
 
     /**
      * 查询故障列表tree
      *
      * @return 故障
      */
-    @Override
     public AjaxResult selectAllTreeViaSimType(String simType) {
         // check
         if (StringUtils.isEmpty(simType)) {
@@ -153,7 +145,6 @@ public class FaultServiceImpl implements IFaultService {
      * @param simType
      * @return
      */
-    @Override
     public boolean checkSimTypeOk(String simType) {
         return SIM_TYPE_SET.contains(simType);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/MajorServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/MajorService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.MajorMapper;
 import com.ruoyi.sim.domain.Major;
-import com.ruoyi.sim.service.IMajorService;
 
 /**
  * 专业Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.IMajorService;
  * @date 2024-12-11
  */
 @Service
-public class MajorServiceImpl implements IMajorService {
+public class MajorService {
     @Autowired
     private MajorMapper majorMapper;
 
@@ -26,7 +25,6 @@ public class MajorServiceImpl implements IMajorService {
      * @param majorId 专业主键
      * @return 专业
      */
-    @Override
     public Major selectMajorByMajorId(Long majorId) {
         return majorMapper.selectMajorByMajorId(majorId);
     }
@@ -37,7 +35,6 @@ public class MajorServiceImpl implements IMajorService {
      * @param major 专业
      * @return 专业
      */
-    @Override
     public List<Major> selectMajorList(Major major) {
         return majorMapper.selectMajorList(major);
     }
@@ -48,7 +45,6 @@ public class MajorServiceImpl implements IMajorService {
      * @param major 专业
      * @return 结果
      */
-    @Override
     public int insertMajor(Major major) {
         major.setCreateTime(DateUtils.getNowDate());
         return majorMapper.insertMajor(major);
@@ -60,7 +56,6 @@ public class MajorServiceImpl implements IMajorService {
      * @param major 专业
      * @return 结果
      */
-    @Override
     public int updateMajor(Major major) {
         major.setUpdateTime(DateUtils.getNowDate());
         return majorMapper.updateMajor(major);
@@ -72,7 +67,6 @@ public class MajorServiceImpl implements IMajorService {
      * @param majorIds 需要删除的专业主键
      * @return 结果
      */
-    @Override
     public int deleteMajorByMajorIds(Long[] majorIds) {
         return majorMapper.deleteMajorByMajorIds(majorIds);
     }
@@ -83,7 +77,6 @@ public class MajorServiceImpl implements IMajorService {
      * @param majorId 专业主键
      * @return 结果
      */
-    @Override
     public int deleteMajorByMajorId(Long majorId) {
         return majorMapper.deleteMajorByMajorId(majorId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCollectionDeptServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCollectionDeptService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.RealExamCollectionDeptMapper;
 import com.ruoyi.sim.domain.RealExamCollectionDept;
-import com.ruoyi.sim.service.IRealExamCollectionDeptService;
 
 /**
  * 考试集合班级关联Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.IRealExamCollectionDeptService;
  * @date 2024-12-13
  */
 @Service
-public class RealExamCollectionDeptServiceImpl implements IRealExamCollectionDeptService {
+public class RealExamCollectionDeptService {
     @Autowired
     private RealExamCollectionDeptMapper realExamCollectionDeptMapper;
 
@@ -26,7 +25,6 @@ public class RealExamCollectionDeptServiceImpl implements IRealExamCollectionDep
      * @param relId 考试集合班级关联主键
      * @return 考试集合班级关联
      */
-    @Override
     public RealExamCollectionDept selectRealExamCollectionDeptByRelId(Long relId) {
         return realExamCollectionDeptMapper.selectRealExamCollectionDeptByRelId(relId);
     }
@@ -37,7 +35,6 @@ public class RealExamCollectionDeptServiceImpl implements IRealExamCollectionDep
      * @param realExamCollectionDept 考试集合班级关联
      * @return 考试集合班级关联
      */
-    @Override
     public List<RealExamCollectionDept> selectRealExamCollectionDeptList(RealExamCollectionDept realExamCollectionDept) {
         return realExamCollectionDeptMapper.selectRealExamCollectionDeptList(realExamCollectionDept);
     }
@@ -48,7 +45,6 @@ public class RealExamCollectionDeptServiceImpl implements IRealExamCollectionDep
      * @param realExamCollectionDept 考试集合班级关联
      * @return 结果
      */
-    @Override
     public int insertRealExamCollectionDept(RealExamCollectionDept realExamCollectionDept) {
         return realExamCollectionDeptMapper.insertRealExamCollectionDept(realExamCollectionDept);
     }
@@ -59,7 +55,6 @@ public class RealExamCollectionDeptServiceImpl implements IRealExamCollectionDep
      * @param realExamCollectionDept 考试集合班级关联
      * @return 结果
      */
-    @Override
     public int updateRealExamCollectionDept(RealExamCollectionDept realExamCollectionDept) {
         realExamCollectionDept.setUpdateTime(DateUtils.getNowDate());
         return realExamCollectionDeptMapper.updateRealExamCollectionDept(realExamCollectionDept);
@@ -71,7 +66,6 @@ public class RealExamCollectionDeptServiceImpl implements IRealExamCollectionDep
      * @param relIds 需要删除的考试集合班级关联主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamCollectionDeptByRelIds(Long[] relIds) {
         return realExamCollectionDeptMapper.deleteRealExamCollectionDeptByRelIds(relIds);
     }
@@ -82,7 +76,6 @@ public class RealExamCollectionDeptServiceImpl implements IRealExamCollectionDep
      * @param relId 考试集合班级关联主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamCollectionDeptByRelId(Long relId) {
         return realExamCollectionDeptMapper.deleteRealExamCollectionDeptByRelId(relId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCollectionServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCollectionService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.RealExamCollectionMapper;
 import com.ruoyi.sim.domain.RealExamCollection;
-import com.ruoyi.sim.service.IRealExamCollectionService;
 
 /**
  * 考试集合Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.IRealExamCollectionService;
  * @date 2024-12-13
  */
 @Service
-public class RealExamCollectionServiceImpl implements IRealExamCollectionService {
+public class RealExamCollectionService {
     @Autowired
     private RealExamCollectionMapper realExamCollectionMapper;
 
@@ -26,7 +25,6 @@ public class RealExamCollectionServiceImpl implements IRealExamCollectionService
      * @param examCollectionId 考试集合主键
      * @return 考试集合
      */
-    @Override
     public RealExamCollection selectRealExamCollectionByExamCollectionId(Long examCollectionId) {
         return realExamCollectionMapper.selectRealExamCollectionByExamCollectionId(examCollectionId);
     }
@@ -37,7 +35,6 @@ public class RealExamCollectionServiceImpl implements IRealExamCollectionService
      * @param realExamCollection 考试集合
      * @return 考试集合
      */
-    @Override
     public List<RealExamCollection> selectRealExamCollectionList(RealExamCollection realExamCollection) {
         return realExamCollectionMapper.selectRealExamCollectionList(realExamCollection);
     }
@@ -48,7 +45,6 @@ public class RealExamCollectionServiceImpl implements IRealExamCollectionService
      * @param realExamCollection 考试集合
      * @return 结果
      */
-    @Override
     public int insertRealExamCollection(RealExamCollection realExamCollection) {
         realExamCollection.setCreateTime(DateUtils.getNowDate());
         return realExamCollectionMapper.insertRealExamCollection(realExamCollection);
@@ -60,7 +56,6 @@ public class RealExamCollectionServiceImpl implements IRealExamCollectionService
      * @param realExamCollection 考试集合
      * @return 结果
      */
-    @Override
     public int updateRealExamCollection(RealExamCollection realExamCollection) {
         realExamCollection.setUpdateTime(DateUtils.getNowDate());
         return realExamCollectionMapper.updateRealExamCollection(realExamCollection);
@@ -72,7 +67,6 @@ public class RealExamCollectionServiceImpl implements IRealExamCollectionService
      * @param examCollectionIds 需要删除的考试集合主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamCollectionByExamCollectionIds(Long[] examCollectionIds) {
         return realExamCollectionMapper.deleteRealExamCollectionByExamCollectionIds(examCollectionIds);
     }
@@ -83,7 +77,6 @@ public class RealExamCollectionServiceImpl implements IRealExamCollectionService
      * @param examCollectionId 考试集合主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamCollectionByExamCollectionId(Long examCollectionId) {
         return realExamCollectionMapper.deleteRealExamCollectionByExamCollectionId(examCollectionId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCompRequestServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCompRequestService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.RealExamCompRequestMapper;
 import com.ruoyi.sim.domain.RealExamCompRequest;
-import com.ruoyi.sim.service.IRealExamCompRequestService;
 
 /**
  * 考试更换件关联Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.IRealExamCompRequestService;
  * @date 2024-12-15
  */
 @Service
-public class RealExamCompRequestServiceImpl implements IRealExamCompRequestService {
+public class RealExamCompRequestService {
     @Autowired
     private RealExamCompRequestMapper realExamCompRequestMapper;
 
@@ -26,7 +25,6 @@ public class RealExamCompRequestServiceImpl implements IRealExamCompRequestServi
      * @param relId 考试更换件关联主键
      * @return 考试更换件关联
      */
-    @Override
     public RealExamCompRequest selectRealExamCompRequestByRelId(Long relId) {
         return realExamCompRequestMapper.selectRealExamCompRequestByRelId(relId);
     }
@@ -37,7 +35,6 @@ public class RealExamCompRequestServiceImpl implements IRealExamCompRequestServi
      * @param realExamCompRequest 考试更换件关联
      * @return 考试更换件关联
      */
-    @Override
     public List<RealExamCompRequest> selectRealExamCompRequestList(RealExamCompRequest realExamCompRequest) {
         return realExamCompRequestMapper.selectRealExamCompRequestList(realExamCompRequest);
     }
@@ -48,7 +45,6 @@ public class RealExamCompRequestServiceImpl implements IRealExamCompRequestServi
      * @param realExamCompRequest 考试更换件关联
      * @return 结果
      */
-    @Override
     public int insertRealExamCompRequest(RealExamCompRequest realExamCompRequest) {
         realExamCompRequest.setCreateTime(DateUtils.getNowDate());
         return realExamCompRequestMapper.insertRealExamCompRequest(realExamCompRequest);
@@ -60,7 +56,6 @@ public class RealExamCompRequestServiceImpl implements IRealExamCompRequestServi
      * @param realExamCompRequest 考试更换件关联
      * @return 结果
      */
-    @Override
     public int updateRealExamCompRequest(RealExamCompRequest realExamCompRequest) {
         realExamCompRequest.setUpdateTime(DateUtils.getNowDate());
         return realExamCompRequestMapper.updateRealExamCompRequest(realExamCompRequest);
@@ -72,7 +67,6 @@ public class RealExamCompRequestServiceImpl implements IRealExamCompRequestServi
      * @param relIds 需要删除的考试更换件关联主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamCompRequestByRelIds(Long[] relIds) {
         return realExamCompRequestMapper.deleteRealExamCompRequestByRelIds(relIds);
     }
@@ -83,7 +77,6 @@ public class RealExamCompRequestServiceImpl implements IRealExamCompRequestServi
      * @param relId 考试更换件关联主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamCompRequestByRelId(Long relId) {
         return realExamCompRequestMapper.deleteRealExamCompRequestByRelId(relId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamFaultServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamFaultService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.RealExamFaultMapper;
 import com.ruoyi.sim.domain.RealExamFault;
-import com.ruoyi.sim.service.IRealExamFaultService;
 
 /**
  * 考试故障关联Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.IRealExamFaultService;
  * @date 2024-12-15
  */
 @Service
-public class RealExamFaultServiceImpl implements IRealExamFaultService {
+public class RealExamFaultService {
     @Autowired
     private RealExamFaultMapper realExamFaultMapper;
 
@@ -26,7 +25,6 @@ public class RealExamFaultServiceImpl implements IRealExamFaultService {
      * @param refId 考试故障关联主键
      * @return 考试故障关联
      */
-    @Override
     public RealExamFault selectRealExamFaultByRefId(Long refId) {
         return realExamFaultMapper.selectRealExamFaultByRefId(refId);
     }
@@ -37,7 +35,6 @@ public class RealExamFaultServiceImpl implements IRealExamFaultService {
      * @param realExamFault 考试故障关联
      * @return 考试故障关联
      */
-    @Override
     public List<RealExamFault> selectRealExamFaultList(RealExamFault realExamFault) {
         return realExamFaultMapper.selectRealExamFaultList(realExamFault);
     }
@@ -48,7 +45,6 @@ public class RealExamFaultServiceImpl implements IRealExamFaultService {
      * @param realExamFault 考试故障关联
      * @return 结果
      */
-    @Override
     public int insertRealExamFault(RealExamFault realExamFault) {
         realExamFault.setCreateTime(DateUtils.getNowDate());
         return realExamFaultMapper.insertRealExamFault(realExamFault);
@@ -60,7 +56,6 @@ public class RealExamFaultServiceImpl implements IRealExamFaultService {
      * @param realExamFault 考试故障关联
      * @return 结果
      */
-    @Override
     public int updateRealExamFault(RealExamFault realExamFault) {
         realExamFault.setUpdateTime(DateUtils.getNowDate());
         return realExamFaultMapper.updateRealExamFault(realExamFault);
@@ -72,7 +67,6 @@ public class RealExamFaultServiceImpl implements IRealExamFaultService {
      * @param refIds 需要删除的考试故障关联主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamFaultByRefIds(Long[] refIds) {
         return realExamFaultMapper.deleteRealExamFaultByRefIds(refIds);
     }
@@ -83,7 +77,6 @@ public class RealExamFaultServiceImpl implements IRealExamFaultService {
      * @param refId 考试故障关联主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamFaultByRefId(Long refId) {
         return realExamFaultMapper.deleteRealExamFaultByRefId(refId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.RealExamMapper;
 import com.ruoyi.sim.domain.RealExam;
-import com.ruoyi.sim.service.IRealExamService;
 
 /**
  * 考试Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.IRealExamService;
  * @date 2024-12-15
  */
 @Service
-public class RealExamServiceImpl implements IRealExamService {
+public class RealExamService {
     @Autowired
     private RealExamMapper realExamMapper;
 
@@ -26,7 +25,6 @@ public class RealExamServiceImpl implements IRealExamService {
      * @param examId 考试主键
      * @return 考试
      */
-    @Override
     public RealExam selectRealExamByExamId(Long examId) {
         return realExamMapper.selectRealExamByExamId(examId);
     }
@@ -37,7 +35,6 @@ public class RealExamServiceImpl implements IRealExamService {
      * @param realExam 考试
      * @return 考试
      */
-    @Override
     public List<RealExam> selectRealExamList(RealExam realExam) {
         return realExamMapper.selectRealExamList(realExam);
     }
@@ -48,7 +45,6 @@ public class RealExamServiceImpl implements IRealExamService {
      * @param realExam 考试
      * @return 结果
      */
-    @Override
     public int insertRealExam(RealExam realExam) {
         realExam.setCreateTime(DateUtils.getNowDate());
         return realExamMapper.insertRealExam(realExam);
@@ -60,7 +56,6 @@ public class RealExamServiceImpl implements IRealExamService {
      * @param realExam 考试
      * @return 结果
      */
-    @Override
     public int updateRealExam(RealExam realExam) {
         realExam.setUpdateTime(DateUtils.getNowDate());
         return realExamMapper.updateRealExam(realExam);
@@ -72,7 +67,6 @@ public class RealExamServiceImpl implements IRealExamService {
      * @param examIds 需要删除的考试主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamByExamIds(Long[] examIds) {
         return realExamMapper.deleteRealExamByExamIds(examIds);
     }
@@ -83,7 +77,6 @@ public class RealExamServiceImpl implements IRealExamService {
      * @param examId 考试主键
      * @return 结果
      */
-    @Override
     public int deleteRealExamByExamId(Long examId) {
         return realExamMapper.deleteRealExamByExamId(examId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SeatServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SeatService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.SeatMapper;
 import com.ruoyi.sim.domain.Seat;
-import com.ruoyi.sim.service.ISeatService;
 
 /**
  * 座Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.ISeatService;
  * @date 2024-12-13
  */
 @Service
-public class SeatServiceImpl implements ISeatService {
+public class SeatService {
     @Autowired
     private SeatMapper seatMapper;
 
@@ -26,7 +25,6 @@ public class SeatServiceImpl implements ISeatService {
      * @param seatId 座主键
      * @return 座
      */
-    @Override
     public Seat selectSeatBySeatId(Long seatId) {
         return seatMapper.selectSeatBySeatId(seatId);
     }
@@ -37,7 +35,6 @@ public class SeatServiceImpl implements ISeatService {
      * @param seat 座
      * @return 座
      */
-    @Override
     public List<Seat> selectSeatList(Seat seat) {
         return seatMapper.selectSeatList(seat);
     }
@@ -48,7 +45,6 @@ public class SeatServiceImpl implements ISeatService {
      * @param seat 座
      * @return 结果
      */
-    @Override
     public int insertSeat(Seat seat) {
         seat.setCreateTime(DateUtils.getNowDate());
         return seatMapper.insertSeat(seat);
@@ -60,7 +56,6 @@ public class SeatServiceImpl implements ISeatService {
      * @param seat 座
      * @return 结果
      */
-    @Override
     public int updateSeat(Seat seat) {
         seat.setUpdateTime(DateUtils.getNowDate());
         return seatMapper.updateSeat(seat);
@@ -72,7 +67,6 @@ public class SeatServiceImpl implements ISeatService {
      * @param seatIds 需要删除的座主键
      * @return 结果
      */
-    @Override
     public int deleteSeatBySeatIds(Long[] seatIds) {
         return seatMapper.deleteSeatBySeatIds(seatIds);
     }
@@ -83,7 +77,6 @@ public class SeatServiceImpl implements ISeatService {
      * @param seatId 座主键
      * @return 结果
      */
-    @Override
     public int deleteSeatBySeatId(Long seatId) {
         return seatMapper.deleteSeatBySeatId(seatId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SimMsgServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SimMsgService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.SimMsgMapper;
 import com.ruoyi.sim.domain.SimMsg;
-import com.ruoyi.sim.service.ISimMsgService;
 
 /**
  * 模拟器报文Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.ISimMsgService;
  * @date 2024-12-11
  */
 @Service
-public class SimMsgServiceImpl implements ISimMsgService {
+public class SimMsgService {
     @Autowired
     private SimMsgMapper simMsgMapper;
 
@@ -26,7 +25,6 @@ public class SimMsgServiceImpl implements ISimMsgService {
      * @param simMsgId 模拟器报文主键
      * @return 模拟器报文
      */
-    @Override
     public SimMsg selectSimMsgBySimMsgId(Long simMsgId) {
         return simMsgMapper.selectSimMsgBySimMsgId(simMsgId);
     }
@@ -37,7 +35,6 @@ public class SimMsgServiceImpl implements ISimMsgService {
      * @param simMsg 模拟器报文
      * @return 模拟器报文
      */
-    @Override
     public List<SimMsg> selectSimMsgList(SimMsg simMsg) {
         return simMsgMapper.selectSimMsgList(simMsg);
     }
@@ -48,7 +45,6 @@ public class SimMsgServiceImpl implements ISimMsgService {
      * @param simMsg 模拟器报文
      * @return 结果
      */
-    @Override
     public int insertSimMsg(SimMsg simMsg) {
         simMsg.setCreateTime(DateUtils.getNowDate());
         return simMsgMapper.insertSimMsg(simMsg);
@@ -60,7 +56,6 @@ public class SimMsgServiceImpl implements ISimMsgService {
      * @param simMsg 模拟器报文
      * @return 结果
      */
-    @Override
     public int updateSimMsg(SimMsg simMsg) {
         simMsg.setUpdateTime(DateUtils.getNowDate());
         return simMsgMapper.updateSimMsg(simMsg);
@@ -72,7 +67,6 @@ public class SimMsgServiceImpl implements ISimMsgService {
      * @param simMsgIds 需要删除的模拟器报文主键
      * @return 结果
      */
-    @Override
     public int deleteSimMsgBySimMsgIds(Long[] simMsgIds) {
         return simMsgMapper.deleteSimMsgBySimMsgIds(simMsgIds);
     }
@@ -83,7 +77,6 @@ public class SimMsgServiceImpl implements ISimMsgService {
      * @param simMsgId 模拟器报文主键
      * @return 结果
      */
-    @Override
     public int deleteSimMsgBySimMsgId(Long simMsgId) {
         return simMsgMapper.deleteSimMsgBySimMsgId(simMsgId);
     }

+ 1 - 8
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SimServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SimService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.SimMapper;
 import com.ruoyi.sim.domain.Sim;
-import com.ruoyi.sim.service.ISimService;
 
 /**
  * 模拟器Service业务层处理
@@ -16,7 +15,7 @@ import com.ruoyi.sim.service.ISimService;
  * @date 2024-12-13
  */
 @Service
-public class SimServiceImpl implements ISimService {
+public class SimService {
     @Autowired
     private SimMapper simMapper;
 
@@ -26,7 +25,6 @@ public class SimServiceImpl implements ISimService {
      * @param simId 模拟器主键
      * @return 模拟器
      */
-    @Override
     public Sim selectSimBySimId(Long simId) {
         return simMapper.selectSimBySimId(simId);
     }
@@ -37,7 +35,6 @@ public class SimServiceImpl implements ISimService {
      * @param sim 模拟器
      * @return 模拟器
      */
-    @Override
     public List<Sim> selectSimList(Sim sim) {
         return simMapper.selectSimList(sim);
     }
@@ -48,7 +45,6 @@ public class SimServiceImpl implements ISimService {
      * @param sim 模拟器
      * @return 结果
      */
-    @Override
     public int insertSim(Sim sim) {
         sim.setCreateTime(DateUtils.getNowDate());
         return simMapper.insertSim(sim);
@@ -60,7 +56,6 @@ public class SimServiceImpl implements ISimService {
      * @param sim 模拟器
      * @return 结果
      */
-    @Override
     public int updateSim(Sim sim) {
         sim.setUpdateTime(DateUtils.getNowDate());
         return simMapper.updateSim(sim);
@@ -72,7 +67,6 @@ public class SimServiceImpl implements ISimService {
      * @param simIds 需要删除的模拟器主键
      * @return 结果
      */
-    @Override
     public int deleteSimBySimIds(Long[] simIds) {
         return simMapper.deleteSimBySimIds(simIds);
     }
@@ -83,7 +77,6 @@ public class SimServiceImpl implements ISimService {
      * @param simId 模拟器主键
      * @return 结果
      */
-    @Override
     public int deleteSimBySimId(Long simId) {
         return simMapper.deleteSimBySimId(simId);
     }

+ 2 - 4
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/StudentService.java

@@ -5,8 +5,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.sim.domain.AddOnDept;
 import com.ruoyi.sim.domain.Major;
 import com.ruoyi.sim.domain.Student;
-import com.ruoyi.sim.service.IAddOnDeptService;
-import com.ruoyi.sim.service.IMajorService;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysDeptService;
@@ -48,10 +46,10 @@ public class StudentService {
     private ISysDeptService deptService;
 
     @Autowired
-    private IAddOnDeptService addOnDeptService;
+    private AddOnDeptService addOnDeptService;
 
     @Autowired
-    private IMajorService majorService;
+    private MajorService majorService;
 
     @Autowired
     protected Validator validator;

+ 1 - 13
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskFaultServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskFaultService.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.TaskFaultMapper;
 import com.ruoyi.sim.domain.TaskFault;
-import com.ruoyi.sim.service.ITaskFaultService;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -17,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2024-12-13
  */
 @Service
-public class TaskFaultServiceImpl implements ITaskFaultService {
+public class TaskFaultService {
     @Autowired
     private TaskFaultMapper taskFaultMapper;
 
@@ -27,7 +26,6 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
      * @param relId 任务故障关联主键
      * @return 任务故障关联
      */
-    @Override
     public TaskFault selectTaskFaultByRelId(Long relId) {
         return taskFaultMapper.selectTaskFaultByRelId(relId);
     }
@@ -38,7 +36,6 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
      * @param taskFault 任务故障关联
      * @return 任务故障关联
      */
-    @Override
     public List<TaskFault> selectTaskFaultList(TaskFault taskFault) {
         return taskFaultMapper.selectTaskFaultList(taskFault);
     }
@@ -49,7 +46,6 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
      * @param taskFault 任务故障关联
      * @return 结果
      */
-    @Override
     public int insertTaskFault(TaskFault taskFault) {
         return taskFaultMapper.insertTaskFault(taskFault);
     }
@@ -60,7 +56,6 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
      * @param taskFault 任务故障关联
      * @return 结果
      */
-    @Override
     public int updateTaskFault(TaskFault taskFault) {
         taskFault.setUpdateTime(DateUtils.getNowDate());
         return taskFaultMapper.updateTaskFault(taskFault);
@@ -72,7 +67,6 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
      * @param relIds 需要删除的任务故障关联主键
      * @return 结果
      */
-    @Override
     public int deleteTaskFaultByRelIds(Long[] relIds) {
         return taskFaultMapper.deleteTaskFaultByRelIds(relIds);
     }
@@ -83,13 +77,11 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
      * @param relId 任务故障关联主键
      * @return 结果
      */
-    @Override
     public int deleteTaskFaultByRelId(Long relId) {
         return taskFaultMapper.deleteTaskFaultByRelId(relId);
     }
 
     // -------------------------------- tom add  --------------------------------
-    @Override
     public TaskFault selectUniqueTaskFault(Long taskId, String faultId) {
         TaskFault q = new TaskFault();
         q.setTaskId(taskId);
@@ -103,14 +95,12 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
     }
 
     @Transactional
-    @Override
     public int insertTaskFault(Long taskId, String faultId, String flag) {
         TaskFault n = new TaskFault(0L, taskId, faultId, flag);
         return insertTaskFault(n);
     }
 
     @Transactional
-    @Override
     public int updateTaskFault(Long relId, Long taskId, String faultId, String flag) {
         TaskFault f = selectTaskFaultByRelId(relId);
         f.setTaskId(taskId);
@@ -120,7 +110,6 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
     }
 
     @Transactional
-    @Override
     public int insertOrUpdateTaskFault(TaskFault tf) {
         TaskFault f = selectUniqueTaskFault(tf.getTaskId(), tf.getFaultId());
         if (f == null) {
@@ -131,7 +120,6 @@ public class TaskFaultServiceImpl implements ITaskFaultService {
     }
 
     @Transactional
-    @Override
     public int deleteTaskFaultByTaskId(Long taskId) {
         TaskFault q = new TaskFault();
         q.setTaskId(taskId);

+ 4 - 14
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskServiceImpl.java → ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskService.java

@@ -8,14 +8,11 @@ import com.ruoyi.sim.domain.Fault;
 import com.ruoyi.sim.domain.TaskFault;
 import com.ruoyi.sim.domain.vo.FaultTreeVo;
 import com.ruoyi.sim.domain.vo.TaskVo;
-import com.ruoyi.sim.service.IFaultService;
-import com.ruoyi.sim.service.ITaskFaultService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.TaskMapper;
 import com.ruoyi.sim.domain.Task;
-import com.ruoyi.sim.service.ITaskService;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -25,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2024-12-13
  */
 @Service
-public class TaskServiceImpl implements ITaskService {
+public class TaskService {
     @Autowired
     private TaskMapper taskMapper;
 
@@ -35,7 +32,6 @@ public class TaskServiceImpl implements ITaskService {
      * @param taskId 任务主键
      * @return 任务
      */
-    @Override
     public Task selectTaskByTaskId(Long taskId) {
         return taskMapper.selectTaskByTaskId(taskId);
     }
@@ -46,7 +42,6 @@ public class TaskServiceImpl implements ITaskService {
      * @param task 任务
      * @return 任务
      */
-    @Override
     public List<Task> selectTaskList(Task task) {
         return taskMapper.selectTaskList(task);
     }
@@ -57,7 +52,6 @@ public class TaskServiceImpl implements ITaskService {
      * @param task 任务
      * @return 结果
      */
-    @Override
     public int updateTask(Task task) {
         task.setUpdateTime(DateUtils.getNowDate());
         return taskMapper.updateTask(task);
@@ -69,7 +63,6 @@ public class TaskServiceImpl implements ITaskService {
      * @param taskIds 需要删除的任务主键
      * @return 结果
      */
-    @Override
     public int deleteTaskByTaskIds(Long[] taskIds) {
         return taskMapper.deleteTaskByTaskIds(taskIds);
     }
@@ -80,7 +73,6 @@ public class TaskServiceImpl implements ITaskService {
      * @param taskId 任务主键
      * @return 结果
      */
-    @Override
     public int deleteTaskByTaskId(Long taskId) {
         return taskMapper.deleteTaskByTaskId(taskId);
     }
@@ -88,9 +80,9 @@ public class TaskServiceImpl implements ITaskService {
     // -------------------------------- tom add  --------------------------------
 
     @Autowired
-    private IFaultService faultService;
+    private FaultService faultService;
     @Autowired
-    private ITaskFaultService taskFaultService;
+    private TaskFaultService taskFaultService;
 
     /**
      * 新增任务
@@ -99,13 +91,12 @@ public class TaskServiceImpl implements ITaskService {
      * @return 结果
      */
     @Transactional
-    @Override
     public AjaxResult insertTask(TaskVo task) {
         List<FaultTreeVo> selectedData = task.getSelectedData();
         task.setCreateTime(DateUtils.getNowDate());
         task.setUpdateTime(DateUtils.getNowDate());
         if (selectedData != null) {
-            List<FaultTreeVo> list = FaultServiceImpl.flatten(selectedData);
+            List<FaultTreeVo> list = FaultService.flatten(selectedData);
             for (FaultTreeVo one : list) {
                 TaskFault tf = one.getTaskFault();
                 taskFaultService.insertOrUpdateTaskFault(tf);
@@ -144,7 +135,6 @@ public class TaskServiceImpl implements ITaskService {
      * @param task 任务
      * @return 结果
      */
-    @Override
     @Transactional
     public int insertTaskWithFault(Task task) {
         Long taskId = task.getTaskId();

+ 0 - 5
ruoyi-sim/src/main/java/com/ruoyi/sim/service/my/MajorMyService.java

@@ -1,13 +1,8 @@
 package com.ruoyi.sim.service.my;
 
-import com.ruoyi.sim.service.IMajorService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class MajorMyService {
 
-    @Autowired
-    private IMajorService majorService;
-
 }