update:修改设备查询

src/main/java/com/tuoren/forward/controller/DeviceController.java

@@ -41,17 +41,26 @@ public class DeviceController {
 	
 	@Autowired
 	DeviceService deviceService;
-	
+
+	/**
+	 * 设备查询
+	 * @param req
+	 * @return
+	 */
 	@PostMapping("search")
 	@ResponseBody
 	@Operation(summary = "查询设备")
 	@Parameter(name="token",description = "token",required = true,in = ParameterIn.HEADER)
-	public ResultPage<Device> blurrySearch(@RequestBody DeviceSearchReq req){
-		log.info("blurrySearch>>:{}",req);
-		return deviceService.blurrySearch(req);
+	public ResultPage<Device> selectSearch(@RequestBody DeviceSearchReq req){
+		log.info("selectSearch>>:{}",req);
+		return deviceService.selectSearch(req);
 	}
 
-
+	/**
+	 * 设备详情
+	 * @param req
+	 * @return
+	 */
 	@PostMapping("detail")
     @ResponseBody
     @Operation(summary = "设备详情")
@@ -59,8 +68,12 @@ public class DeviceController {
 		log.info("detail>>:{}",req);
 		return deviceService.detail(req.getId());
 	}
-	
 
+	/**
+	 * 设备添加
+	 * @param req
+	 * @return
+	 */
 	@HandleLog
 	@PostMapping("add")
     @ResponseBody
@@ -73,7 +86,12 @@ public class DeviceController {
 		}
 		return deviceService.add(req);
 	}
-	
+
+	/**
+	 * 修改设备
+	 * @param req
+	 * @return
+	 */
 	@HandleLog
 	@PostMapping("edit")
     @ResponseBody
@@ -87,6 +105,11 @@ public class DeviceController {
 		return deviceService.edit(req);
 	}
 
+	/**
+	 * 根据Mac修改设备
+	 * @param req
+	 * @return
+	 */
 	@HandleLog
 	@PostMapping("editMac")
 	@ResponseBody
@@ -98,7 +121,11 @@ public class DeviceController {
 		return deviceService.editMac(req);
 	}
 
-
+	/**
+	 * 删除设备
+	 * @param req
+	 * @return
+	 */
 	@HandleLog
 	@PostMapping("delete")
     @ResponseBody
@@ -111,7 +138,12 @@ public class DeviceController {
 		}
 		return deviceService.delete(req.getId());
 	}
-	
+
+	/**
+	 * 查询设备记录
+	 * @param req
+	 * @return
+	 */
 	@PostMapping("searchRecord")
     @ResponseBody
     @Operation(summary = "查询设备记录")
@@ -120,7 +152,11 @@ public class DeviceController {
 		log.info("searchRecord>>:{}",req);
 		return deviceService.searchRecord(req);
 	}
-	
+
+	/**
+	 * 统计各省设备数
+	 * @return
+	 */
 	@PostMapping("countProvinceDevice")
     @ResponseBody
     @Operation(summary = "统计各省设备数")
@@ -129,7 +165,11 @@ public class DeviceController {
 		log.info("searchRecord>>");
 		return deviceService.countProvinceDevice();
 	}
-	
+
+	/**
+	 * 统计在线设备数
+	 * @return
+	 */
 	@PostMapping("countOnlineDevice")
     @ResponseBody
     @Operation(summary = "统计在线设备数")
@@ -138,7 +178,12 @@ public class DeviceController {
 		log.info("countOnlineDevice>>");
 		return deviceService.countOnlineDevice();
 	}
-	
+
+	/**
+	 * 生成设备信息二维码
+	 * @param req
+	 * @return
+	 */
 	@PostMapping("qrCode")
     @ResponseBody
     @Operation(summary = "生成设备信息二维码")
@@ -147,7 +192,12 @@ public class DeviceController {
 		log.info("qrCode>>:{}",req);
 		return deviceService.qrCode(req.getId());
 	}
-	
+
+	/**
+	 * 设备用户绑定
+	 * @param req
+	 * @return
+	 */
 	@PostMapping("bind")
     @ResponseBody
     @Operation(summary = "设备用户绑定")

src/main/java/com/tuoren/forward/entity/req/DeviceSearchReq.java

@@ -14,4 +14,7 @@ public class DeviceSearchReq extends PageReq{
 	@Schema(description = "搜索内容")
     private String keyWord;
 
+    @Schema(description = "产品ID")
+    private String productId;
+
 }

src/main/java/com/tuoren/forward/mapper/DeviceMapper.java

@@ -32,7 +32,7 @@ public interface DeviceMapper {
     Integer existByMacOwner(String mac, String owner);
 
     @SqlLimit(alis = "d")
-    List<Device> blurrySearch(DeviceDto dto);
+    List<Device> selectSearch(DeviceDto dto);
 
     CountCategoryResp countProviceDevice();
 

src/main/java/com/tuoren/forward/service/DeviceService.java

@@ -63,11 +63,11 @@ public class DeviceService {
 	 * @param req
 	 * @return ResultPage<Device>
 	 */
-	public ResultPage<Device> blurrySearch(DeviceSearchReq req) {
+	public ResultPage<Device> selectSearch(DeviceSearchReq req) {
 		Page<Object> page = PageHelper.startPage(req.getPage(), req.getSize());
 		DeviceDto dto = new DeviceDto();
 		BeanUtils.copyProperties(req, dto);
-		List<Device> devices = deviceMapper.blurrySearch(dto);
+		List<Device> devices = deviceMapper.selectSearch(dto);
 		return ResultPage.success(devices,page.getTotal());
 	}
 	

src/main/resources/mapper/DeviceMapper.xml

@@ -29,10 +29,7 @@
         data
     </sql>
     <sql id="Base_Column_Relation">
-        d
-        .
-        id
-        , d.mac, d.name, d.alias,d.is_delete isDelete,d.sim sim,d.product_id productId, d.description, d.createtime, d.modifytime,
+        d.id, d.mac, d.name, d.alias,d.is_delete isDelete,d.sim sim,d.product_id productId, d.description, d.createtime, d.modifytime,
     d.tenant_id tenantId, d.data
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
@@ -66,10 +63,13 @@
     </select>
 
 
-    <select id="blurrySearch" resultMap="BaseResultMap">
+    <select id="selectSearch" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>
-        from device
+        <include refid="Base_Column_Relation"/>,
+        p.name productName,u.username
+        from device d
+        left join product p on d.product_id = p.id
+        left join user u on d.tenant_id = u.id
         <where>
             <if test="keyWord != null and keyWord != ''">
                 (
@@ -78,6 +78,9 @@
                 mac like CONCAT('%',#{keyWord,jdbcType=VARCHAR},'%')
                 )
             </if>
+            <if test="productId != null and productId != ''">
+                and d.product_id = #{productId,jdbcType=VARCHAR}
+            </if>
         </where>
         <if test="sort != null and sort != ''">
             order by ${sort}