系统模块开发

iot-module/iot-module-system/iot-module-system-api/pom.xml

@@ -18,6 +18,10 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.middle.platform</groupId>
+            <artifactId>iot-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>
             <artifactId>iot-starter-feign</artifactId>

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

@@ -0,0 +1,12 @@
+package com.middle.platform.system.api.enums;
+
+/**
+ * @author xucaiqin
+ * @date 2023-12-03 10:28:58
+ */
+public class ApiConstants {
+    public static final String NAME = "iot-system";
+
+    public static final String VERSION = "1.0.0";
+
+}

iot-module/iot-module-system/iot-module-system-api/src/main/java/com/middle/platform/system/api/feign/DictApi.java

@@ -0,0 +1,21 @@
+package com.middle.platform.system.api.feign;
+
+import com.middle.platform.common.utils.Result;
+import com.middle.platform.system.api.enums.ApiConstants;
+import com.middle.platform.system.api.pojo.DictDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xucaiqin
+ * @date 2023-12-17 13:51:33
+ */
+@FeignClient(name = ApiConstants.NAME)
+public interface DictApi {
+    String PREFIX = "/dict-data";
+
+    @GetMapping(PREFIX + "/get")
+    Result<DictDto> getDictData(@RequestParam("dictType") String dictType,
+                                @RequestParam("value") String value);
+}

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

@@ -0,0 +1,10 @@
+package com.middle.platform.system.api.pojo;
+
+import lombok.Data;
+
+@Data
+public class DictDto {
+    private String label;
+    private String value;
+    private String dictType;
+}

iot-module/iot-module-system/iot-module-system-biz/pom.xml

@@ -58,5 +58,9 @@
             <groupId>com.middle.platform</groupId>
             <artifactId>iot-starter-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.middle.platform</groupId>
+            <artifactId>iot-module-system-api</artifactId>
+        </dependency>
     </dependencies>
 </project>

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/api/DictApiImpl.java

@@ -0,0 +1,31 @@
+package com.middle.platform.system.biz.api;
+
+import com.middle.platform.common.utils.Result;
+import com.middle.platform.system.api.feign.DictApi;
+import com.middle.platform.system.api.pojo.DictDto;
+import com.middle.platform.system.biz.service.SysDictItemService;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+/**
+ * @author xucaiqin
+ * @date 2023-12-19 08:59:15
+ */
+@RestController
+@Validated
+public class DictApiImpl implements DictApi {
+    @Resource
+    private SysDictItemService sysDictItemService;
+
+    @Override
+    public Result<DictDto> getDictData(String dictType, String value) {
+        DictDto dictDto = sysDictItemService.queryBy(dictType, value);
+        if (Objects.nonNull(dictDto)) {
+            return Result.ok(dictDto);
+        }
+        return Result.failed();
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.middle.platform.system.biz.controller;
+
+import com.middle.platform.common.modle.BasePara;
+import com.middle.platform.common.utils.Result;
+import com.middle.platform.system.biz.entity.SysUser;
+import com.middle.platform.system.biz.pojo.req.SysDictPara;
+import com.middle.platform.system.biz.service.SysDictItemService;
+import com.middle.platform.system.biz.service.SysDictService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author xucaiqin
+ * @date 2023-12-15 08:46:49
+ */
+@RestController
+@RequestMapping("/dict")
+@RequiredArgsConstructor
+public class DictController {
+
+    private final SysDictService sysDictService;
+    private final SysDictItemService sysDictItemService;
+
+    /**
+     * 保存字典
+     *
+     * @param sysDictPara 字典
+     * @return
+     */
+    @PostMapping("/save")
+    public Result<Object> save(@RequestBody SysDictPara sysDictPara) {
+        return Result.ok(sysDictService.saveOne(sysDictPara), "保存成功");
+    }
+
+    /**
+     * 字典分页查询
+     *
+     * @param basePara 分页参数
+     * @return
+     */
+    @PostMapping("/list")
+    public Result<Object> list(BasePara basePara) {
+        return Result.ok(sysDictService.list(basePara));
+    }
+
+    /**
+     * 分页查询字典项
+     *
+     * @param dictId   字典id
+     * @param basePara 分页参数
+     * @return
+     */
+    @GetMapping("/queryItem")
+    public Result<List<SysUser>> getItem(@RequestParam("dictId") Long dictId, BasePara basePara) {
+        sysDictItemService.list(dictId,basePara);
+        return Result.ok();
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.middle.platform.system.biz.controller;
+
+import com.middle.platform.common.utils.Result;
+import com.middle.platform.system.biz.entity.SysUser;
+import com.middle.platform.system.biz.service.SysMenuService;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author xucaiqin
+ * @date 2023-12-15 08:46:49
+ */
+@RestController
+@RequestMapping("/menu")
+public class MenuController {
+
+    @Resource
+    private SysMenuService sysMenuService;
+
+
+    @PostMapping("/list")
+    public Result<List<SysUser>> list() {
+        return Result.ok();
+    }
+}

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/entity/SysDict.java

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.middle.platform.mybatis.core.dataobject.BaseDO;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 /**
  * 字典表
 * @date 2023-12-18 15:17:33
@@ -17,7 +16,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName(value = "sys_dict")
-public class SysDict {
+public class SysDict extends BaseDO {
     /**
      * id
      */
@@ -41,40 +40,4 @@ public class SysDict {
      */
     @TableField(value = "`desc`")
     private String desc;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 删除时间
-     */
-    @TableField(value = "delete_time")
-    private LocalDateTime deleteTime;
-
-    /**
-     * 删除标记 1-删除 0-正常
-     */
-    @TableField(value = "del_flag")
-    private Boolean delFlag;
 }

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/entity/SysDictItem.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.middle.platform.mybatis.core.dataobject.BaseDO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName(value = "sys_dict_item")
-public class SysDictItem {
+public class SysDictItem extends BaseDO {
     /**
      * 编号
      */
@@ -59,40 +60,4 @@ public class SysDictItem {
      */
     @TableField(value = "sort")
     private Integer sort;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 修改人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 删除时间
-     */
-    @TableField(value = "delete_time")
-    private LocalDateTime deleteTime;
-
-    /**
-     * 删除标记
-     */
-    @TableField(value = "del_flag")
-    private Boolean delFlag;
 }

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/entity/SysMenu.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.middle.platform.mybatis.core.dataobject.BaseDO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName(value = "sys_menu")
-public class SysMenu {
+public class SysMenu extends BaseDO {
     /**
      * ID
      */
@@ -65,40 +66,4 @@ public class SysMenu {
      */
     @TableField(value = "remark")
     private String remark;
-
-    /**
-     * 创建者
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 删除时间
-     */
-    @TableField(value = "delete_time")
-    private LocalDateTime deleteTime;
-
-    /**
-     * 是否删除
-     */
-    @TableField(value = "del_flag")
-    private Boolean delFlag;
 }

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/entity/SysUserMenu.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.middle.platform.mybatis.core.dataobject.BaseDO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName(value = "sys_user_menu")
-public class SysUserMenu {
+public class SysUserMenu extends BaseDO {
     /**
      * 自增编号
      */
@@ -35,40 +36,4 @@ public class SysUserMenu {
      */
     @TableField(value = "menu_id")
     private Long menuId;
-
-    /**
-     * 创建者
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 删除时间
-     */
-    @TableField(value = "delete_time")
-    private LocalDateTime deleteTime;
-
-    /**
-     * 是否删除
-     */
-    @TableField(value = "del_flag")
-    private Boolean delFlag;
 }

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

@@ -0,0 +1,37 @@
+package com.middle.platform.system.biz.pojo.req;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * 字典表
+* @date 2023-12-18 15:17:33
+* @author xucaiqin
+*/
+@Getter
+@Setter
+public class SysDictPara {
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+}

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

@@ -0,0 +1,50 @@
+package com.middle.platform.system.biz.pojo.req;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 用户表
+ *
+ * @author xucaiqin
+ * @date 2023-12-18 14:44:40
+ */
+@Getter
+@Setter
+public class SysUserPara {
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别0未知1男2女
+     */
+    private Integer sex;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 登录账号
+     */
+    private String username;
+
+    /**
+     * 登录密码
+     */
+    private String password;
+
+    /**
+     * 启用状态 1-启用 0-停用
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -0,0 +1,49 @@
+package com.middle.platform.system.biz.pojo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 字典项
+ *
+ * @author xucaiqin
+ * @date 2023-12-18 15:17:32
+ */
+@Getter
+@Setter
+public class SysDictItemVo {
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 字典ID
+     */
+    private Long dictId;
+
+    /**
+     * 值
+     */
+    private String value;
+
+    /**
+     * 标签
+     */
+    private String label;
+
+    /**
+     * 字典类型 冗余字段
+     */
+    private String type;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 排序（升序）
+     */
+    private Integer sort;
+}

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

@@ -0,0 +1,33 @@
+package com.middle.platform.system.biz.pojo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 字典表
+* @date 2023-12-18 15:17:33
+* @author xucaiqin
+*/
+@Getter
+@Setter
+public class SysDictVo {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String desc;
+}

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

@@ -1,14 +1,62 @@
 package com.middle.platform.system.biz.service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.middle.platform.common.modle.BasePara;
+import com.middle.platform.common.utils.PageRes;
+import com.middle.platform.system.api.pojo.DictDto;
 import com.middle.platform.system.biz.entity.SysDictItem;
 import com.middle.platform.system.biz.mapper.SysDictItemMapper;
+import com.middle.platform.system.biz.pojo.res.SysDictItemVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
-* @date 2023-12-18 15:17:16
-* @author xucaiqin
-*/
+ * @author xucaiqin
+ * @date 2023-12-18 15:17:16
+ */
 @Service
-public class SysDictItemService extends ServiceImpl<SysDictItemMapper, SysDictItem> {
+@RequiredArgsConstructor
+public class SysDictItemService {
+    private final SysDictItemMapper sysDictItemMapper;
+
+    /**
+     * 分页查询字典项
+     *
+     * @param dictId   字典id
+     * @param basePara 分页参数
+     * @return
+     */
+    public PageRes<SysDictItemVo> list(Long dictId, BasePara basePara) {
+        PageHelper.startPage(basePara.getPage(), basePara.getPageSize());
+        List<SysDictItem> sysDictItems = sysDictItemMapper.selectList(new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, dictId));
+        if (CollectionUtils.isEmpty(sysDictItems)) {
+            return new PageRes<>(basePara.getPage(), basePara.getPageSize());
+        }
+        List<SysDictItemVo> collect = sysDictItems.stream().map(a -> {
+            SysDictItemVo sysDictVo = new SysDictItemVo();
+            BeanUtils.copyProperties(a, sysDictVo);
+            return sysDictVo;
+
+        }).collect(Collectors.toList());
+        return PageRes.build(new PageInfo<>(sysDictItems), collect);
+    }
 
+    public DictDto queryBy(String dictType, String value) {
+        SysDictItem sysDictItem = sysDictItemMapper.selectOne(new LambdaQueryWrapper<SysDictItem>()
+                .eq(SysDictItem::getType, dictType).eq(SysDictItem::getValue, value).last("limit 1"));
+        if (Objects.nonNull(sysDictItem)) {
+            DictDto dictDto = new DictDto();
+            BeanUtils.copyProperties(sysDictItem, dictDto);
+            return dictDto;
+        }
+        return null;
+    }
 }

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

@@ -1,16 +1,54 @@
 package com.middle.platform.system.biz.service;
 
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.middle.platform.common.modle.BasePara;
+import com.middle.platform.common.utils.PageRes;
 import com.middle.platform.system.biz.entity.SysDict;
 import com.middle.platform.system.biz.mapper.SysDictMapper;
+import com.middle.platform.system.biz.pojo.req.SysDictPara;
+import com.middle.platform.system.biz.pojo.res.SysDictVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
-* @date 2023-12-18 15:17:33
-* @author xucaiqin
-*/
+ * @author xucaiqin
+ * @date 2023-12-18 15:17:33
+ */
 @Service
-public class SysDictService extends ServiceImpl<SysDictMapper, SysDict> {
+@RequiredArgsConstructor
+public class SysDictService {
+    private final SysDictMapper sysDictMapper;
+
+    public boolean saveOne(SysDictPara sysDictPara) {
+        SysDict sysDict = new SysDict();
+        sysDict.setType(sysDictPara.getType());
+        sysDict.setName(sysDictPara.getName());
+        sysDict.setDesc(sysDictPara.getDesc());
+
+        sysDictMapper.insert(sysDict);
+        return false;
+    }
+
+    public PageRes<SysDictVo> list(BasePara basePara) {
+        PageHelper.startPage(basePara.getPage(), basePara.getPageSize());
+        List<SysDict> sysDicts = sysDictMapper.selectList(new LambdaQueryWrapper<>());
+        if (CollectionUtils.isEmpty(sysDicts)) {
+            return new PageRes<>(basePara.getPage(), basePara.getPageSize());
+        }
+        List<SysDictVo> collect = sysDicts.stream().map(a -> {
+            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/SystemCacheService.java

@@ -0,0 +1,9 @@
+package com.middle.platform.system.biz.service;
+
+/**
+ * 用户缓存、字典缓存
+ * @author xucaiqin
+ * @date 2023-12-18 16:33:01
+ */
+public class SystemCacheService {
+}