From 05a76348f1ca525f5a5705ae42e81fab68f288ca Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Thu, 16 Jan 2025 15:28:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E4=BC=98=E5=8C=96=20IoT=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E5=92=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DeptMapper.xml 中添加 remark 字段映射 - 更新 DeptTree 类，将 members 类型从 List 改为 List - 移除 UserTree 类 - 在 DeviceVo、Event、Param、Product、Property 和 Serve 类中添加 @JsonInclude 注解 - 更新 ServeController 中的权限检查逻辑 --- .../gateway/modules/iot/device/vo/DeviceVo.java | 2 ++ .../modules/iot/product/entity/Product.java | 2 ++ .../iot/tsl/controller/ServeController.java | 10 +++++----- .../gateway/modules/iot/tsl/entity/Event.java | 2 ++ .../gateway/modules/iot/tsl/entity/Param.java | 2 ++ .../gateway/modules/iot/tsl/entity/Property.java | 2 ++ .../gateway/modules/iot/tsl/entity/Serve.java | 2 ++ .../edu/gateway/modules/system/dto/MenuDto.java | 1 + .../edu/gateway/modules/system/vo/DeptTree.java | 3 +-- .../edu/gateway/modules/system/vo/UserTree.java | 16 ---------------- src/main/resources/mappers/system/DeptMapper.xml | 1 + 11 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 src/main/java/com/zsc/edu/gateway/modules/system/vo/UserTree.java diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java index 4f1fc8e..46057e6 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java @@ -1,6 +1,7 @@ package com.zsc.edu.gateway.modules.iot.device.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zsc.edu.gateway.framework.json.JsonbTypeHandler; import com.zsc.edu.gateway.modules.iot.device.entity.Device; import com.zsc.edu.gateway.modules.iot.product.entity.Product; @@ -15,6 +16,7 @@ import java.util.Set; /** * @author zhuang */ +@JsonInclude @Data public class DeviceVo { /** diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java b/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java index 711f441..49e5e6e 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java @@ -3,6 +3,7 @@ package com.zsc.edu.gateway.modules.iot.product.entity; import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zsc.edu.gateway.common.enums.IState; import com.zsc.edu.gateway.modules.iot.tsl.entity.Param; import com.zsc.edu.gateway.modules.system.entity.BaseEntity; @@ -22,6 +23,7 @@ import java.util.Set; @NoArgsConstructor @AllArgsConstructor @TableName("iot_product") +@JsonInclude public class Product extends BaseEntity { /** * 产品名称 diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/ServeController.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/ServeController.java index c458343..ca7a575 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/ServeController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/ServeController.java @@ -28,7 +28,7 @@ public class ServeController { * @return */ @PostMapping - @PreAuthorize("hasAnyAuthority('iot:server:create')") + @PreAuthorize("hasAnyAuthority('iot:serve:create')") public Serve create(@RequestBody ServeDto dto) { return serveService.create(dto); } @@ -40,7 +40,7 @@ public class ServeController { * @return 更新后的服务 */ @PatchMapping("{id}") - @PreAuthorize("hasAnyAuthority('iot:server:update')") + @PreAuthorize("hasAnyAuthority('iot:serve:update')") public Serve update(@RequestBody ServeDto dto, @PathVariable("id") Long id) { return serveService.update(dto, id); } @@ -54,7 +54,7 @@ public class ServeController { * @return Page 服务分页数据 */ @GetMapping - @PreAuthorize("hasAnyAuthority('iot:server:query')") + @PreAuthorize("hasAnyAuthority('iot:serve:query')") public Page page(Page page, ServeQuery query) { return serveService.page(page, query.wrapper()); } @@ -66,7 +66,7 @@ public class ServeController { * @return 被删除的服务 */ @DeleteMapping("{id}") - @PreAuthorize("hasAnyAuthority('iot:server:delete')") + @PreAuthorize("hasAnyAuthority('iot:serve:delete')") public Boolean delete(@PathVariable("id") Long id) { return serveService.delete(id); } @@ -79,7 +79,7 @@ public class ServeController { * @return 任务 */ @GetMapping("{id}") - @PreAuthorize("hasAnyAuthority('iot:server:query')") + @PreAuthorize("hasAnyAuthority('iot:serve:query')") public Serve detail(@PathVariable("id") Long id) { return serveService.detail(id); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Event.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Event.java index 5529388..17ba52d 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Event.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Event.java @@ -3,6 +3,7 @@ package com.zsc.edu.gateway.modules.iot.tsl.entity; import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zsc.edu.gateway.common.enums.IState; import com.zsc.edu.gateway.modules.iot.product.entity.Product; import lombok.AllArgsConstructor; @@ -23,6 +24,7 @@ import java.util.Set; @NoArgsConstructor @AllArgsConstructor @TableName("iot_event") +@JsonInclude public class Event extends BaseParam { private Long productId; diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Param.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Param.java index 62aadb2..8fe07cf 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Param.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Param.java @@ -2,6 +2,7 @@ package com.zsc.edu.gateway.modules.iot.tsl.entity; import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zsc.edu.gateway.common.enums.IState; import lombok.*; @@ -16,6 +17,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @TableName("iot_param") +@JsonInclude public class Param extends BaseParam { /** * 数据类型 diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Property.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Property.java index 4739fca..f169c23 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Property.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Property.java @@ -3,6 +3,7 @@ package com.zsc.edu.gateway.modules.iot.tsl.entity; import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zsc.edu.gateway.common.enums.IState; import com.zsc.edu.gateway.modules.iot.product.entity.Product; import lombok.AllArgsConstructor; @@ -20,6 +21,7 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor @TableName("iot_property") +@JsonInclude public class Property extends BaseParam { private Long productId; diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Serve.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Serve.java index baf5102..4b9309e 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Serve.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/Serve.java @@ -2,6 +2,7 @@ package com.zsc.edu.gateway.modules.iot.tsl.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zsc.edu.gateway.modules.iot.tsl.dto.ParamDto; import lombok.AllArgsConstructor; import lombok.Getter; @@ -20,6 +21,7 @@ import java.util.Set; @NoArgsConstructor @AllArgsConstructor @TableName("iot_serve") +@JsonInclude public class Serve extends BaseParam { private Long productId; diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/dto/MenuDto.java b/src/main/java/com/zsc/edu/gateway/modules/system/dto/MenuDto.java index aef1634..e52b7e6 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/dto/MenuDto.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/dto/MenuDto.java @@ -53,5 +53,6 @@ public class MenuDto { /** * 权限 */ + @NotBlank(message = "权限不能为空") private String permissions; } diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/vo/DeptTree.java b/src/main/java/com/zsc/edu/gateway/modules/system/vo/DeptTree.java index 93a3657..ec9d861 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/vo/DeptTree.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/vo/DeptTree.java @@ -18,9 +18,8 @@ import java.util.List; public class DeptTree { private Long id; - @JsonIgnore private Long pid; private String name; List children = new ArrayList<>(); - List members = new ArrayList<>(); + List members = new ArrayList<>(); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/vo/UserTree.java b/src/main/java/com/zsc/edu/gateway/modules/system/vo/UserTree.java deleted file mode 100644 index 7a35ea4..0000000 --- a/src/main/java/com/zsc/edu/gateway/modules/system/vo/UserTree.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zsc.edu.gateway.modules.system.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author zhuang - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserTree { - private Long id; - private String name; -} diff --git a/src/main/resources/mappers/system/DeptMapper.xml b/src/main/resources/mappers/system/DeptMapper.xml index c90954f..a9c3899 100644 --- a/src/main/resources/mappers/system/DeptMapper.xml +++ b/src/main/resources/mappers/system/DeptMapper.xml @@ -8,6 +8,7 @@ +