Merge remote-tracking branch 'origin/master'

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/deviceProduct/DeviceProductBindDeviceBind.java

@@ -17,8 +17,9 @@ import java.util.List;
 @NoArgsConstructor
 public class DeviceProductBindDeviceBind {
 
-    @Schema(description = "产品名称")
+    @Schema(description = "产品ID")
     private String deviceProductId;
 
+    @Schema(description = "设备deviceId集合")
     private List<String> deviceIds = new ArrayList<>();
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/deviceProduct/DeviceProductService.java

@@ -48,7 +48,7 @@ public class DeviceProductService extends SuperService {
     private OrganizationServiceImpl organizationService;
 
     public ResultContent saveInfo(DeviceProductParam param) {
-        if (StringUtils.isNotEmpty(param.getProjectOid())) {
+        if (StringUtils.isEmpty(param.getProjectOid())) {
             return ResultContent.buildFail("projectOid不能为空");
         }
 
@@ -70,12 +70,12 @@ public class DeviceProductService extends SuperService {
                 return ResultContent.buildFail("数据不存在");
             }
             if (ObjectUtils.isNotEmpty(nameTemp) && !nameTemp.getId().equals(product.getId())) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, product.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, nameTemp.getName()));
             }
             initUpdateEntity(product);
         } else {
             if (ObjectUtils.isNotEmpty(nameTemp)) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, product.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, nameTemp.getName()));
             }
             product = new DeviceProduct();
             initEntityNoCheckOid(product);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/DeviceBindServiceImpl.java

@@ -2,20 +2,20 @@ package com.zhongshu.card.server.core.service.school;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.model.devices.DeviceBindModel;
 import com.zhongshu.card.client.model.devices.DeviceBindParam;
 import com.zhongshu.card.client.model.devices.DeviceBindSearch;
-import com.github.microservice.net.ResultContent;
-import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.service.school.DeviceBindService;
-import com.zhongshu.card.server.core.dao.org.OrganizationDao;
-import com.zhongshu.card.server.core.dao.school.AreaDao;
 import com.zhongshu.card.server.core.dao.devices.DeviceBindDao;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
+import com.zhongshu.card.server.core.dao.org.OrganizationDao;
+import com.zhongshu.card.server.core.dao.school.AreaDao;
+import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.school.Area;
-import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;