feats

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

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
-import com.yunzhi.nanyang.entity.TaMachinery;
-import com.yunzhi.nanyang.entity.TaOrg;
-import com.yunzhi.nanyang.entity.TaWorkMessage;
-import com.yunzhi.nanyang.entity.TdMachineryType;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.*;
 import com.yunzhi.nanyang.service.*;
 import com.yunzhi.nanyang.vo.ChartParam;
 import io.swagger.annotations.Api;
@@ -43,6 +41,9 @@ public class ScreenDataController extends BaseController {
     @Autowired
     ITaWorkMessageService iTaWorkMessageService;
 
+    @Autowired
+    ITdDeviceService iTdDeviceService;
+
 
     @GetMapping("/basic")
     @ApiOperation(value="基本数据统计", notes = "基本数据统计", httpMethod = "GET", response = ResponseBean.class)
@@ -103,7 +104,6 @@ public class ScreenDataController extends BaseController {
         return ResponseBean.success(result);
     }
 
-
     @GetMapping("/machinery/all")
     @ApiOperation(value="依据类型查询农机", notes = "依据类型查询农机", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getMachineryOfType(@ApiParam("农机类型") @RequestParam(value = "typeId", required = false) String typeId) throws Exception {
@@ -118,4 +118,20 @@ public class ScreenDataController extends BaseController {
         List<TaWorkMessage> result = iTaWorkMessageService.listByType(messageType, limit);
         return ResponseBean.success(result);
     }
+
+    @GetMapping("/machinery-device")
+    @ApiOperation(value="依据类型查询绑定设备农机", notes = "依据类型查询绑定设备农机", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDeviceMachineryList(@ApiParam("设备类型") @RequestParam(value = "deviceType", required = false) String deviceType) throws Exception {
+
+        List<String> typeList = new ArrayList<>();
+        if (StringUtils.isEmpty(deviceType)) {
+            typeList.add("shensong");
+            typeList.add("feifang");
+        } else {
+            typeList.add(deviceType);
+        }
+
+        List<TdDevice> result = iTdDeviceService.getListByTypes(typeList);
+        return ResponseBean.success(result);
+    }
 }

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备表 Mapper 接口
@@ -20,4 +22,6 @@ public interface TdDeviceMapper extends BaseMapper<TdDevice> {
     IPage<TdDevice> getPageBy(IPage<TdDevice> pg, @Param("deviceType") String deviceType,@Param("onlineStatus") Integer onlineStatus);
 
     TdDevice getExistByDevice(@Param("deviceType") String deviceType,@Param("deviceNo") String deviceNo);
+
+    List<TdDevice> getListByTypes(@Param("typeList") List<String> typeList);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TdDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备表 服务类
@@ -17,4 +19,6 @@ public interface ITdDeviceService extends IBaseService<TdDevice> {
     IPage<TdDevice> getPageBy(IPage<TdDevice> pg, String deviceType, Integer onlineStatus);
 
     TdDevice getExistByDevice(String deviceType, String deviceNo);
+
+    List<TdDevice> getListByTypes(List<String> typeList);
 }

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

@@ -7,6 +7,8 @@ import com.yunzhi.nanyang.service.ITdDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备表 服务实现类
@@ -27,4 +29,9 @@ public class TdDeviceServiceImpl extends BaseServiceImpl<TdDeviceMapper, TdDevic
     public TdDevice getExistByDevice(String deviceType, String deviceNo) {
         return baseMapper.getExistByDevice(deviceType, deviceNo);
     }
+
+    @Override
+    public List<TdDevice> getListByTypes(List<String> typeList) {
+        return baseMapper.getListByTypes(typeList);
+    }
 }

src/main/resources/mapper/TdDeviceMapper.xml

@@ -40,4 +40,20 @@
           AND t.device_no = #{deviceNo}
           AND t.`status` > -1
     </select>
+    <select id="getListByTypes" resultType="com.yunzhi.nanyang.entity.TdDevice">
+        SELECT
+            t.*,
+            s.`name` AS machinery_name
+        FROM
+            td_device t
+                INNER JOIN ta_machinery s ON t.machinery_id = s.machinery_id
+        WHERE
+            t.location IS NOT NULL
+          AND t.device_type IN
+            <foreach collection="typeList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>