代码优化

iot-module/iot-module-auth/iot-module-auth-biz/src/main/java/com/middle/platform/auth/biz/controller/AuthController.java

@@ -5,6 +5,7 @@ import com.middle.platform.auth.biz.pojo.LoginPara;
 import com.middle.platform.auth.biz.service.AuthService;
 import com.middle.platform.common.utils.Result;
 import com.middle.platform.system.api.pojo.SysUserFlag;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -51,7 +52,7 @@ public class AuthController {
      * @return
      */
     @PostMapping("/enable")
-    public Result<Object> enable(@RequestBody SysUserFlag sysUserFlag) {
+    public Result<Object> enable(@RequestBody @Valid SysUserFlag sysUserFlag) {
         authService.changeUse(sysUserFlag);
         return Result.ok(true, "操作成功");
     }
@@ -66,14 +67,4 @@ public class AuthController {
         StpUtil.logout();
         return Result.ok(true, "登出成功");
     }
-
-    @GetMapping("/check")
-    public Result<Object> check() {
-        return Result.ok(StpUtil.isLogin());
-    }
-
-    @PostMapping("/get")
-    public Result<Object> get() {
-        return Result.ok(StpUtil.getTokenInfo());
-    }
 }

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotDeviceService.java

@@ -83,7 +83,7 @@ public class IotDeviceService {
         iotDevice.setGuid(IdUtil.fastSimpleUUID());
         iotDevice.setSubtitle(iotDevicePara.getSubtitle());
         iotDevice.setStatus(0);
-        iotDevice.setEnableFlag(0);
+        iotDevice.setEnableFlag(1);
         iotDevice.setRemark(iotDevicePara.getRemark());
         iotDeviceMapper.insert(iotDevice);
         return true;
@@ -172,7 +172,7 @@ public class IotDeviceService {
             Set<ConstraintViolation<DeviceImportExcelVo>> validate = Validation.buildDefaultValidatorFactory().getValidator().validate(deviceImportExcelVo);
             if (CollUtil.isNotEmpty(validate)) {
                 for (ConstraintViolation<DeviceImportExcelVo> next : validate) {
-                    throw new BusinessException(deviceImportExcelVo.getSn() + ":" + next.getMessage());
+                    throw new BusinessException("设备[" + deviceImportExcelVo.getSn() + "]" + next.getMessage());
                 }
             }
         }
@@ -182,7 +182,7 @@ public class IotDeviceService {
                     .eq(IotProduct::getCode, deviceImportExcelVo.getCode())
                     .eq(IotProduct::getDelFlag, Global.UN_DEL).last("limit 1"));
             if (Objects.isNull(iotProduct)) {
-                throw new BusinessException(deviceImportExcelVo.getCode() + "产品不存在");
+                throw new BusinessException("产品编码[" + deviceImportExcelVo.getCode() + "]产品不存在");
             }
             deviceImportExcelVo.setProductId(iotProduct.getId());
         }

iot-module/iot-module-system/iot-module-system-api/src/main/java/com/middle/platform/system/api/enums/DictType.java

@@ -12,6 +12,7 @@ public interface DictType {
     String DATA_FORMAT_TYPE = "data_tormat_type";
     String AUTH_TYPE = "auth_type";//认证类型
     String SEX_TYPE = "sex_type";//性别
+    String STATUS_TYPE = "status_type";//性别
     String MENU_TYPE = "menu_type";//菜单类别
 
 }

iot-module/iot-module-system/iot-module-system-api/src/main/java/com/middle/platform/system/api/pojo/SysUserFlag.java

@@ -1,5 +1,6 @@
 package com.middle.platform.system.api.pojo;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,6 +11,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SysUserFlag {
+    @NotNull(message = "id不能为空")
     private Long id;
+    @NotNull(message = "状态不能为空")
     private Integer status;
 }

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/controller/DictController.java

@@ -8,8 +8,10 @@ import com.middle.platform.system.biz.pojo.req.SysDictPara;
 import com.middle.platform.system.biz.pojo.res.SysDictItemVo;
 import com.middle.platform.system.biz.service.SysDictItemService;
 import com.middle.platform.system.biz.service.SysDictService;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/dict")
 @RequiredArgsConstructor
+@Validated
 public class DictController {
 
     private final SysDictService sysDictService;
@@ -33,7 +36,7 @@ public class DictController {
      * @return
      */
     @PostMapping("/save")
-    public Result<Object> save(@RequestBody SysDictPara sysDictPara) {
+    public Result<Object> save(@RequestBody @Valid SysDictPara sysDictPara) {
         return Result.ok(sysDictService.saveOne(sysDictPara), "保存成功");
     }
 

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/controller/IndexController.java

@@ -2,8 +2,6 @@ package com.middle.platform.system.biz.controller;
 
 import com.middle.platform.common.utils.DateTimeUtil;
 import com.middle.platform.common.utils.Result;
-import com.middle.platform.system.biz.service.SysUserService;
-import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,8 +17,6 @@ public class IndexController {
     @Value("${spring.application.name}")
     private String name;
 
-    @Resource
-    private SysUserService sysUserService;
 
     @GetMapping("")
     public Result<Object> server() {

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/controller/UserController.java

@@ -8,6 +8,7 @@ import com.middle.platform.system.biz.pojo.req.SysUserUpdPara;
 import com.middle.platform.system.biz.pojo.res.SysUserVo;
 import com.middle.platform.system.biz.service.SysUserService;
 import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +33,7 @@ public class UserController {
      * @return
      */
     @PostMapping("/save")
-    public Result<Object> save(@RequestBody @Validated SysUserPara sysUserPara) {
+    public Result<Object> save(@RequestBody @Valid SysUserPara sysUserPara) {
         return Result.ok(sysUserService.save(sysUserPara), "保存成功");
     }
 

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/pojo/req/SysDictPara.java

@@ -1,11 +1,9 @@
 package com.middle.platform.system.biz.pojo.req;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 /**
  * 字典表
 * @date 2023-12-18 15:17:33
@@ -17,11 +15,13 @@ public class SysDictPara {
     /**
      * 类型
      */
+    @NotBlank(message = "类型不能为空")
     private String type;
 
     /**
      * 名称
      */
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**
@@ -29,9 +29,4 @@ public class SysDictPara {
      */
     private String desc;
 
-    /**
-     * 创建人
-     */
-    private Long createBy;
-
 }

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/pojo/res/SysUserVo.java

@@ -38,6 +38,7 @@ public class SysUserVo {
      * 启用状态 1-启用 0-停用
      */
     private Integer status;
+    private String statusLabel;
 
     /**
      * 备注

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/service/SysDictService.java

@@ -3,6 +3,7 @@ package com.middle.platform.system.biz.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.middle.platform.common.constant.Global;
 import com.middle.platform.common.modle.BasePara;
 import com.middle.platform.pagehelper.core.PageRes;
 import com.middle.platform.system.biz.entity.SysDict;
@@ -36,9 +37,15 @@ public class SysDictService {
         return false;
     }
 
+    /**
+     * 分页查询
+     *
+     * @param basePara
+     * @return
+     */
     public PageRes<SysDictVo> list(BasePara basePara) {
         PageHelper.startPage(basePara.getPage(), basePara.getPageSize());
-        List<SysDict> sysDicts = sysDictMapper.selectList(new LambdaQueryWrapper<>());
+        List<SysDict> sysDicts = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getDelFlag, Global.UN_DEL));
         if (CollectionUtils.isEmpty(sysDicts)) {
             return new PageRes<>(basePara.getPage(), basePara.getPageSize());
         }
@@ -46,7 +53,6 @@ public class SysDictService {
             SysDictVo sysDictVo = new SysDictVo();
             BeanUtils.copyProperties(a, sysDictVo);
             return sysDictVo;
-
         }).collect(Collectors.toList());
         return PageRes.build(new PageInfo<>(sysDicts), collect);
 

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/service/SysUserService.java

@@ -77,9 +77,10 @@ public class SysUserService {
         PageHelper.startPage(basePara.getPage(), basePara.getPageSize());
         List<SysUserVo> sysUserVos = sysUserMapper.pageList(basePara);
         PageInfo<SysUserVo> pageInfo = new PageInfo<>(sysUserVos);
-        sysUserVos.forEach(u -> Optional.ofNullable(dictApi.query(DictType.SEX_TYPE, String.valueOf(u.getSex()))).ifPresent(d -> {
-            u.setSexLabel(d.getLabel());
-        }));
+        sysUserVos.forEach(u -> {
+            Optional.ofNullable(dictApi.query(DictType.SEX_TYPE, String.valueOf(u.getSex()))).ifPresent(d -> u.setSexLabel(d.getLabel()));
+            Optional.ofNullable(dictApi.query(DictType.STATUS_TYPE, String.valueOf(u.getStatus()))).ifPresent(d -> u.setStatusLabel(d.getLabel()));
+        });
         return new PageRes<>(pageInfo, sysUserVos);
     }
 
@@ -221,6 +222,7 @@ public class SysUserService {
         SysUserVo sysUserVo = new SysUserVo();
         BeanUtils.copyProperties(sysUser, sysUserVo);
         Optional.ofNullable(dictApi.query(DictType.SEX_TYPE, String.valueOf(sysUserVo.getSex()))).ifPresent(d -> sysUserVo.setSexLabel(d.getLabel()));
+        Optional.ofNullable(dictApi.query(DictType.STATUS_TYPE, String.valueOf(sysUserVo.getStatus()))).ifPresent(d -> sysUserVo.setStatusLabel(d.getLabel()));
         UserDetailVo userDetailVo = new UserDetailVo();
         userDetailVo.setSysUserVo(sysUserVo);