修改

portal-service-application/src/main/java/com/hfln/portal/application/controller/admin/AdminDataController.java

@@ -5,8 +5,8 @@ package com.hfln.portal.application.controller.admin;
 import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
 import com.hfln.portal.common.dto.data.device.DeviceDTO;
+import com.hfln.portal.common.request.admin.DeviceParam;
 import com.hfln.portal.common.request.device.DeviceListQueryReq;
-import com.hfln.portal.common.request.share.ShareParam;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.common.vo.UploadRes;
 import com.hfln.portal.domain.gateway.AdminGateway;
@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
 import java.io.IOException;
 
 @RestController
@@ -32,20 +31,20 @@ public class AdminDataController {
 
     @PostMapping("/uploadDev")
     @ApiOperation(value = "excel上传设备信息")
-    public ApiResult<UploadRes> uploadDev(@Valid @RequestParam MultipartFile file) throws IOException {
+    public ApiResult<UploadRes> uploadDev(@RequestParam MultipartFile file) throws IOException {
         return ApiResult.success(adminGateway.uploadDev(file));
     }
 
     @PostMapping("/queryDevList")
     @ApiOperation(value = "查询上传设备信息")
-    public ApiResult<PageRecord<DeviceDTO>> queryDevList(@Valid @RequestBody DeviceListQueryReq queryReq) {
+    public ApiResult<PageRecord<DeviceDTO>> queryDevList(@RequestBody DeviceListQueryReq queryReq) {
         return ApiResult.success(adminGateway.queryDevList(queryReq));
     }
 
     @PostMapping("/addOneDevice")
     @ApiOperation(value = "添加上传设备信息")
-    public ApiResult<Void> addOneDevice(@Valid @RequestBody DeviceDTO deviceDTO) {
-        adminGateway.addOneDevice(deviceDTO);
+    public ApiResult<Void> addOneDevice(@RequestBody DeviceParam deviceParam) {
+        adminGateway.addOneDevice(deviceParam);
         return ApiResult.success();
     }
 

portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/AdminGateway.java

@@ -1,19 +1,19 @@
 package com.hfln.portal.domain.gateway;
 
 import com.hfln.portal.common.dto.data.device.DeviceDTO;
+import com.hfln.portal.common.request.admin.DeviceParam;
 import com.hfln.portal.common.request.device.DeviceListQueryReq;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.common.vo.UploadRes;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
 import java.io.IOException;
 
 public interface AdminGateway {
 
     UploadRes uploadDev(MultipartFile file) throws IOException;
 
-    PageRecord<DeviceDTO> queryDevList(@Valid DeviceListQueryReq queryReq);
+    PageRecord<DeviceDTO> queryDevList(DeviceListQueryReq queryReq);
 
-    void addOneDevice(@Valid DeviceDTO deviceDTO);
+    void addOneDevice(DeviceParam deviceParam);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/AdminGatewayImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hfln.portal.common.dto.DevInfoImportDto;
 import com.hfln.portal.common.dto.data.device.DeviceDTO;
+import com.hfln.portal.common.request.admin.DeviceParam;
 import com.hfln.portal.common.request.device.DeviceListQueryReq;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.common.vo.UploadRes;
@@ -120,17 +121,17 @@ public class AdminGatewayImpl implements AdminGateway {
     }
 
     @Override
-    public void addOneDevice(DeviceDTO deviceDTO) {
+    public void addOneDevice(DeviceParam deviceParam) {
 
-        DevInfo devInfo = devInfoService.queryOneByClientId(deviceDTO.getClientId());
+        DevInfo devInfo = devInfoService.queryOneByClientId(deviceParam.getClientId());
         if (devInfo != null) {
             throw new BizException(ErrorEnum.DEVICE_IS_EXIST.getErrorCode(), ErrorEnum.DEVICE_IS_EXIST.getErrorMessage());
         }
 
         DevInfo saveInfo = new DevInfo();
-        saveInfo.setClientId(deviceDTO.getClientId());
-        saveInfo.setDevType(deviceDTO.getDevType());
-        saveInfo.setSoftware(deviceDTO.getSoftware());
+        saveInfo.setClientId(deviceParam.getClientId());
+        saveInfo.setDevType(deviceParam.getDevType());
+        saveInfo.setSoftware(deviceParam.getSoftware());
         saveInfo.setStatusLight(1);
         saveInfo.setOnline(0);
         saveInfo.setIsDeleted(BasePO.DeleteFlag.NOT_DELETED);