北向 FSU联调代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/iot/SensorType.java

@@ -25,7 +25,7 @@ public enum SensorType {
 
     INFRARED_SENSOR(4181, "红外","FSU_Infrared"),
 
-    ALARM_SENSOR(41881, "盗情", StringUtil.EMPTY_STRING),
+    ALARM_SENSOR(41881, "盗情", "FSU_Theft"),
 
     SMART_METER(4160, "智能电表", "FSU_SmartMeter"),
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotAlarmRuleSourceServiceImpl.java

@@ -10,6 +10,8 @@ import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmRule;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmRuleSource;
 import com.xunmei.common.core.enums.OrgTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.SensorType;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.redis.utils.RedisUtils;
@@ -75,6 +77,16 @@ public class IotAlarmRuleSourceServiceImpl extends ServiceImpl<IotAlarmRuleSourc
         Page<IotAlarmRuleSourceDeviceVo> page = new Page<>();
         page.setSize(param.getSize());
         page.setCurrent(param.getPage());
+        if (ObjectUtil.isNotEmpty(param.getType())){
+            final SensorType sensorType = SensorType.getSensorTypeEnum(param.getType());
+            if (ObjectUtil.isNotEmpty(sensorType)){
+
+                final String productName = sensorType.getProductName();
+                final DeviceTypeEnum deviceTypeEnum = DeviceTypeEnum.valueOf(productName);
+                param.setType(Integer.parseInt(deviceTypeEnum.getCode()));
+
+            }
+        }
         Page<IotAlarmRuleSourceDeviceVo> result = iotAlarmRuleSourceMapper.selectDeviceList(page, param);
         final List<IotAlarmRuleSourceDeviceVo> records = result.getRecords();
         if (ObjectUtil.isEmpty(records)) {

soc-modules/soc-modules-iot/src/main/resources/mapper/IotAlarmRuleSourceMapper.xml

@@ -70,13 +70,13 @@
     </select>-->
     <select id="selectDeviceList" resultType="com.xunmei.iot.vo.alarm.IotAlarmRuleSourceDeviceVo">
         SELECT DISTINCT
-        d.unique_code AS deviceId,
+        concat(d.iot_token,'_',d.device_product,'_',d.device_code) AS deviceId,
         d.device_name AS deviceName,
         d.org_id AS orgId,
         d.org_path AS orgPath,
         b.short_name as org_name
         FROM
-        iot_device_status d
+        iot_device_info d
         LEFT JOIN sys_org b ON d.org_id = b.id
         where 1=1
         <if test="param.includeSub == false">