From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/api/ext/DeviceExtController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
index e73cb4a..1338c29 100644
--- a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
@@ -3,6 +3,7 @@
import doumeemes.api.BaseController;
import doumeemes.core.annotation.excel.ExcelExporter;
import doumeemes.core.annotation.pr.PreventRepeat;
+import doumeemes.core.annotation.trace.Trace;
import doumeemes.core.model.ApiResponse;
import doumeemes.core.model.PageWrap;
import doumeemes.core.model.PageData;
@@ -17,16 +18,20 @@
import doumeemes.service.system.SystemDataPermissionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 鐢熶骇璁惧淇℃伅鎺ュ彛
@@ -36,11 +41,12 @@
@RestController
@RequestMapping("/ext/deviceExt")
@Api(tags = "鐢熶骇璁惧淇℃伅鎺ュ彛")
+@Trace(withRequestResult = false,withRequestParameters = false)
public class DeviceExtController extends BaseController {
@Autowired
private DeviceExtService deviceExtService;
-
+
@Autowired
private DeviceService deviceService;
@@ -124,11 +130,11 @@
}
- QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
+ Device queryDeviceExtDTO=new Device();
queryDeviceExtDTO.setDeleted(Constants.ZERO);
queryDeviceExtDTO.setCode(device.getCode());
queryDeviceExtDTO.setRootDepartId(getLoginUser().getRootDepartment().getId());
- List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
+ List<Device> list= deviceService.findList(queryDeviceExtDTO);
if(list.size()>0){
if(!Constants.equalsInteger(list.get(0).getId(),device.getId())){
return ApiResponse.failed("璁惧缂栫爜锛屼笉鍏佽娣诲姞");
@@ -155,13 +161,17 @@
find.setModel(device.getModel());
find.setProcedureId(device.getProcedureId());
find.setStationCode(device.getStationCode());
- find.setType(device.getType());
+ find.setType(Objects.nonNull(device.getType()) ? device.getType() : Constants.ONE);
find.setGroupId(device.getGroupId());
find.setProduceWarehouseLocationId(device.getProduceWarehouseLocationId());
find.setFinishWarehouseLocationId(device.getFinishWarehouseLocationId());
deviceService.updateById(find);
if(StringUtils.isNotBlank(device.getUserIds())){
deviceService.dealDeviceUserId(Constants.ONE,device.getUserIds(),device.getId(),getLoginUser());
+ }else {
+ UserDevice userDevice = new UserDevice();
+ userDevice.setDeviceId(device.getId());
+ userDeviceService.delete(userDevice);
}
return ApiResponse.success(null);
@@ -223,4 +233,25 @@
return ApiResponse.success(list);
}
+
+ @ApiOperation(value = "鎵归噺瀵煎叆璁″垝", notes = "鎵归噺瀵煎叆璁″垝", httpMethod = "POST", position = 6)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
+ })
+ @PostMapping(value = "/importBatch", headers = "content-type=multipart/form-data")
+// @RequiresPermissions("business:salaryparam:create")
+ public ApiResponse importBatch(String folder, HttpServletRequest request, HttpServletResponse response) throws Exception {
+ CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
+ if (multipartResovler.isMultipart(request)) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Iterator<String> it = multipartRequest.getFileNames();
+ while (it.hasNext()) {
+ MultipartFile file = multipartRequest.getFile((String) it.next());
+ deviceService.importPlans(file);
+ break;
+ }
+ }
+ return ApiResponse.success( null);
+ }
+
}
--
Gitblit v1.9.3