设备查询

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceMapper.java

@@ -158,7 +158,22 @@ public interface DeviceMapper {
      **/
     int updateByDeviceData(Device device);
 
+    /*
+     * @description 计算水表总数
+     * @param
+     * @return
+     * @author linqingwei
+     **/
     int countWaterMeter();
 
+    /**
+     * @param startIndex
+     * @param pageSize
+     * @return
+     * @description 全部设备分页
+     * @author linqingwei
+     **/
     List<WaterMeterDto> findWaterMeterListWithPage(@Param("startIndex") int startIndex, @Param("pageSize") int pageSize);
+
+    List<DeviceVo> queryDeviceInfoList(@Param("deviceNo") String deviceNo, @Param("meterNo") String meterNo, @Param("userCondition") UserCondition userCondition);
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -725,4 +725,43 @@
     where rd.status = 1
     order by rd.id asc
   </select>
+
+  <select id="queryDeviceInfoList" resultType="com.zcxk.rmcp.api.vo.DeviceVo">
+    select
+            rd.id,
+            rd.company_org_id,
+            rd.dept_org_id,
+            rd.product_id,
+            rd.community_id,
+            rd.device_no,
+            rd.meter_no,
+            rd.file_no,
+            rd.seal_no,
+            rd.device_status,
+            rd.read_data,
+            rd.valve_status,
+            rd.last_receive_time,
+            rd.address,
+            rd.lng,
+            rd.lat,
+            rp.product_name,
+            rp.product_model,
+            rp.is_support_valve,
+            rm.name as manufacturer_name,
+            roc.ORG_NAME as company_name,
+            rod.ORG_NAME as dept_name,
+            rc.name as community_name
+    from rmcp_device rd
+                 left join rmcp_product rp on (rp.id = rd.product_id)
+                 left join rmcp_manufacturer rm on (rm.id = rp.manufacturer_id)
+                 left join rmcp_org roc on (roc.ID = rd.company_org_id)
+                 left join rmcp_org rod on (rod.ID = rd.dept_org_id)
+                 left join rmcp_community rc on (rc.id = rd.community_id)
+    <where>
+    rd.status = 1
+      <if test="deviceNo != null and deviceNo != ''"> AND rd.device_no = #{deviceNo}</if>
+      <if test="meterNo != null and meterNo != ''"> AND rd.meter_no = #{meterNo}</if>
+    <include refid="permissionCondition"/>
+    </where>
+  </select>
 </mapper>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -153,4 +153,16 @@ public class DeviceController {
         return AjaxMessage.success(dataServiceService.getDataItem(deviceDataDto));
     }
 
+
+    @ResponseBody
+    @GetMapping("/queryDeviceInfoList")
+    @ApiOperation(value = "设备查询接口")
+    public AjaxMessage<List<DeviceVo>> queryDeviceInfoList(
+            @ApiParam(value = "设备编号", required = false) @RequestParam(required = false) String deviceNo,
+            @ApiParam(value = "水表电子号", required = false) @RequestParam(required = false) String meterNo
+    ){
+        List<DeviceVo> list = deviceService.queryDeviceInfoList(deviceNo, meterNo);
+        return AjaxMessage.success(list);
+    }
+
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/DeviceService.java

@@ -114,4 +114,12 @@ public interface DeviceService{
      **/
     void batchValve(List<Long> ids, Integer valveStatus);
 
+    /**
+     * @description
+     * @param deviceNo
+     * @param meterNo
+     * @return
+     * @author linqingwei
+     **/
+    List<DeviceVo> queryDeviceInfoList(String deviceNo, String meterNo);
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/DeviceServiceImpl.java

@@ -527,4 +527,9 @@ public class DeviceServiceImpl implements DeviceService{
         log.info("begin batchValve ids:{},valveStatus:{}",ids,valveStatus);
         log.info("end batchValve");
     }
+
+    @Override
+    public List<DeviceVo> queryDeviceInfoList(String deviceNo, String meterNo) {
+        return deviceMapper.queryDeviceInfoList(deviceNo,meterNo,UserUtil.getCurrentUser().getUserCondition());
+    }
 }