修改部分查询列表。

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

@@ -71,7 +71,7 @@ public class RealExamController extends BaseController {
 
     // @PreAuthorize("@ss.hasPermi('sim:real-exam:query')")
     @GetMapping(value = "/student/{examId}")
-    @ApiOperation("[学生]获取考试详细信息")
+    @ApiOperation("[学生][轮询]获取考试详细信息")
     public AjaxResult getInfoStudent(@PathVariable("examId") Long examId) {
         return success(realExamService.selectRealExamByExamId(examId));
     }

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

@@ -4,6 +4,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.sim.service.impl.SeatService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/sim/seat")
+@Api("座Controller")
 public class SeatController extends BaseController {
     @Autowired
     private SeatService seatService;
@@ -37,7 +40,7 @@ public class SeatController extends BaseController {
     /**
      * 查询座列表
      */
-    @PreAuthorize("@ss.hasPermi('sim:seat:list')")
+    // @PreAuthorize("@ss.hasPermi('sim:seat:list')")
     @GetMapping("/list")
     public TableDataInfo list(Seat seat) {
         startPage();
@@ -46,6 +49,19 @@ public class SeatController extends BaseController {
     }
 
     /**
+     * 查询全部座列表
+     */
+    // @PreAuthorize("@ss.hasPermi('sim:seat:list')")
+    @GetMapping("/listAll")
+    @ApiOperation("[老师][轮询]查询全部座列表")
+    public TableDataInfo listAll() {
+        Seat seat = new Seat();
+        startPage();
+        List<Seat> list = seatService.selectSeatList(seat);
+        return getDataTable(list);
+    }
+
+    /**
      * 导出座列表
      */
     @PreAuthorize("@ss.hasPermi('sim:seat:export')")

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

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.sim.service.impl.SimService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,11 +35,9 @@ public class SimController extends BaseController {
     @Autowired
     private SimService simService;
 
-    /**
-     * 查询模拟器列表
-     */
-    @PreAuthorize("@ss.hasPermi('sim:sim:list')")
+    // @PreAuthorize("@ss.hasPermi('sim:sim:list')")
     @GetMapping("/list")
+    @ApiOperation("[分页]查询模拟器列表")
     public TableDataInfo list(Sim sim) {
         startPage();
         List<Sim> list = simService.selectSimList(sim);
@@ -48,9 +47,9 @@ public class SimController extends BaseController {
     /**
      * 导出模拟器列表
      */
-    @PreAuthorize("@ss.hasPermi('sim:sim:export')")
-    @Log(title = "模拟器", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    // @PreAuthorize("@ss.hasPermi('sim:sim:export')")
+    // @Log(title = "模拟器", businessType = BusinessType.EXPORT)
+    // @PostMapping("/export")
     public void export(HttpServletResponse response, Sim sim) {
         List<Sim> list = simService.selectSimList(sim);
         ExcelUtil<Sim> util = new ExcelUtil<Sim>(Sim.class);
@@ -60,7 +59,7 @@ public class SimController extends BaseController {
     /**
      * 获取模拟器详细信息
      */
-    @PreAuthorize("@ss.hasPermi('sim:sim:query')")
+    // @PreAuthorize("@ss.hasPermi('sim:sim:query')")
     @GetMapping(value = "/{simId}")
     public AjaxResult getInfo(@PathVariable("simId") Long simId) {
         return success(simService.selectSimBySimId(simId));
@@ -69,9 +68,9 @@ public class SimController extends BaseController {
     /**
      * 新增模拟器
      */
-    @PreAuthorize("@ss.hasPermi('sim:sim:add')")
-    @Log(title = "模拟器", businessType = BusinessType.INSERT)
-    @PostMapping
+    // @PreAuthorize("@ss.hasPermi('sim:sim:add')")
+    // @Log(title = "模拟器", businessType = BusinessType.INSERT)
+    // @PostMapping
     public AjaxResult add(@RequestBody Sim sim) {
         return toAjax(simService.insertSim(sim));
     }
@@ -79,9 +78,9 @@ public class SimController extends BaseController {
     /**
      * 修改模拟器
      */
-    @PreAuthorize("@ss.hasPermi('sim:sim:edit')")
-    @Log(title = "模拟器", businessType = BusinessType.UPDATE)
-    @PutMapping
+    // @PreAuthorize("@ss.hasPermi('sim:sim:edit')")
+    // @Log(title = "模拟器", businessType = BusinessType.UPDATE)
+    // @PutMapping
     public AjaxResult edit(@RequestBody Sim sim) {
         return toAjax(simService.updateSim(sim));
     }
@@ -89,9 +88,9 @@ public class SimController extends BaseController {
     /**
      * 删除模拟器
      */
-    @PreAuthorize("@ss.hasPermi('sim:sim:remove')")
-    @Log(title = "模拟器", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{simIds}")
+    // @PreAuthorize("@ss.hasPermi('sim:sim:remove')")
+    // @Log(title = "模拟器", businessType = BusinessType.DELETE)
+    // @DeleteMapping("/{simIds}")
     public AjaxResult remove(@PathVariable Long[] simIds) {
         return toAjax(simService.deleteSimBySimIds(simIds));
     }

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/Sim.java

@@ -5,6 +5,10 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * 模拟器对象 sim_sim
  *
@@ -32,9 +36,9 @@ public class Sim extends BaseEntity {
     private String simType;
 
     /**
-     * 模拟器在线 1:在线 2:离线 3:硬件故障异常
+     * 模拟器状态 1:在线 2:模拟器离线 3:网关离线 4:硬件故障异常 5:手动禁用
      */
-    @Excel(name = "模拟器在线 1:在线 2:离线 3:硬件故障异常")
+    @Excel(name = "模拟器状态")
     private String simState;
 
     /**
@@ -98,4 +102,42 @@ public class Sim extends BaseEntity {
                 .append("remark", getRemark())
                 .toString();
     }
+
+    // -------------------------------- tom add  --------------------------------
+    /**
+     *
+     */
+    public static final String TYPE_0001 = "0001";
+    /**
+     *
+     */
+    public static final String TYPE_0002 = "0002";
+    /**
+     *
+     */
+    public static final String TYPE_0003 = "0003";
+
+    public static final Set<String> TYPE_SET = new HashSet<>(
+            Arrays.asList(
+                    TYPE_0001,
+                    TYPE_0002,
+                    TYPE_0003
+            )
+    );
+
+    public static String STATE_ONLINE = "1";
+    public static String STATE_SIM_OFFLINE = "2";
+    public static String STATE_GATEWAY_OFFLINE = "3";
+    public static String STATE_SIM_ERROR = "4";
+    public static String STATE_DISABLE = "5";
+
+    public static final Set<String> STATE_SET = new HashSet<>(
+            Arrays.asList(
+                    STATE_ONLINE,
+                    STATE_SIM_OFFLINE,
+                    STATE_GATEWAY_OFFLINE,
+                    STATE_SIM_ERROR,
+                    STATE_DISABLE
+            )
+    );
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/FaultService.java

@@ -90,8 +90,9 @@ public class FaultService {
     }
 
     // -------------------------------- tom add  --------------------------------
-
     private static final Logger log = LoggerFactory.getLogger(FaultService.class);
+    @Autowired
+    private SimService simService;
 
     /**
      * 查询故障列表tree
@@ -103,7 +104,7 @@ public class FaultService {
         if (StringUtils.isEmpty(simType)) {
             return AjaxResult.error("simType empty!");
         }
-        if (!checkSimTypeOk(simType)) {
+        if (!simService.checkSimTypeOk(simType)) {
             return AjaxResult.error("simType value error!");
         }
         // query obj.
@@ -131,23 +132,6 @@ public class FaultService {
         return AjaxResult.success(tree);
     }
 
-    public static final String SIM_TYPE_0001 = "0001";
-    public static final String SIM_TYPE_0002 = "0002";
-    public static final String SIM_TYPE_0003 = "0003";
-    public static final Set<String> SIM_TYPE_SET = new HashSet<>(
-            Arrays.asList(
-                    SIM_TYPE_0001,
-                    SIM_TYPE_0002,
-                    SIM_TYPE_0003)
-    );
-
-    /**
-     * @param simType
-     * @return
-     */
-    public boolean checkSimTypeOk(String simType) {
-        return SIM_TYPE_SET.contains(simType);
-    }
 
 //    private static List<FaultNode> toTree2(List<FaultNode> list) {
 //        List<FaultNode> tree = new ArrayList<>();

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/SimService.java

@@ -1,8 +1,10 @@
 package com.ruoyi.sim.service.impl;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.ruoyi.common.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.SimMapper;
@@ -16,6 +18,7 @@ import com.ruoyi.sim.domain.Sim;
  */
 @Service
 public class SimService {
+
     @Autowired
     private SimMapper simMapper;
 
@@ -80,4 +83,62 @@ public class SimService {
     public int deleteSimBySimId(Long simId) {
         return simMapper.deleteSimBySimId(simId);
     }
+
+    public List<String> listSimTypes() {
+        return Sim.TYPE_SET.stream().toList();
+    }
+
+    public boolean checkSimTypeOk(String simType) {
+        return Sim.TYPE_SET.contains(simType);
+    }
+
+    public boolean checkState(String simState) {
+        return Sim.STATE_SET.contains(simState);
+    }
+
+    public int updateSimStateBySimId(Long simId, String simState) {
+        // check
+        if (checkState(simState)) {
+
+        }
+        //
+        Sim q = selectSimBySimId(simId);
+        if (Objects.isNull(q)) {
+            return 0;
+        }
+        q.setSimState(simState);
+        q.setUpdateTime(DateUtils.getNowDate());
+        return updateSim(q);
+    }
+
+    public boolean isSimStateBySimId(Long simId, String simState) {
+        // check
+        if (checkState(simState)) {
+
+        }
+        Sim q = selectSimBySimId(simId);
+        if (Objects.isNull(q)) {
+            return false;
+        }
+        return (q.getSimState().equals(simState));
+    }
+
+    public boolean isSimDisable(Long simId) {
+        return isSimStateBySimId(simId, Sim.STATE_DISABLE);
+    }
+
+    public int updateSimSnBySimId(Long simId, String simSn) {
+        // check
+        if (StringUtils.isEmpty(simSn)) {
+            return 0;
+        }
+        //
+        Sim q = selectSimBySimId(simId);
+        if (Objects.isNull(q)) {
+            return 0;
+        }
+        q.setSimSn(simSn);
+        q.setUpdateTime(DateUtils.getNowDate());
+        return updateSim(q);
+    }
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskService.java

@@ -28,8 +28,17 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class TaskService {
+
+    private static final Logger l = LoggerFactory.getLogger(TaskService.class);
+
     @Autowired
     private TaskMapper taskMapper;
+    @Autowired
+    private FaultService faultService;
+    @Autowired
+    private TaskFaultService taskFaultService;
+    @Autowired
+    private SimService simService;
 
     /**
      * 查询任务
@@ -95,7 +104,7 @@ public class TaskService {
         if (tv == null) {
             return AjaxResult.error("TaskVo empty!");
         }
-        if (!faultService.checkSimTypeOk(tv.getSimType())) {
+        if (!simService.checkSimTypeOk(tv.getSimType())) {
             return AjaxResult.error("simType error!");
         }
         if (!Task.TASK_TYPE_TEACHER_ADD.equals(tv.getTaskType())) {
@@ -176,12 +185,6 @@ public class TaskService {
         return taskMapper.deleteTaskByTaskId(taskId);
     }
 
-    // -------------------------------- tom add  --------------------------------
-    private static final Logger l = LoggerFactory.getLogger(TaskService.class);
-    @Autowired
-    private FaultService faultService;
-    @Autowired
-    private TaskFaultService taskFaultService;
 
     /**
      * 新增任务
@@ -197,7 +200,7 @@ public class TaskService {
         if (tv == null) {
             return AjaxResult.error("TaskVo empty!");
         }
-        if (!faultService.checkSimTypeOk(tv.getSimType())) {
+        if (!simService.checkSimTypeOk(tv.getSimType())) {
             return AjaxResult.error("simType error!");
         }
         if (!Task.TASK_TYPE_TEACHER_ADD.equals(tv.getTaskType())) {
@@ -259,7 +262,7 @@ public class TaskService {
         if (StringUtils.isEmpty(simType)) {
             return AjaxResult.error("simType empty!");
         }
-        if (!faultService.checkSimTypeOk(simType)) {
+        if (!simService.checkSimTypeOk(simType)) {
             return AjaxResult.error("simType value error!");
         }
         // query obj.