调整vpp设备信息同步物联中心的逻辑

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceInfoMapper.java

@@ -42,5 +42,4 @@ public interface DmpDeviceInfoMapper extends CrudMapper<DmpDeviceInfo> {
     List<BaseAlarm> baseAlarmList(@Param("deviceIdList") List<String> deviceIdList);
 
     Integer sysTenantId(@Param("domain") String domain);
-    Integer sysTenantCount(@Param("tenantId") Integer tenantId);
 }

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

@@ -546,9 +546,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             dmpDeviceInfo.setProductId(list.get(0).getId());
             dmpDeviceInfo.setCreatedBy(SecurityUtils.getUsername());
             dmpDeviceInfo.setCreatedTime(LocalDateTime.now());
-            if(dmpDeviceInfo.getTenantId() == null) {
-                dmpDeviceInfo.setTenantId(SecurityUtils.getTenantId());
-            }
+            dmpDeviceInfo.setTenantId(SecurityUtils.getTenantId());
 
             dmpDeviceInfo.setServiceStatus(1);
             if (StringUtils.isBlank(dmpDeviceInfo.getDeviceUuid())) {

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceInfoMapper.xml

@@ -146,15 +146,6 @@
             </if>
         </where>
     </select>
-    <select id="sysTenantCount" resultType="integer">
-        select count(*)
-        from sys_tenant
-        <where>
-            <if test="1 == 1">
-                and id = #{tenantId}
-            </if>
-        </where>
-    </select>
     <select id="baseAlarmList" resultType="com.usky.iot.domain.BaseAlarm">
         select *
         from base_alarm

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/impl/VppDeviceServiceImpl.java

@@ -152,9 +152,6 @@ public class VppDeviceServiceImpl implements VppDeviceService {
         if (request == null || !StringUtils.hasText(request.getDeviceCode())) {
             throw new BusinessException("设备编号不能为空");
         }
-        if (!StringUtils.hasText(request.getDeviceUuid())) {
-            throw new BusinessException("设备uuid不能为空");
-        }
         if (!StringUtils.hasText(request.getDeviceName())) {
             throw new BusinessException("设备名称不能为空");
         }
@@ -162,7 +159,6 @@ public class VppDeviceServiceImpl implements VppDeviceService {
             throw new BusinessException("设备类型不能为空");
         }
         ensureUniqueField(VppDevice::getDeviceCode, request.getDeviceCode(), excludeId, "设备编号已存在");
-        ensureUniqueField(VppDevice::getDeviceUuid, request.getDeviceUuid(), excludeId, "设备uuid已存在");
     }
 
     private void ensureUniqueField(com.baomidou.mybatisplus.core.toolkit.support.SFunction<VppDevice, ?> field,
@@ -180,7 +176,6 @@ public class VppDeviceServiceImpl implements VppDeviceService {
 
     private void applyRequest(VppDevice device, DeviceRequest request) {
         device.setDeviceCode(request.getDeviceCode());
-        device.setDeviceUuid(request.getDeviceUuid());
         device.setDeviceName(request.getDeviceName());
         device.setDeviceType(request.getDeviceType());
         device.setManufacturer(request.getManufacturer());

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/vo/DeviceRequest.java

@@ -11,7 +11,6 @@ import java.math.BigDecimal;
 public class DeviceRequest {
 
     private String deviceCode;
-    private String deviceUuid;
     private String deviceName;
     private String deviceType;
     private String manufacturer;