Bladeren bron

新增 首页获取设备类型统计接口

zhaiyifei 11 maanden geleden
bovenliggende
commit
c0a5b9392c

+ 1 - 1
src/main/java/com/yunfeiyun/agmp/iotm/web/controller/TosHomeController.java

@@ -19,7 +19,7 @@ import java.util.List;
  */
  */
 @RestController
 @RestController
 @RequestMapping("/iot/home")
 @RequestMapping("/iot/home")
-public class TosHomeController extends BaseController
+public class IotHomeController extends BaseController
 {
 {
 
 
     @Autowired
     @Autowired

+ 3 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/IotDeviceMapper.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.iotm.web.mapper;
 package com.yunfeiyun.agmp.iotm.web.mapper;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import com.yunfeiyun.agmp.iot.common.domain.resvo.IotIndexDevicetypeCountResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
 
 
@@ -60,4 +61,6 @@ public interface IotDeviceMapper
     int setConnNullByDevBids(List<IotDevice> iotDeviceList);
     int setConnNullByDevBids(List<IotDevice> iotDeviceList);
 
 
     public int updateIotDeviceExtInfo(IotDevice iotDevice);
     public int updateIotDeviceExtInfo(IotDevice iotDevice);
+
+    public List<IotIndexDevicetypeCountResVo> selectDeviceTypeCountList(IotDevice iotDevice);
 }
 }

+ 3 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotDeviceService.java

@@ -2,6 +2,7 @@ package com.yunfeiyun.agmp.iotm.web.service;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
+import com.yunfeiyun.agmp.iot.common.domain.resvo.IotIndexDevicetypeCountResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceEditReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceEditReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
@@ -75,4 +76,6 @@ public interface IIotDeviceService {
 
 
     public int updateIotDeviceExtInfo(IotDevice iotDevice);
     public int updateIotDeviceExtInfo(IotDevice iotDevice);
 
 
+    public List<IotIndexDevicetypeCountResVo> selectDeviceTypeCountList(IotDevice iotDevice);
+
 }
 }

+ 9 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotHomeService.java

@@ -0,0 +1,9 @@
+package com.yunfeiyun.agmp.iotm.web.service;
+
+import com.yunfeiyun.agmp.iot.common.domain.resvo.IotIndexDevicetypeCountResVo;
+
+import java.util.List;
+
+public interface IIotHomeService {
+    public List<IotIndexDevicetypeCountResVo> getDeviceTypeCountList();
+}

+ 7 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotDeviceServiceImpl.java

@@ -7,6 +7,7 @@ import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
+import com.yunfeiyun.agmp.iot.common.domain.resvo.IotIndexDevicetypeCountResVo;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceDelStatusEnum;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceDelStatusEnum;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceStatusTypeEnum;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceStatusTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
@@ -417,4 +418,10 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
         updateIotDevice.setDevUpdateddate(DateUtils.dateTimeNow());
         updateIotDevice.setDevUpdateddate(DateUtils.dateTimeNow());
         return iotDeviceMapper.updateIotDeviceExtInfo(iotDevice);
         return iotDeviceMapper.updateIotDeviceExtInfo(iotDevice);
     }
     }
+
+    @Override
+    public List<IotIndexDevicetypeCountResVo> selectDeviceTypeCountList(IotDevice iotDevice) {
+        iotDevice.setTid(SecurityUtils.getTid());
+        return iotDeviceMapper.selectDeviceTypeCountList(iotDevice);
+    }
 }
 }

+ 21 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotHomeServiceImpl.java

@@ -0,0 +1,21 @@
+package com.yunfeiyun.agmp.iotm.web.service.impl;
+
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import com.yunfeiyun.agmp.iot.common.domain.resvo.IotIndexDevicetypeCountResVo;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotHomeService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public class IotHomeServiceImpl implements IIotHomeService {
+
+    @Autowired
+    private IIotDeviceService iIotDeviceService;
+
+    @Override
+    public List<IotIndexDevicetypeCountResVo> getDeviceTypeCountList() {
+        IotDevice iotDevice = new IotDevice();
+        return iIotDeviceService.selectDeviceTypeCountList(iotDevice);
+    }
+}

+ 14 - 0
src/main/resources/mapper/IotDeviceMapper.xml

@@ -274,5 +274,19 @@
         where devBid = #{devBid} and devDelstatus = '0'
         where devBid = #{devBid} and devDelstatus = '0'
     </delete>
     </delete>
 
 
+    <select id="selectDeviceTypeCountList" parameterType="IotDevice"
+            resultType="com.yunfeiyun.agmp.iot.common.domain.resvo.IotIndexDevicetypeCountResVo">
+        SELECT d.devtypeBid, COUNT(d.devtypeBid) AS count, dt.devtypeName, dt.devtypePreview
+        FROM IotDevice AS d
+            LEFT JOIN TosDevicetype AS dt ON dt.devtypeBid = d.devtypeBid
+        WHERE d.tid = "a34f7574-c675-45de-95d8-65fa9283170f"
+            AND d.devDelstatus = "0"
+            AND (
+                (d.devLng IS NOT NULL and d.devLat IS NOT NULL)
+                OR (d.devLngalign IS NOT NULL AND d.devLatalign IS NOT NULL)
+            )
+        GROUP BY d.devtypeBid
+    </select>
+
 
 
 </mapper>
 </mapper>