Browse Source

'优化下发门禁开门接口,放开domain必传的限制,以及优化设备批量导入-对接客户接口,增加设备UUid字段的赋值存库'

james 6 months ago
parent
commit
e6f2607019

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

@@ -395,6 +395,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                 devList.get(i).setCreatedTime(LocalDateTime.now());
                 devList.get(i).setTenantId(list.get(0).getTenantId());
                 devList.get(i).setServiceStatus(1);
+                devList.get(i).setDeviceUuid(UUIDUtils.uuid());
 
                 DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
                 dmpDeviceStatus.setDeviceId(devList.get(i).getDeviceId());

+ 1 - 1
service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingRoomController.java

@@ -49,7 +49,7 @@ public class MeetingRoomController {
     public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
                                                  @PathVariable("deviceId") String deviceId,
                                                  @RequestParam(value = "commandStr") String commandStr,
-                                                 @RequestParam(value = "domain") String domain){
+                                                 @RequestParam(value = "domain",required = false) String domain){
         Integer tenantId;
         if(StringUtils.isNotBlank(domain)){
             tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);