Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/MybatisGeneratorUtils.java

@@ -43,7 +43,7 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-fire?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("usky");
         dsc.setPassword("Yt#75Usky");
@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("base_ggp_facility");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dmp_device_type");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDeviceTypeController.java

@@ -0,0 +1,80 @@
+package com.usky.iot.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.iot.domain.DmpDeviceType;
+import com.usky.iot.service.DmpDeviceTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.stereotype.Controller;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息类型 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2023-06-06
+ */
+@RestController
+@RequestMapping("/dmpDeviceType")
+public class DmpDeviceTypeController {
+    @Autowired
+    private DmpDeviceTypeService dmpDeviceTypeService;
+
+    /**
+     * 新增
+     * @param dmpDeviceType
+     * @return
+     */
+    @PostMapping("add")
+    public ApiResult<Void> add(@RequestBody DmpDeviceType dmpDeviceType){
+        dmpDeviceTypeService.add(dmpDeviceType);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param dmpDeviceType
+     * @return
+     */
+    @PutMapping("edit")
+    public ApiResult<Void> edit(@RequestBody DmpDeviceType dmpDeviceType){
+        dmpDeviceTypeService.edit(dmpDeviceType);
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("remove")
+    public ApiResult<Void> remove(@RequestParam("id") Integer id){
+        dmpDeviceTypeService.remove(id);
+        return ApiResult.success();
+    }
+
+    /**
+     *  列表查询
+     *
+     * @param typeCode 类型编号
+     * @param typeName 类型名称
+     * @param pageNum 当前页
+     * @param pageSize 每页条数
+     * @return
+     */
+    @GetMapping("getDeviceTypeList")
+    public ApiResult<CommonPage<DmpDeviceType>> getDeviceTypeList(@RequestParam(value = "typeCode",required = false) String typeCode,
+                                                                  @RequestParam(value = "typeName",required = false) String typeName,
+                                                                  @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
+        return ApiResult.success(dmpDeviceTypeService.getDeviceTypeList(typeCode,typeName,pageNum,pageSize));
+    }
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpDeviceType.java

@@ -0,0 +1,91 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备信息类型
+ * </p>
+ *
+ * @author ya
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDeviceType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 类型简称
+     */
+    private String typeAbbrevia;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 类型所属领域(1、消防 2、园区)
+     */
+    private Integer typeDomain;
+
+    /**
+     * 类型图片路径
+     */
+    private String typeImg;
+
+    /**
+     * 数据字段
+     */
+    private String dataField;
+
+    /**
+     * 描述
+     */
+    private String typeDesc;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceTypeMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpDeviceType;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 设备信息类型 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2023-06-06
+ */
+public interface DmpDeviceTypeMapper extends CrudMapper<DmpDeviceType> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceTypeService.java

@@ -0,0 +1,28 @@
+package com.usky.iot.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.iot.domain.DmpDeviceType;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息类型 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2023-06-06
+ */
+public interface DmpDeviceTypeService extends CrudService<DmpDeviceType> {
+    void add(DmpDeviceType dmpDeviceType);
+
+    boolean checkNameUnique(DmpDeviceType dmpDeviceType);
+
+    void edit(DmpDeviceType dmpDeviceType);
+
+    void remove(Integer id);
+
+    CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer pageNum, Integer pageSize);
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceTypeServiceImpl.java

@@ -0,0 +1,77 @@
+package com.usky.iot.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.DmpDeviceType;
+import com.usky.iot.domain.DmpProductAttribute;
+import com.usky.iot.mapper.DmpDeviceTypeMapper;
+import com.usky.iot.service.DmpDeviceTypeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 设备信息类型 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2023-06-06
+ */
+@Service
+public class DmpDeviceTypeServiceImpl extends AbstractCrudService<DmpDeviceTypeMapper, DmpDeviceType> implements DmpDeviceTypeService {
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(DmpDeviceType dmpDeviceType) {
+        if (checkNameUnique(dmpDeviceType)) {
+            throw new BusinessException("新增设备类型'" + dmpDeviceType.getTypeName() + "'失败，该设备类型已经存在");
+        }
+        dmpDeviceType.setCreatedBy(SecurityUtils.getUsername());
+        dmpDeviceType.setCreatedTime(LocalDateTime.now());
+        this.save(dmpDeviceType);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(DmpDeviceType dmpDeviceType) {
+        dmpDeviceType.setUpdatedBy(SecurityUtils.getUsername());
+        dmpDeviceType.setUpdatedTime(LocalDateTime.now());
+        this.updateById(dmpDeviceType);
+    }
+
+    @Override
+    public boolean checkNameUnique(DmpDeviceType dmpDeviceType) {
+        Integer id = null == dmpDeviceType.getId() ? -1 : dmpDeviceType.getId();
+        LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(DmpDeviceType::getTypeName, dmpDeviceType.getTypeName());
+        DmpDeviceType one = this.getOne(queryWrapper);
+        return null != one && !Objects.equals(one.getId(), id);
+    }
+
+    @Override
+    public void remove(Integer id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer pageNum, Integer pageSize) {
+        IPage<DmpDeviceType> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(typeCode), DmpDeviceType::getTypeCode, typeCode)
+                .like(StringUtils.isNotBlank(typeName), DmpDeviceType::getTypeName, typeName);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+    }
+}

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceTypeMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpDeviceTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpDeviceType">
+        <id column="id" property="id" />
+        <result column="type_code" property="typeCode" />
+        <result column="type_abbrevia" property="typeAbbrevia" />
+        <result column="type_name" property="typeName" />
+        <result column="type_domain" property="typeDomain" />
+        <result column="type_img" property="typeImg" />
+        <result column="data_field" property="dataField" />
+        <result column="type_desc" property="typeDesc" />
+        <result column="tenant_id" property="tenantId" />
+        <result column="created_by" property="createdBy" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_by" property="updatedBy" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+</mapper>