Merge branch 'han' of uskycloud/usky-modules into server-165

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

@@ -215,7 +215,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
         queryWrapper1.select(DmpDeviceInfo::getId, DmpDeviceInfo::getDeviceId,
                 DmpDeviceInfo::getDeviceName, DmpDeviceInfo::getInstallAddress,DmpDeviceInfo::getDeviceType)
                 .eq(StringUtils.isNotBlank(deviceId),DmpDeviceInfo::getDeviceId, deviceId)
-                .eq(StringUtils.isNotBlank(deviceType),DmpDeviceInfo::getDeviceType,Integer.parseInt(deviceType))
+                .eq(StringUtils.isNotBlank(deviceType),DmpDeviceInfo::getDeviceType,deviceType)
                 .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
                 .eq(DmpDeviceInfo::getDeleteFlag,0);
         page = dmpDeviceInfoService.page(page,queryWrapper1);

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

@@ -57,20 +57,25 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
         if (checkNameUnique(dmpProductInfo)){
             throw new BusinessException("新增产品信息'" + dmpProductInfo.getProductCode() + "'失败，产品信息已存在");
         }
+        int deviceType = dmpProductInfo.getDeviceType();
+        LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DmpDeviceType::getDataField)
+                .eq(DmpDeviceType::getTypeCode,deviceType);
+        DmpDeviceType one  = dmpDeviceTypeService.getOne(queryWrapper);
+        String dd = one.getDataField();
+        if (StringUtils.isBlank(dd) || dd.length() == 0){
+            throw new BusinessException("新增产品信息'" + dmpProductInfo.getProductCode() + "'失败，设备类型缺少属性");
+        }
         dmpProductInfo.setCreatedBy(SecurityUtils.getUsername());
         dmpProductInfo.setCreatedTime(new Date());
         dmpProductInfo.setDeleteFlag(0);
         dmpProductInfo.setTenantId(SecurityUtils.getTenantId());
         this.save(dmpProductInfo);
         int productId = dmpProductInfo.getId();
-        int deviceType = dmpProductInfo.getDeviceType();
-        LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DmpDeviceType::getDataField)
-                .eq(DmpDeviceType::getTypeCode,deviceType);
-        DmpDeviceType one  = dmpDeviceTypeService.getOne(queryWrapper);
         if(null != one){
             String dataField = one.getDataField();
-            JSONArray array =  JSONArray.parseArray(dataField);
+            JSONArray array = new JSONArray();
+            array =  JSONArray.parseArray(dataField);
             if(array.size()>0){
                 for(int i=0;i<array.size();i++){
                     JSONObject obj = JSONObject.parseObject(array.getString(i));