3
2

2 Commity a856467ac6 ... ba8e3f463f

Autor SHA1 Správa Dátum
  james ba8e3f463f Merge branch 'usky-zyj' into server-165 1 týždeň pred
  james cf41a3ceb8 下发门禁开门接口改成下发设备控制命令通用接口 1 týždeň pred

+ 0 - 6
service-iot/service-iot-biz/pom.xml

@@ -31,12 +31,6 @@
             <version>0.0.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>data-transfer-api</artifactId>
-            <version>0.0.1</version>
-        </dependency>
-
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>

+ 2 - 2
service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DeviceHttpController.java

@@ -58,9 +58,9 @@ public class DeviceHttpController {
     }
 
     /**
-     * 下发门禁开门
+     * 下发设备控制命令
      */
-    @GetMapping("/doorControl")
+    @GetMapping("/control")
     public ApiResult<Map<String,Object>> control(@RequestParam("productCode") String productCode,
                                                  @RequestParam("deviceId") String deviceId,
                                                  @RequestParam("commandCode") String commandCode,

+ 1 - 1
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -98,7 +98,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
         Map<String,Object> map = new HashMap<>();
         map.put("method","control");
         Map<String,Object> map1 = new HashMap<>();
-        map1.put("device_id",deviceId);
+        map1.put("deviceId",deviceId);
         map1.put("commandCode",commandCode);
         map1.put("commandValue",commandValue);
         map.put("params",map1);