Merge branch 'vpp-zyj' into server-165

service-iot/service-iot-api/src/main/java/com/usky/iot/RemoteIotTaskService.java

@@ -24,10 +24,6 @@ public interface RemoteIotTaskService {
     @GetMapping("/addDeviceInfo")
     void addDeviceInfo(@RequestParam("productCode") String productCode, @RequestParam(value = "deviceUuid") String deviceUuid, @RequestParam(value = "deviceId") String deviceId, @RequestParam(value = "deviceName") String deviceName, @RequestParam(value = "installAddress") String installAddress, @RequestParam(value = "serviceStatus") Integer serviceStatus);
 
-
-    @GetMapping("/addSubsystemDeviceInfo")
-    void addSubsystemDeviceInfo(@RequestParam(value = "deviceUuid") String deviceUuid, @RequestParam(value = "deviceId") String deviceId, @RequestParam(value = "tenantId") Integer tenantId);
-
     @GetMapping("/deleteDeviceInfo")
     void deleteDeviceInfo(@RequestParam(value = "deviceUuid") String deviceUuid);
 }

service-iot/service-iot-api/src/main/java/com/usky/iot/factory/RemoteIotTaskFactory.java

@@ -49,11 +49,6 @@ public class RemoteIotTaskFactory implements FallbackFactory<RemoteIotTaskServic
                 throw new FeignBadRequestException(500,"新增设备信息异常"+throwable.getMessage());
             }
 
-            @Override
-            public void addSubsystemDeviceInfo(String deviceUuid, String deviceId, Integer tenantId) {
-                throw new FeignBadRequestException(500,"新增子系统设备信息异常"+throwable.getMessage());
-            }
-
             @Override
             public void deleteDeviceInfo(String deviceUuid) {
                 throw new FeignBadRequestException(500,"删除设备信息异常"+throwable.getMessage());

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/api/ServiceIotTaskApi.java

@@ -61,20 +61,6 @@ public class ServiceIotTaskApi implements RemoteIotTaskService {
         dmpDeviceInfoService.add(dmpDeviceInfo);
     }
 
-    @Override
-    public void addSubsystemDeviceInfo(String deviceUuid, String deviceId, Integer tenantId){
-        DmpDeviceInfo dmpDeviceInfo = new DmpDeviceInfo();
-        dmpDeviceInfo.setProductCode("");
-        dmpDeviceInfo.setDeviceUuid(deviceUuid);
-        dmpDeviceInfo.setDeviceId(deviceId);
-        dmpDeviceInfo.setDeviceName("");
-        dmpDeviceInfo.setInstallAddress("");
-        dmpDeviceInfo.setServiceStatus(1);
-        dmpDeviceInfo.setTenantId(tenantId);
-
-        dmpDeviceInfoService.add(dmpDeviceInfo);
-    }
-
     @Override
     public void deleteDeviceInfo(String deviceUuid){
         LambdaQueryWrapper<DmpDeviceInfo> deviceQueryWrapper = Wrappers.lambdaQuery();

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

@@ -53,17 +53,6 @@ public class DmpDeviceInfoController {
         return ApiResult.success();
     }
 
-    /**
-     * 物联中心绑定子系统同步过来的设备
-     * @param dmpDeviceInfo
-     * @return
-     */
-    @PutMapping
-    public ApiResult<Void> bindSubsystemDevice(@RequestBody DmpDeviceInfo dmpDeviceInfo) {
-        dmpDeviceInfoService.bindSubsystemDevice(dmpDeviceInfo);
-        return ApiResult.success();
-    }
-
     /**
      * 更新设备列表状态
      * @param queryVO

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/DmpDeviceInfoService.java

@@ -29,8 +29,6 @@ public interface DmpDeviceInfoService extends CrudService<DmpDeviceInfo> {
 
     void update(DmpDeviceInfo dmpDeviceInfo);
 
-    void bindSubsystemDevice(DmpDeviceInfo dmpDeviceInfo);
-
     boolean checkNameUnique(DmpDeviceInfo dmpDeviceInfo);
 
     boolean checkNameUnique1(DmpDeviceInfo dmpDeviceInfo,Integer tenantId);

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

@@ -541,18 +541,12 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             throw new BusinessException("新增设备信息'" + dmpDeviceInfo.getDeviceId() + "'失败，设备信息已存在");
         }
         List<DmpProductInfo> list = baseMapper.getProductInfo(dmpDeviceInfo.getProductCode());
-        int count = 0;
-        if(dmpDeviceInfo.getTenantId() != null){
-            count = baseMapper.sysTenantCount(dmpDeviceInfo.getTenantId());
-        }
         if (CollectionUtils.isNotEmpty(list)) {
             dmpDeviceInfo.setDeviceType(list.get(0).getDeviceType());
             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())) {
@@ -570,24 +564,8 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             dmpDeviceStatus.setProductCode(dmpDeviceInfo.getProductCode());
             dmpDeviceStatus.setDeviceUuid(dmpDeviceInfo.getDeviceUuid());
             dmpDeviceStatusService.save(dmpDeviceStatus);
-        } else if(count > 0){  //子系统同步到平台
-            dmpDeviceInfo.setDeviceType(Integer.valueOf(""));
-            dmpDeviceInfo.setProductId(Integer.valueOf(""));
-            dmpDeviceInfo.setCreatedBy(SecurityUtils.getUsername());
-            dmpDeviceInfo.setCreatedTime(LocalDateTime.now());
-            dmpDeviceInfo.setServiceStatus(1);
-            this.save(dmpDeviceInfo);
-
-            DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
-            dmpDeviceStatus.setDeviceId(dmpDeviceInfo.getDeviceId());
-            dmpDeviceStatus.setProductId(Integer.valueOf(""));
-            dmpDeviceStatus.setDeviceStatus(2);
-            dmpDeviceStatus.setLastOfflineTime(LocalDateTime.now());
-            dmpDeviceStatus.setProductCode("");
-            dmpDeviceStatus.setDeviceUuid(dmpDeviceInfo.getDeviceUuid());
-            dmpDeviceStatusService.save(dmpDeviceStatus);
         } else {
-            throw new BusinessException("新增设备信息'" + dmpDeviceInfo.getDeviceId() + "'失败，无对应产品信息或租户Id");
+            throw new BusinessException("新增设备信息'" + dmpDeviceInfo.getDeviceId() + "'失败，无对应产品信息");
         }
     }
 
@@ -602,22 +580,6 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
 
     }
 
-    @Override
-    public void bindSubsystemDevice(DmpDeviceInfo dmpDeviceInfo) {
-        dmpDeviceInfo.setUpdatedBy(SecurityUtils.getUsername());
-        dmpDeviceInfo.setUpdatedTime(LocalDateTime.now());
-        if (checkNameUnique(dmpDeviceInfo)) {
-            throw new BusinessException("修改设备信息'" + dmpDeviceInfo.getDeviceId() + "'失败，设备信息已存在");
-        }
-        this.updateById(dmpDeviceInfo);
-
-        LambdaUpdateWrapper<DmpDeviceStatus> updateWrapper = Wrappers.lambdaUpdate();
-        updateWrapper.set(DmpDeviceStatus::getProductId,dmpDeviceInfo.getProductId())
-                .set(DmpDeviceStatus::getProductCode,dmpDeviceInfo.getProductCode())
-                .eq(DmpDeviceStatus::getDeviceUuid, dmpDeviceInfo.getDeviceUuid());
-
-    }
-
     @Override
     public boolean checkNameUnique(DmpDeviceInfo dmpDeviceInfo) {
         Integer id = null == dmpDeviceInfo.getId() ? -1 : dmpDeviceInfo.getId();

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

@@ -93,7 +93,7 @@ public class VppDeviceServiceImpl implements VppDeviceService {
         VppAuditHelper.fillCreate(device);
         deviceMapper.insert(device);
 
-        remoteIotTaskService.addSubsystemDeviceInfo(device.getDeviceUuid(),device.getDeviceCode(),device.getTenantId());
+        remoteIotTaskService.addDeviceInfo(request.getProductCode(),device.getDeviceUuid(),device.getDeviceCode(),device.getDeviceName(),"",2);
         return device;
     }
 
@@ -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;
@@ -22,4 +21,6 @@ public class DeviceRequest {
     private String firmwareVersion;
     private String gatewayId;
     private String remark;
+
+    private String productCode;
 }