Merge branch 'dev-api' into dev

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

@@ -1,5 +1,23 @@
 package com.ruoyi.sim.controller;
 
-public class AddOnDeptController {
+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")
+//@Api("班级/部门附加Controller")
+public class AddOnDeptController extends BaseController {
 
 }

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

@@ -74,6 +74,7 @@ public class TaskController extends BaseController {
     // @PreAuthorize("@ss.hasPermi('sim:task:add')")
     @Log(title = "任务", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增任务")
     public AjaxResult add(@RequestBody Task task) {
         return toAjax(taskService.insertTask(task));
     }
@@ -101,7 +102,7 @@ public class TaskController extends BaseController {
     // -------------------------------- tom add  --------------------------------
 
     /**
-     *
+     * 获取空白的任务详细信息，为了新建任务
      */
     // @PreAuthorize("@ss.hasPermi('sim:task:query')")
     @GetMapping("/getInfoForAdd/{simType}")

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

@@ -2,13 +2,17 @@ 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.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 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.Consts;
-import com.ruoyi.sim.service.impl.StudentService;
 import com.ruoyi.sim.service.impl.TeacherService;
+import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
@@ -20,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Api("教师Controller")
@@ -126,14 +131,47 @@ public class TeacherController extends BaseController {
     // @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     @ApiOperation("删除教师")
-    public AjaxResult remove(@PathVariable Long[] userIds)
-    {
-        if (ArrayUtils.contains(userIds, getUserId()))
-        {
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        if (ArrayUtils.contains(userIds, getUserId())) {
             return error("当前用户不能删除");
         }
         return toAjax(userService.deleteUserByIds(userIds));
     }
 
     // @PreAuthorize("@ss.hasPermi('sim:teacher:resetPwd')")
+
+    @Autowired
+    private SysDeptMapper deptMapper;
+    @Autowired
+    private IAddOnDeptService addOnDeptService;
+
+    /**
+     * 获取班级/部门列表
+     *
+     * @return
+     */
+    //@PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/class-major/list")
+    @ApiOperation("获取班级/部门列表")
+    /**
+     * 获取班级/部门列表
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<Clazz> listClassWithMajor() {
+        // 构建查询对象。
+
+        //
+        List<SysDept> listD = deptMapper.selectDeptList(new SysDept());
+        List<Clazz> listC = new ArrayList<>();
+        for (SysDept d : listD) {
+            Clazz c = new Clazz();
+            Major m = addOnDeptService.selectMajorByDeptId(d.getDeptId());
+            c.setSysDept(d);
+            c.setMajor(m);
+            listC.add(c);
+        }
+        return listC;
+    }
 }

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

@@ -0,0 +1,38 @@
+package com.ruoyi.sim.domain;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ *
+ */
+public class Clazz {
+
+    private SysDept sysDept;
+
+    private Major major;
+
+    public SysDept getSysDept() {
+        return sysDept;
+    }
+
+    public void setSysDept(SysDept sysDept) {
+        this.sysDept = sysDept;
+    }
+
+    public Major getMajor() {
+        return major;
+    }
+
+    public void setMajor(Major major) {
+        this.major = major;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("sysDept", sysDept)
+                .append("major", major)
+                .toString();
+    }
+}

ruoyi-sim/src/main/java/com/ruoyi/sim/service/IAddOnDeptService.java

@@ -2,7 +2,10 @@ 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接口
@@ -58,4 +61,7 @@ public interface IAddOnDeptService {
      * @return 结果
      */
     public int deleteAddOnDeptByDeptId(Long deptId);
+
+    // -------------------------------- tom add  --------------------------------
+    public Major selectMajorByDeptId(Long deptId);
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/service/ITaskService.java

@@ -62,9 +62,16 @@ public interface ITaskService {
     // -------------------------------- tom add  --------------------------------
 
     /**
-     *
      * @param simType
      * @return
      */
     public Task selectNewTaskViaSimType(String simType);
+
+    /**
+     * 新增任务附带选择故障
+     *
+     * @param task 任务
+     * @return 结果
+     */
+    public int insertTaskWithFault(Task task);
 }

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

@@ -1,7 +1,15 @@
 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;
@@ -84,4 +92,16 @@ public class AddOnDeptServiceImpl implements IAddOnDeptService {
     public int deleteAddOnDeptByDeptId(Long deptId) {
         return addOnDeptMapper.deleteAddOnDeptByDeptId(deptId);
     }
+
+    // -------------------------------- tom add  --------------------------------
+    @Autowired
+    private MajorMapper majorMapper;
+
+    public Major selectMajorByDeptId(Long deptId) {
+        AddOnDept aoD = addOnDeptMapper.selectAddOnDeptByDeptId(deptId);
+        if (aoD == null) {
+            return null;
+        }
+        return majorMapper.selectMajorByMajorId(aoD.getMajorId());
+    }
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.sim.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.AddOnUserMapper;
@@ -17,6 +18,7 @@ import com.ruoyi.sim.service.IAddOnUserService;
  */
 @Service
 public class AddOnUserServiceImpl implements IAddOnUserService {
+
     @Autowired
     private AddOnUserMapper addOnUserMapper;
 

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

@@ -128,16 +128,22 @@ public class FaultServiceImpl implements IFaultService {
         return 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 checkSimType(String simType) {
-        Set<String> s = new HashSet<>();
-        s.add("0001");
-        s.add("0002");
-        s.add("0003");
-        return s.contains(simType);
+        return SIM_TYPE_SET.contains(simType);
     }
 
     private static String ROOT_FAULT_ID = "000000000000";

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

@@ -11,6 +11,7 @@ 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;
 
 /**
  * 任务Service业务层处理
@@ -114,4 +115,22 @@ public class TaskServiceImpl implements ITaskService {
         t.setFaultTreeList(ftList);
         return t;
     }
+
+    /**
+     * 新增任务附带选择故障
+     *
+     * @param task 任务
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertTaskWithFault(Task task) {
+        Long taskId = task.getTaskId();
+        if (selectTaskByTaskId(taskId) != null) {
+            // 已经存在
+        }
+        task.setCreateTime(DateUtils.getNowDate());
+        task.setUpdateTime(DateUtils.getNowDate());
+        return taskMapper.insertTask(task);
+    }
 }