Merge remote-tracking branch 'gitlab/main'

# Conflicts:
#	lab-admin/src/main/java/com/ruoyi/asset/controller/TbFaultReportController.java

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetBorrowRecordController.java

@@ -1,11 +1,10 @@
 package com.ruoyi.asset.controller;
 
-import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.hutool.core.util.StrUtil;
-import com.ruoyi.asset.utils.RegexUtils;
+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;
@@ -31,6 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author 原动力
  * @date 2023-03-27
  */
+@Api(tags = "设备借用记录")
 @RestController
 @RequestMapping("/asset/borrow")
 public class TbAssetBorrowRecordController extends BaseController
@@ -41,6 +41,7 @@ public class TbAssetBorrowRecordController extends BaseController
     /**
      * 查询设备借用记录列表
      */
+    @ApiOperation("查询设备借用记录列表")
     @PreAuthorize("@ss.hasPermi('asset:borrow:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbAssetBorrowRecord tbAssetBorrowRecord)
@@ -53,6 +54,7 @@ public class TbAssetBorrowRecordController extends BaseController
     /**
      * 导出设备借用记录列表
      */
+    @ApiOperation("导出设备借用记录列表")
     @PreAuthorize("@ss.hasPermi('asset:borrow:export')")
     @Log(title = "设备借用记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -66,6 +68,7 @@ public class TbAssetBorrowRecordController extends BaseController
     /**
      * 获取设备借用记录详细信息
      */
+    @ApiOperation("获取设备借用记录详细信息")
     @PreAuthorize("@ss.hasPermi('asset:borrow:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -76,6 +79,7 @@ public class TbAssetBorrowRecordController extends BaseController
     /**
      * 新增设备借用记录
      */
+    @ApiOperation("新增设备借用记录")
     @PreAuthorize("@ss.hasPermi('asset:borrow:add')")
     @Log(title = "设备借用记录", businessType = BusinessType.INSERT)
     @PostMapping
@@ -87,6 +91,7 @@ public class TbAssetBorrowRecordController extends BaseController
     /**
      * 修改设备借用记录
      */
+    @ApiOperation("修改设备借用记录")
     @PreAuthorize("@ss.hasPermi('asset:borrow:edit')")
     @Log(title = "设备借用记录", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -98,6 +103,7 @@ public class TbAssetBorrowRecordController extends BaseController
     /**
      * 删除设备借用记录
      */
+    @ApiOperation("删除设备借用记录")
     @PreAuthorize("@ss.hasPermi('asset:borrow:remove')")
     @Log(title = "设备借用记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
@@ -105,51 +111,4 @@ public class TbAssetBorrowRecordController extends BaseController
     {
         return toAjax(tbAssetBorrowRecordService.deleteTbAssetBorrowRecordByIds(ids));
     }
-
-    /**
-     * 小程序：新增设备借用记录
-     */
-    @PreAuthorize("@ss.hasPermi('asset:borrow:add')")
-    @Log(title = "设备借用记录", businessType = BusinessType.INSERT)
-    @PostMapping("/save")
-    public AjaxResult saveBorrowRecord(@RequestBody TbAssetBorrowRecord tbAssetBorrowRecord)
-    {
-        String assetBarCode = tbAssetBorrowRecord.getAssetBarCode();
-        if (StrUtil.isBlank(assetBarCode)) {
-            return AjaxResult.error("资产设备条形码不能为空");
-        }
-        String borrowPlaceName = tbAssetBorrowRecord.getBorrowPlaceName();
-        if (StrUtil.isBlank(borrowPlaceName)) {
-            return AjaxResult.error("借用地点不能为空");
-        }
-        String tel = tbAssetBorrowRecord.getTel();
-        if (StrUtil.isBlank(tel)) {
-            return AjaxResult.error("联系电话不能为空");
-        }
-        if (RegexUtils.isPhoneInvalid(tel)) {
-            return AjaxResult.error("联系电话格式错误");
-        }
-        Date nowDate = new Date();
-        Date borrowDate = tbAssetBorrowRecord.getBorrowDate();
-        if (nowDate.after(borrowDate)) {
-            return AjaxResult.error("借用日期不能早于当前日期");
-        }
-        Date returnDate = tbAssetBorrowRecord.getReturnDate();
-        if (!returnDate.after(borrowDate)) {
-            return AjaxResult.error("归还日期不能早于借用日期");
-        }
-
-        return tbAssetBorrowRecordService.saveBorrowRecord(tbAssetBorrowRecord);
-    }
-
-    /**
-     * 修改设备借用记录为归还
-     */
-    @PreAuthorize("@ss.hasPermi('asset:borrow:edit')")
-    @Log(title = "修改设备借用记录为归还", businessType = BusinessType.UPDATE)
-    @PutMapping("/return/{barCode}")
-    public AjaxResult updateBorrowRecordToReturn(@PathVariable("barCode") String barCode)
-    {
-        return tbAssetBorrowRecordService.updateBorrowRecordToReturn(barCode);
-    }
 }

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetCategoryController.java

@@ -2,6 +2,9 @@ package com.ruoyi.asset.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+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;
@@ -27,6 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author 原动力
  * @date 2023-03-27
  */
+@Api(tags = "资产分类")
 @RestController
 @RequestMapping("/asset/category")
 public class TbAssetCategoryController extends BaseController
@@ -38,6 +42,7 @@ public class TbAssetCategoryController extends BaseController
      * 查询资产分类列表
      */
     @PreAuthorize("@ss.hasPermi('asset:category:list')")
+    @ApiOperation("查询资产分类列表")
     @GetMapping("/list")
     public TableDataInfo list(TbAssetCategory tbAssetCategory)
     {
@@ -50,6 +55,7 @@ public class TbAssetCategoryController extends BaseController
      * 导出资产分类列表
      */
     @PreAuthorize("@ss.hasPermi('asset:category:export')")
+    @ApiOperation("导出资产分类列表")
     @Log(title = "资产分类", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TbAssetCategory tbAssetCategory)
@@ -63,6 +69,7 @@ public class TbAssetCategoryController extends BaseController
      * 获取资产分类详细信息
      */
     @PreAuthorize("@ss.hasPermi('asset:category:query')")
+    @ApiOperation("获取资产分类详细信息")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,6 +80,7 @@ public class TbAssetCategoryController extends BaseController
      * 新增资产分类
      */
     @PreAuthorize("@ss.hasPermi('asset:category:add')")
+    @ApiOperation("新增资产分类")
     @Log(title = "资产分类", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TbAssetCategory tbAssetCategory)
@@ -84,6 +92,7 @@ public class TbAssetCategoryController extends BaseController
      * 修改资产分类
      */
     @PreAuthorize("@ss.hasPermi('asset:category:edit')")
+    @ApiOperation("修改资产分类")
     @Log(title = "资产分类", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TbAssetCategory tbAssetCategory)
@@ -95,6 +104,7 @@ public class TbAssetCategoryController extends BaseController
      * 删除资产分类
      */
     @PreAuthorize("@ss.hasPermi('asset:category:remove')")
+    @ApiOperation("删除资产分类")
     @Log(title = "资产分类", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -106,6 +116,7 @@ public class TbAssetCategoryController extends BaseController
      * 获取全部分类信息
      */
     @PreAuthorize("@ss.hasPermi('asset:category:list')")
+    @ApiOperation("获取全部分类信息")
     @GetMapping("/all")
     public AjaxResult selectTbAssetCategoryAll() {
         return AjaxResult.success(tbAssetCategoryService.selectTbAssetCategoryAll());

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetController.java

@@ -4,6 +4,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.asset.domain.dto.TbAssetDTO;
+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.*;
@@ -23,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author 原动力
  * @date 2023-03-27
  */
+@Api(tags = "资产信息")
 @RestController
 @RequestMapping("/asset/asset")
 public class TbAssetController extends BaseController
@@ -33,6 +36,7 @@ public class TbAssetController extends BaseController
     /**
      * 查询资产信息列表
      */
+    @ApiOperation("查询资产信息列表")
     @PreAuthorize("@ss.hasPermi('asset:asset:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbAsset tbAsset)
@@ -45,6 +49,7 @@ public class TbAssetController extends BaseController
     /**
      * 导出资产信息列表
      */
+    @ApiOperation("导出资产信息列表")
     @PreAuthorize("@ss.hasPermi('asset:asset:export')")
     @Log(title = "资产信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -58,6 +63,7 @@ public class TbAssetController extends BaseController
     /**
      * 导入
      */
+    @ApiOperation("导入资产信息")
     @Log(title = "资产信息", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('asset:asset:add')")
     @PostMapping("/importData")
@@ -72,6 +78,7 @@ public class TbAssetController extends BaseController
         return result ? success() : error();
     }
 
+    @ApiOperation("资产信息模板")
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response)
     {
@@ -82,6 +89,7 @@ public class TbAssetController extends BaseController
     /**
      * 获取资产信息详细信息
      */
+    @ApiOperation("获取资产信息详细信息")
     @PreAuthorize("@ss.hasPermi('asset:asset:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -92,6 +100,7 @@ public class TbAssetController extends BaseController
     /**
      * 新增资产信息
      */
+    @ApiOperation("新增资产信息")
     @PreAuthorize("@ss.hasPermi('asset:asset:add')")
     @Log(title = "资产信息", businessType = BusinessType.INSERT)
     @PostMapping
@@ -103,6 +112,7 @@ public class TbAssetController extends BaseController
     /**
      * 修改资产信息
      */
+    @ApiOperation("修改资产信息")
     @PreAuthorize("@ss.hasPermi('asset:asset:edit')")
     @Log(title = "资产信息", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -114,6 +124,7 @@ public class TbAssetController extends BaseController
     /**
      * 删除资产信息
      */
+    @ApiOperation("删除资产信息")
     @PreAuthorize("@ss.hasPermi('asset:asset:remove')")
     @Log(title = "资产信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
@@ -125,6 +136,7 @@ public class TbAssetController extends BaseController
     /**
      * 小程序：获取资产信息
      */
+    @ApiOperation("小程序：获取资产信息")
     @PreAuthorize("@ss.hasPermi('asset:asset:query')")
     @GetMapping(value = "/search")
     public AjaxResult selectTbAssetByBarCode(

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetStatusRecordController.java

@@ -2,6 +2,9 @@ package com.ruoyi.asset.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+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;
@@ -27,6 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author 原动力
  * @date 2023-03-27
  */
+@Api(tags = "资产设备状态记录")
 @RestController
 @RequestMapping("/asset/record")
 public class TbAssetStatusRecordController extends BaseController
@@ -37,6 +41,7 @@ public class TbAssetStatusRecordController extends BaseController
     /**
      * 查询资产设备状态记录列表
      */
+    @ApiOperation("查询资产设备状态记录列表")
     @PreAuthorize("@ss.hasPermi('asset:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbAssetStatusRecord tbAssetStatusRecord)
@@ -49,6 +54,7 @@ public class TbAssetStatusRecordController extends BaseController
     /**
      * 导出资产设备状态记录列表
      */
+    @ApiOperation("导出资产设备状态记录列表")
     @PreAuthorize("@ss.hasPermi('asset:record:export')")
     @Log(title = "资产设备状态记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -62,6 +68,7 @@ public class TbAssetStatusRecordController extends BaseController
     /**
      * 获取资产设备状态记录详细信息
      */
+    @ApiOperation("获取资产设备状态记录详细信息")
     @PreAuthorize("@ss.hasPermi('asset:record:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -72,6 +79,7 @@ public class TbAssetStatusRecordController extends BaseController
     /**
      * 新增资产设备状态记录
      */
+    @ApiOperation("新增资产设备状态记录")
     @PreAuthorize("@ss.hasPermi('asset:record:add')")
     @Log(title = "资产设备状态记录", businessType = BusinessType.INSERT)
     @PostMapping
@@ -83,6 +91,7 @@ public class TbAssetStatusRecordController extends BaseController
     /**
      * 修改资产设备状态记录
      */
+    @ApiOperation("修改资产设备状态记录")
     @PreAuthorize("@ss.hasPermi('asset:record:edit')")
     @Log(title = "资产设备状态记录", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -94,6 +103,7 @@ public class TbAssetStatusRecordController extends BaseController
     /**
      * 删除资产设备状态记录
      */
+    @ApiOperation("删除资产设备状态记录")
     @PreAuthorize("@ss.hasPermi('asset:record:remove')")
     @Log(title = "资产设备状态记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

lab-admin/src/main/java/com/ruoyi/asset/controller/TbFaultReportController.java

@@ -2,10 +2,6 @@ package com.ruoyi.asset.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-
-import cn.hutool.core.util.StrUtil;
-import com.ruoyi.asset.domain.dto.TbFaultReportProcessDTO;
-import com.ruoyi.asset.utils.RegexUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author 原动力
  * @date 2023-03-27
  */
+@Api(tags = "故障报备")
 @RestController
 @RequestMapping("/asset/fault")
 public class TbFaultReportController extends BaseController
@@ -41,6 +38,7 @@ public class TbFaultReportController extends BaseController
     /**
      * 查询故障报备列表
      */
+    @ApiOperation("查询故障报备列表")
     @PreAuthorize("@ss.hasPermi('asset:fault:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbFaultReport tbFaultReport)
@@ -53,6 +51,7 @@ public class TbFaultReportController extends BaseController
     /**
      * 导出故障报备列表
      */
+    @ApiOperation("导出故障报备列表")
     @PreAuthorize("@ss.hasPermi('asset:fault:export')")
     @Log(title = "故障报备", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -66,6 +65,7 @@ public class TbFaultReportController extends BaseController
     /**
      * 获取故障报备详细信息
      */
+    @ApiOperation("获取故障报备详细信息")
     @PreAuthorize("@ss.hasPermi('asset:fault:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -76,6 +76,7 @@ public class TbFaultReportController extends BaseController
     /**
      * 新增故障报备
      */
+    @ApiOperation("新增故障报备")
     @PreAuthorize("@ss.hasPermi('asset:fault:add')")
     @Log(title = "故障报备", businessType = BusinessType.INSERT)
     @PostMapping
@@ -87,6 +88,7 @@ public class TbFaultReportController extends BaseController
     /**
      * 修改故障报备
      */
+    @ApiOperation("修改故障报备")
     @PreAuthorize("@ss.hasPermi('asset:fault:edit')")
     @Log(title = "故障报备", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -98,6 +100,7 @@ public class TbFaultReportController extends BaseController
     /**
      * 删除故障报备
      */
+    @ApiOperation("删除故障报备")
     @PreAuthorize("@ss.hasPermi('asset:fault:remove')")
     @Log(title = "故障报备", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
@@ -105,49 +108,4 @@ public class TbFaultReportController extends BaseController
     {
         return toAjax(tbFaultReportService.deleteTbFaultReportByIds(ids));
     }
-
-    /**
-     * 小程序：新增故障报备
-     */
-    @PreAuthorize("@ss.hasPermi('asset:fault:add')")
-    @Log(title = "故障报备", businessType = BusinessType.INSERT)
-    @PostMapping("/save")
-    public AjaxResult saveFaultReport(@RequestBody TbFaultReport tbFaultReport)
-    {
-        String assetBarCode = tbFaultReport.getAssetBarCode();
-        if (StrUtil.isBlank(assetBarCode)) {
-            return AjaxResult.error("资产设备条形码不能为空");
-        }
-        String tel = tbFaultReport.getTel();
-        if (StrUtil.isBlank(tel)) {
-            return AjaxResult.error("报备人电话不能为空");
-        }
-        if (RegexUtils.isPhoneInvalid(tel)) {
-            return AjaxResult.error("电话格式错误");
-        }
-        String faultPhenomenon = tbFaultReport.getFaultPhenomenon();
-        if (StrUtil.isBlank(faultPhenomenon)) {
-            return AjaxResult.error("故障现象不能为空");
-        }
-        return tbFaultReportService.saveTbFaultReport(tbFaultReport);
-    }
-
-    /**
-     * 故障报备处理
-     */
-    @PreAuthorize("@ss.hasPermi('asset:fault:edit')")
-    @Log(title = "故障报备", businessType = BusinessType.UPDATE)
-    @PutMapping("/process")
-    public AjaxResult faultReportProcess(@RequestBody TbFaultReportProcessDTO faultReportProcessDTO)
-    {
-        Long tbFaultReportId = faultReportProcessDTO.getTbFaultReportId();
-        if (tbFaultReportId == null) {
-            return AjaxResult.error("故障报备编号不能为空");
-        }
-        String processResult = faultReportProcessDTO.getProcessResult();
-        if (StrUtil.isBlank(processResult)) {
-            return AjaxResult.error("处理结果不能为空");
-        }
-        return tbFaultReportService.tbFaultReportProcess(faultReportProcessDTO);
-    }
 }

lab-admin/src/main/java/com/ruoyi/asset/controller/TbPlaceController.java

@@ -4,6 +4,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.asset.domain.TbAsset;
+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 org.springframework.web.multipart.MultipartFile;
  * @author 原动力
  * @date 2023-03-27
  */
+@Api(tags = "存放地点")
 @RestController
 @RequestMapping("/asset/place")
 public class TbPlaceController extends BaseController
@@ -40,6 +43,7 @@ public class TbPlaceController extends BaseController
     /**
      * 查询地点列表
      */
+    @ApiOperation("查询地点列表")
     @PreAuthorize("@ss.hasPermi('asset:place:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbPlace tbPlace)
@@ -52,6 +56,7 @@ public class TbPlaceController extends BaseController
     /**
      * 导出地点列表
      */
+    @ApiOperation("导出地点列表")
     @PreAuthorize("@ss.hasPermi('asset:place:export')")
     @Log(title = "地点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -66,6 +71,7 @@ public class TbPlaceController extends BaseController
      * 导入
      * @return
      */
+    @ApiOperation("导入地点信息")
     @Log(title = "地点信息", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('asset:place:add')")
     @PostMapping("/importData")
@@ -77,6 +83,7 @@ public class TbPlaceController extends BaseController
         return AjaxResult.success(flag);
     }
 
+    @ApiOperation("存放地点模板")
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response)
     {
@@ -87,6 +94,7 @@ public class TbPlaceController extends BaseController
     /**
      * 获取地点详细信息
      */
+    @ApiOperation("获取地点详细信息")
     @PreAuthorize("@ss.hasPermi('asset:place:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -97,6 +105,7 @@ public class TbPlaceController extends BaseController
     /**
      * 新增地点
      */
+    @ApiOperation("新增地点")
     @PreAuthorize("@ss.hasPermi('asset:place:add')")
     @Log(title = "地点", businessType = BusinessType.INSERT)
     @PostMapping
@@ -108,6 +117,7 @@ public class TbPlaceController extends BaseController
     /**
      * 修改地点
      */
+    @ApiOperation("修改地点")
     @PreAuthorize("@ss.hasPermi('asset:place:edit')")
     @Log(title = "地点", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -119,6 +129,7 @@ public class TbPlaceController extends BaseController
     /**
      * 删除地点
      */
+    @ApiOperation("删除地点")
     @PreAuthorize("@ss.hasPermi('asset:place:remove')")
     @Log(title = "地点", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
@@ -130,6 +141,7 @@ public class TbPlaceController extends BaseController
     /**
      * 查询全部地点列表
      */
+    @ApiOperation("查询全部地点列表")
     @PreAuthorize("@ss.hasPermi('asset:place:list')")
     @GetMapping("/all")
     public AjaxResult all()

lab-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -3,6 +3,9 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,6 +39,7 @@ import com.ruoyi.system.service.ISysUserService;
  * 
  * @author ruoyi
  */
+@Api(tags = "用户信息")
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController
@@ -53,6 +57,7 @@ public class SysUserController extends BaseController
      * 获取用户列表
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @ApiOperation("获取用户列表")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
     {
@@ -62,6 +67,7 @@ public class SysUserController extends BaseController
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @ApiOperation("导出用户列表")
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user)
@@ -72,6 +78,7 @@ public class SysUserController extends BaseController
     }
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @ApiOperation("导入用户列表")
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
@@ -84,6 +91,7 @@ public class SysUserController extends BaseController
     }
 
     @PostMapping("/importTemplate")
+    @ApiOperation("获取用户列表模板")
     public void importTemplate(HttpServletResponse response)
     {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -94,6 +102,7 @@ public class SysUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @ApiOperation("根据用户编号获取详细信息")
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
@@ -116,6 +125,7 @@ public class SysUserController extends BaseController
      * 新增用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @ApiOperation("新增用户")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user)
@@ -143,6 +153,7 @@ public class SysUserController extends BaseController
      * 修改用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @ApiOperation("修改用户")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user)
@@ -167,6 +178,7 @@ public class SysUserController extends BaseController
      * 删除用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @ApiOperation("删除用户")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds)
@@ -182,6 +194,7 @@ public class SysUserController extends BaseController
      * 重置密码
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @ApiOperation("重置密码")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user)

lab-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -24,19 +24,20 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    //@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
+
     /** 用户账号 */
-    @Excel(name = "登录名称")
+    @Excel(name = "工号")
     private String userName;
 
     /** 用户昵称 */
-    @Excel(name = "用户名称")
+    @Excel(name = "老师名称")
     private String nickName;
 
     /** 用户邮箱 */
@@ -58,7 +59,6 @@ public class SysUser extends BaseEntity
     private String password;
 
     /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */

lab-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -501,6 +501,7 @@ public class SysUserServiceImpl implements ISysUserService
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
+        //默认123456
         String password = configService.selectConfigByKey("sys.user.initPassword");
         for (SysUser user : userList)
         {
@@ -513,6 +514,7 @@ public class SysUserServiceImpl implements ISysUserService
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
+                    user.setStatus("0");
                     this.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");

lab-ui/src/views/system/user/index.vue

@@ -268,7 +268,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
                 <el-option
@@ -280,7 +280,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
@@ -669,4 +669,4 @@ export default {
     }
   }
 };
-</script>
+</script>