优化设备信息类型-列表查询接口，增加类型所属领域(1、消防 2、园区)刷选条件

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDeviceTypeController.java

@@ -71,9 +71,10 @@ public class DmpDeviceTypeController {
     @GetMapping("getDeviceTypeList")
     public ApiResult<CommonPage<DmpDeviceType>> getDeviceTypeList(@RequestParam(value = "typeCode",required = false) String typeCode,
                                                                   @RequestParam(value = "typeName",required = false) String typeName,
+                                                                  @RequestParam(value = "typeDomain",required = false) Integer typeDomain,
                                                                   @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                                   @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
-        return ApiResult.success(dmpDeviceTypeService.getDeviceTypeList(typeCode,typeName,pageNum,pageSize));
+        return ApiResult.success(dmpDeviceTypeService.getDeviceTypeList(typeCode,typeName,typeDomain,pageNum,pageSize));
     }
 
     /**

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceTypeService.java

@@ -24,7 +24,7 @@ public interface DmpDeviceTypeService extends CrudService<DmpDeviceType> {
 
     void remove(Integer id);
 
-    CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer pageNum, Integer pageSize);
+    CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer typeDomain, Integer pageNum, Integer pageSize);
 
     List<DmpDeviceType> tenantIdDeviceTypeList();
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceTypeServiceImpl.java

@@ -84,11 +84,12 @@ public class DmpDeviceTypeServiceImpl extends AbstractCrudService<DmpDeviceTypeM
     }
 
     @Override
-    public CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer pageNum, Integer pageSize) {
+    public CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer typeDomain, Integer pageNum, Integer pageSize) {
         IPage<DmpDeviceType> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(StringUtils.isNotBlank(typeCode), DmpDeviceType::getTypeCode, typeCode)
-                .like(StringUtils.isNotBlank(typeName), DmpDeviceType::getTypeName, typeName);
+                .like(StringUtils.isNotBlank(typeName), DmpDeviceType::getTypeName, typeName)
+                .eq(typeDomain != null,DmpDeviceType::getTypeDomain,typeDomain);
         page = this.page(page, queryWrapper);
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingInfoServiceImpl.java

@@ -604,7 +604,8 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
                             if(code.getCode() != null && code.getCode().equals("OK")) {
                                 //请求成功
                             }else {
-                                throw new BusinessException("发送短信失败");
+//                                throw new BusinessException("发送短信失败");
+                                log.info(dmUser.getPhonenumber()+"发送短信失败");
                             }
                         }