bug修复

zoniot-common/zoniot-iot-sync/src/main/java/com/bz/zoneiot/iot/sync/service/impl/SyncDeviceServiceImpl.java

@@ -63,7 +63,7 @@ public class SyncDeviceServiceImpl extends AuthIotService implements SyncDeviceS
         Map<String, Object> map = new HashMap<>(1);
         map.put("deviceId", deviceId);
         map.put("deviceStatus", deviceStatus);
-        HttpUtil.postParamsBody(url, map, super.getToken(), null);
+        HttpUtil.postParamsUrl(url, map, super.getToken(), null);
         return 1L;
     }
 

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/dao/DeviceMapper.java

@@ -170,11 +170,11 @@ public interface DeviceMapper {
     /**
     * 根据场景类型查找设备
     * @author Andy
-    * @date 16:21 2021/10/26
+    * @date 16:52 2021/11/4
     * @param deviceTypeId:
-    * @param sceneIds:
+    * @param sceneTypeIds:
     * @param userCondition:
-    * @return java.util.List<DeviceVo>
+    * @return java.util.List<com.bz.zoneiot.water.api.vo.DeviceVo>
     **/
     List<DeviceVo> selectListBySceneType(@Param("deviceTypeId") Integer deviceTypeId, @Param("sceneTypeIds") List<Long> sceneTypeIds, @Param("user")UserCondition userCondition);
 

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/DeviceMapper.xml

@@ -512,7 +512,7 @@
         update sms_device set ENABLE_STATE =#{state} where id = #{id}
     </update>
 
-    <select id="findDeviceIdByIotDeviceId">
+    <select id="findDeviceIdByIotDeviceId" resultType="java.lang.Long">
         select DEVICE_ID from sms_device where IOT_DEVICE_ID = #{deviceId}
     </select>
 

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/DeviceServiceImpl.java

@@ -127,7 +127,11 @@ public class DeviceServiceImpl implements DeviceService {
 
     @Override
     public Integer updateDeviceState(Long id, int state){
-        if (syncDeviceService.updateDeviceStatus(id, state) > 0){
+        DeviceVo deviceVo = deviceMapper.selectById(id);
+        if (deviceVo == null) {
+            throw BusinessException.builder(500, "同步设备信息为空");
+        }
+        if (syncDeviceService.updateDeviceStatus(deviceVo.getIotDeviceId(), state) > 0){
             return deviceMapper.updateDeviceState(id, state);
         }
         throw BusinessException.builder(500, "同步更新物联网失败");