代码更新
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
package org.nl.acs.ext.wms.rest;
|
||||
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import io.swagger.annotations.Api;
|
||||
@@ -28,6 +29,7 @@ import java.util.Map;
|
||||
@Api(tags = "wms接口")
|
||||
@RequestMapping("/api/wms")
|
||||
@Slf4j
|
||||
@SaIgnore
|
||||
public class AcsToWmsController {
|
||||
private final AcsToWmsService acstowmsService;
|
||||
|
||||
|
||||
@@ -26,13 +26,13 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@Api(tags = "wms接口")
|
||||
@RequestMapping("/api/wms")
|
||||
@Slf4j
|
||||
@SaIgnore
|
||||
public class WmsToAcsController {
|
||||
private final WmsToAcsService wmstoacsService;
|
||||
|
||||
@PostMapping("/task")
|
||||
@Log("接收WMS任务")
|
||||
@ApiOperation("接收WMS任务")
|
||||
@SaIgnore
|
||||
public ResponseEntity<Object> createFromWms(@RequestBody String whereJson) {
|
||||
return new ResponseEntity<>(wmstoacsService.createFromWms(whereJson), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@@ -31,7 +31,12 @@ public class SecurityUtils {
|
||||
} catch (Exception e) {
|
||||
return new CurrentUser();
|
||||
}
|
||||
return null;
|
||||
// 给一个acs
|
||||
CurrentUser currentUser = new CurrentUser();
|
||||
currentUser.setId(2L);
|
||||
currentUser.setUsername("acs");
|
||||
currentUser.setNickName("ACS系统");
|
||||
return currentUser;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user