Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-module/src/main/java/com/makeit/module/controller/space/PlatRoomBedDeviceController.java

@@ -37,7 +37,7 @@ public class PlatRoomBedDeviceController {
     @ApiOperation("设备列表（选择设备)-房间绑定")
     @ApiOperation("设备列表（选择设备)-房间绑定")
     @PostMapping("pageRoomDevice")
     @PostMapping("pageRoomDevice")
     public ApiResponseEntity<PageVO<PlatDeviceDTO>> pageRoomDevice(@RequestBody PageReqDTO<PlatSpaceDeviceQueryDTO> page) {
     public ApiResponseEntity<PageVO<PlatDeviceDTO>> pageRoomDevice(@RequestBody PageReqDTO<PlatSpaceDeviceQueryDTO> page) {
-        //page.getData().setIsRoom(CommonEnum.YES.getValue());
+        page.getData().setIsRoom(CommonEnum.YES.getValue());
         PageVO<PlatDeviceDTO> data = platRoomBedDeviceService.pageDevice(page);
         PageVO<PlatDeviceDTO> data = platRoomBedDeviceService.pageDevice(page);
         return ApiResponseUtils.success(data);
         return ApiResponseUtils.success(data);
     }
     }

server-service/src/main/java/com/makeit/dto/saas/SaasPrivacyConfigDTO.java

@@ -26,7 +26,7 @@ public class SaasPrivacyConfigDTO implements Serializable {
 	@ApiModelProperty("标题")
 	@ApiModelProperty("标题")
 	private String title;
 	private String title;
 	
 	
-	@Size(max = 5000, message = "申请说明最长为5000字符")
+	@Size(max = 5000, message = "内容长度最长为5000字符")
 	@ApiModelProperty(value="内容")
 	@ApiModelProperty(value="内容")
 	private String content;
 	private String content;
 	
 	

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -433,7 +433,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         m.reset();
         m.reset();
         int i = 0;
         int i = 0;
         while (m.find()) {
         while (m.find()) {
-            m.appendReplacement(sb, param.get(i));
+            String paramValue = "";
+            if(param.size()>i) {
+               paramValue = param.get(i);
+            }
+            m.appendReplacement(sb, paramValue);
             i++;
             i++;
         }
         }
         m.appendTail(sb);
         m.appendTail(sb);

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java

@@ -98,11 +98,9 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
 
 
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
         queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
-        if (StringUtil.isNotEmpty(dto.getRoomId())) {
-            queryWrapper1.eq(PlatRoomBedDevice::getRoomId, dto.getRoomId());
-        }
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
             queryWrapper1.isNotNull(PlatRoomBedDevice::getBedId);
             queryWrapper1.isNotNull(PlatRoomBedDevice::getBedId);
+            queryWrapper1.eq(PlatRoomBedDevice::getRoomId, dto.getRoomId());
         }
         }
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());

server-service/src/main/java/com/makeit/service/saas/impl/PlatMenuServiceImpl.java

@@ -169,10 +169,12 @@ public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu>
      * @param dto
      * @param dto
      */
      */
     private void checkCode(PlatMenuDTOVO dto) {
     private void checkCode(PlatMenuDTOVO dto) {
-        PlatMenu old = getOne(new QueryWrapper<PlatMenu>().lambda()
-                .eq(PlatMenu::getCode, dto.getCode()));
-        if (old != null && !old.getId().equals(dto.getId())) {
-            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_MENU_CODE_DUPLICATE);
+        if(StringUtils.isNotBlank(dto.getCode())) {
+            PlatMenu old = getOne(new QueryWrapper<PlatMenu>().lambda()
+                    .eq(StringUtils.isNotBlank(dto.getCode()), PlatMenu::getCode, dto.getCode()));
+            if (old != null && !old.getId().equals(dto.getId())) {
+                throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_MENU_CODE_DUPLICATE);
+            }
         }
         }
     }
     }
 
 

server-service/src/main/java/com/makeit/task/IotSyncTask.java

@@ -107,7 +107,7 @@ public class IotSyncTask {
             }
             }
             platDevice.setOriDeviceId(iotDevice.getId());
             platDevice.setOriDeviceId(iotDevice.getId());
             platDevice.setName(iotDevice.getName());
             platDevice.setName(iotDevice.getName());
-            platDevice.setOrgId(tenantId);
+            //platDevice.setOrgId(tenantId);
             String productName = iotDevice.getProductName();
             String productName = iotDevice.getProductName();
             platDevice.setProductName(productName);
             platDevice.setProductName(productName);
             platDevice.setProductId(iotDevice.getProductId());
             platDevice.setProductId(iotDevice.getProductId());