feats

src/main/java/com/yunzhi/nanyang/controller/TdDeviceController.java

@@ -52,25 +52,24 @@ public class TdDeviceController extends BaseController {
     @Autowired
     public ITaMachineryService iTaMachineryService;
 
-//
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/tdDevice",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean tdDeviceList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TdDevice> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TdDevice> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TdDevice> result = iTdDeviceService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/device",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tdDeviceList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("设备分类") @RequestParam(value ="deviceType", required = false) String deviceType,
+                                     @ApiParam("在线状态") @RequestParam(value ="onlineStatus", required = false) Integer onlineStatus) throws Exception{
+
+		    IPage<TdDevice> pg = new Page<>(pageNum, pageSize);
+            IPage<TdDevice> result = iTdDeviceService.getPageBy(pg, deviceType, onlineStatus);
+            return ResponseBean.success(result);
+    }
 
     /**
      * 保存对象

src/main/java/com/yunzhi/nanyang/controller/TdRawDeviceController.java

@@ -43,29 +43,29 @@ public class TdRawDeviceController extends BaseController {
 //        return ResponseBean.success(tdRawDeviceService.getById(id));
 //    }
 
-    /**
-     * 分页查询
-     *
-     * @param pageNum  当前页码
-     * @param pageSize 每页条数
-     * @return 查询结果
-     */
-    @ApiOperation("分页查询")
-    @GetMapping("/admin/raw-device")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                             @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
-                             @ApiParam("设备状态") @RequestParam(value = "deviceStatus", required = false) Integer deviceStatus) throws Exception {
-
-        IPage<TdRawDevice> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TdRawDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtils.isEmpty(deviceKind), "device_kind", deviceKind);
-        queryWrapper.eq(null != deviceStatus, "device_status", deviceStatus);
-        queryWrapper.orderByDesc("create_date");
-        IPage<TdRawDevice> result = tdRawDeviceService.page(pg);
-
-        return ResponseBean.success(result);
-    }
+//    /**
+//     * 分页查询
+//     *
+//     * @param pageNum  当前页码
+//     * @param pageSize 每页条数
+//     * @return 查询结果
+//     */
+//    @ApiOperation("分页查询")
+//    @GetMapping("/admin/raw-device")
+//    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+//                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+//                             @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
+//                             @ApiParam("设备状态") @RequestParam(value = "deviceStatus", required = false) Integer deviceStatus) throws Exception {
+//
+//        IPage<TdRawDevice> pg = new Page<>(pageNum, pageSize);
+//        QueryWrapper<TdRawDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq(!StringUtils.isEmpty(deviceKind), "device_kind", deviceKind);
+//        queryWrapper.eq(null != deviceStatus, "device_status", deviceStatus);
+//        queryWrapper.orderByDesc("create_date");
+//        IPage<TdRawDevice> result = tdRawDeviceService.page(pg);
+//
+//        return ResponseBean.success(result);
+//    }
 
 //    /** 
 //     * 新增数据

src/main/java/com/yunzhi/nanyang/entity/TdDevice.java

@@ -2,6 +2,8 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -39,9 +41,19 @@ public class TdDevice implements Serializable {
     @ApiModelProperty(value = "农机ID")
     private String machineryId;
 
+    @ApiModelProperty(value = "农机名称")
+    @TableField(exist = false)
+    private String machineryName;
+
     @ApiModelProperty(value = "接口配置")
     private String apiConfig;
 
+    @ApiModelProperty(value = "定位")
+    private String location;
+
+    @ApiModelProperty(value = "在线状态")
+    private Integer onlineStatus;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 
@@ -52,4 +64,7 @@ public class TdDevice implements Serializable {
     private LocalDateTime createDate;
 
 
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateDate;
+
 }

src/main/java/com/yunzhi/nanyang/mapper/TdDeviceMapper.java

@@ -1,8 +1,10 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TdDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdDeviceMapper extends BaseMapper<TdDevice> {
 
+    IPage<TdDevice> getPageBy(IPage<TdDevice> pg, @Param("deviceType") String deviceType,@Param("onlineStatus") Integer onlineStatus);
 }

src/main/java/com/yunzhi/nanyang/service/ITdDeviceService.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TdDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITdDeviceService extends IBaseService<TdDevice> {
 
+    IPage<TdDevice> getPageBy(IPage<TdDevice> pg, String deviceType, Integer onlineStatus);
 }

src/main/java/com/yunzhi/nanyang/service/impl/TdDeviceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TdDevice;
 import com.yunzhi.nanyang.mapper.TdDeviceMapper;
 import com.yunzhi.nanyang.service.ITdDeviceService;
@@ -17,4 +18,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TdDeviceServiceImpl extends BaseServiceImpl<TdDeviceMapper, TdDevice> implements ITdDeviceService {
 
+    @Override
+    public IPage<TdDevice> getPageBy(IPage<TdDevice> pg, String deviceType, Integer onlineStatus) {
+        return baseMapper.getPageBy(pg, deviceType, onlineStatus);
+    }
 }

src/main/resources/mapper/TdDeviceMapper.xml

@@ -2,4 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TdDeviceMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TdDevice">
+        SELECT
+            t.device_no,
+            t.device_kind AS device_type,
+            s.machinery_id,
+            m.`name` AS machinery_name,
+            s.api_config,
+            s.`status`,
+            t.location,
+            t.device_status AS online_status,
+            t.create_date,
+            t.update_date
+        FROM
+            td_raw_device t
+                LEFT JOIN td_device s ON t.device_kind = s.device_type
+                AND t.device_no = s.device_no
+                LEFT JOIN ta_machinery m ON s.machinery_id = m.machinery_id
+        WHERE
+            t.device_kind = #{deviceType}
+          AND t.device_status = #{onlineStatus}
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>