新增一个查询接口

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/controller/IotProjectController.java

@@ -1,12 +1,20 @@
 package com.middle.platform.manage.biz.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.middle.platform.common.utils.Result;
+import com.middle.platform.manage.biz.domain.IotDevice;
 import com.middle.platform.manage.biz.domain.IotProject;
+import com.middle.platform.manage.biz.domain.vo.req.IotDeviceVo;
 import com.middle.platform.manage.biz.service.IotProjectServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 项目表(iot_project)表控制层
  *
@@ -21,6 +29,14 @@ public class IotProjectController {
      */
     private final IotProjectServiceImpl iotProjectServiceImpl;
 
+    public Result<List<IotProject>> select(@RequestBody @Validated IotDeviceVo params){
+        PageHelper.startPage(1,10);
+        List<IotProject> list = iotProjectServiceImpl.select(params);
+        return Result.ok(list);
+    }
+
+
+
     /**
      * 通过主键查询单条数据
      *

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/domain/IotDevice.java

@@ -1,8 +1,10 @@
 package com.middle.platform.manage.biz.domain;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.middle.platform.mybatis.core.dataobject.BaseDO;
 import lombok.Builder;
 import lombok.Getter;
@@ -21,7 +23,6 @@ import lombok.experimental.SuperBuilder;
 @Getter
 @Setter
 @Accessors(chain = true)
-@SuperBuilder
 @Builder
 public class IotDevice extends BaseDO {
     private Long id;
@@ -85,19 +86,8 @@ public class IotDevice extends BaseDO {
     * 备注
     */
     private String remark;
+//
+////    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    private LocalDateTime deleteTime;
 
-    private Integer createBy;
-
-    private Date createTime;
-
-    private Integer updateBy;
-
-    private Date updateTime;
-
-    private Date deleteTime;
-
-    /**
-    * 删除标识
-    */
-    private Byte delFlag;
 }

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/domain/vo/req/IotDeviceVo.java

@@ -14,11 +14,16 @@ import lombok.ToString;
 @ToString
 public class IotDeviceVo{
 
-    private Long id;
 
-    private String name;
+    private String keywords;
 
     @NotBlank(message = "产品ID不能为空")
     private Long productId;
 
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+
+
 }

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/mapper/IotProjectMapper.java

@@ -1,8 +1,11 @@
 package com.middle.platform.manage.biz.mapper;
 
 import com.middle.platform.manage.biz.domain.IotProject;
+import com.middle.platform.manage.biz.domain.vo.req.IotDeviceVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author Aick Spt
  * @date 2023-12-18 10:09
@@ -51,4 +54,6 @@ public interface IotProjectMapper {
      * @return update count
      */
     int updateByPrimaryKey(IotProject record);
+
+    List<IotProject> select(IotDeviceVo params);
 }

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

@@ -1,12 +1,15 @@
 package com.middle.platform.manage.biz.service;
 
 import com.middle.platform.manage.biz.domain.IotProject;
+import com.middle.platform.manage.biz.domain.vo.req.IotDeviceVo;
 import com.middle.platform.manage.biz.mapper.IotProjectMapper;
 import com.middle.platform.manage.biz.service.impl.IotProjectService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author Aick Spt
  * @date 2023-12-18 10:08
@@ -48,4 +51,9 @@ public class IotProjectServiceImpl implements IotProjectService {
         return iotProjectMapper.updateByPrimaryKey(record);
     }
 
+    @Override
+    public List<IotProject> select(IotDeviceVo params) {
+        return iotProjectMapper.select(params);
+    }
+
 }

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

@@ -1,7 +1,11 @@
 package com.middle.platform.manage.biz.service.impl;
 
 import com.middle.platform.manage.biz.domain.IotProject;
-    /**
+import com.middle.platform.manage.biz.domain.vo.req.IotDeviceVo;
+
+import java.util.List;
+
+/**
  * @author Aick Spt
  * @date 2023-12-18 10:08
  */
@@ -21,4 +25,5 @@ public interface IotProjectService{
 
     int updateByPrimaryKey(IotProject record);
 
-}
+        List<IotProject> select(IotDeviceVo params);
+    }

iot-module/iot-module-manage/iot-module-manage-biz/src/main/resources/mapper/IotProjectMapper.xml

@@ -4,8 +4,8 @@
   <resultMap id="BaseResultMap" type="com.middle.platform.manage.biz.domain.IotProject">
     <!--@mbg.generated-->
     <!--@Table iot_project-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
@@ -164,4 +164,17 @@
       delete_time = #{deleteTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="select" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from iot_project
+    <where>
+        <if test="keywords != null and keywords != ''">
+          title like concat('%'
+          , #{keywords,jdbcType=VARCHAR}
+          , '%')
+        </if>
+    </where>
+    </select>
 </mapper>