root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码修改

Browse Source
This commit is contained in:
lyd
2022-11-21 18:41:56 +08:00
parent ead41bc0ab
commit 2e1de1a7eb
5 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java
View File

@@ -27,7 +27,6 @@ public class CallMaterialController {
@PostMapping("/queryPoint") @PostMapping("/queryPoint")
@Log("查询区域点位") @Log("查询区域点位")
@ApiOperation("查询区域点位") @ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() { public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(callMaterialService.queryPoint(), HttpStatus.OK); return new ResponseEntity<>(callMaterialService.queryPoint(), HttpStatus.OK);
} }
@@ -35,7 +34,6 @@ public class CallMaterialController {
@PostMapping("/confirm") @PostMapping("/confirm")
@Log("叫料确定") @Log("叫料确定")
@ApiOperation("叫料确定") @ApiOperation("叫料确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) { public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(callMaterialService.confirm(whereJson), HttpStatus.OK); return new ResponseEntity<>(callMaterialService.confirm(whereJson), HttpStatus.OK);
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java
View File

@@ -28,7 +28,6 @@ public class CallVehicleController {
@PostMapping("/queryPoint") @PostMapping("/queryPoint")
@Log("查询区域点位") @Log("查询区域点位")
@ApiOperation("查询区域点位") @ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() { public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(callVehicleService.queryPoint(), HttpStatus.OK); return new ResponseEntity<>(callVehicleService.queryPoint(), HttpStatus.OK);
} }
@@ -36,7 +35,6 @@ public class CallVehicleController {
@PostMapping("/confirm") @PostMapping("/confirm")
@Log("呼叫空托盘确定") @Log("呼叫空托盘确定")
@ApiOperation("呼叫空托盘确定") @ApiOperation("呼叫空托盘确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) { public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(callVehicleService.confirm(whereJson), HttpStatus.OK); return new ResponseEntity<>(callVehicleService.confirm(whereJson), HttpStatus.OK);
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java
View File

@@ -27,7 +27,6 @@ public class SendMaterialController {
@PostMapping("/queryPoint") @PostMapping("/queryPoint")
@Log("查询区域点位") @Log("查询区域点位")
@ApiOperation("查询区域点位") @ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() { public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(sendMaterialService.queryPoint(), HttpStatus.OK); return new ResponseEntity<>(sendMaterialService.queryPoint(), HttpStatus.OK);
} }
@@ -35,7 +34,6 @@ public class SendMaterialController {
@PostMapping("/confirm") @PostMapping("/confirm")
@Log("送料确定") @Log("送料确定")
@ApiOperation("送料确定") @ApiOperation("送料确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) { public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(sendMaterialService.confirm(whereJson), HttpStatus.OK); return new ResponseEntity<>(sendMaterialService.confirm(whereJson), HttpStatus.OK);
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java
View File

@@ -29,7 +29,6 @@ public class SendVehicleController {
@PostMapping("/queryPoint") @PostMapping("/queryPoint")
@Log("查询区域点位") @Log("查询区域点位")
@ApiOperation("查询区域点位") @ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() { public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(sendVehicleService.queryPoint(), HttpStatus.OK); return new ResponseEntity<>(sendVehicleService.queryPoint(), HttpStatus.OK);
} }
@@ -37,7 +36,6 @@ public class SendVehicleController {
@PostMapping("/confirm") @PostMapping("/confirm")
@Log("送空托盘确定") @Log("送空托盘确定")
@ApiOperation("送空托盘确定") @ApiOperation("送空托盘确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) { public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(sendVehicleService.confirm(whereJson), HttpStatus.OK); return new ResponseEntity<>(sendVehicleService.confirm(whereJson), HttpStatus.OK);
} }

6
lms/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -6,9 +6,9 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:ndxy3_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.121}:${DB_PORT:3306}/${DB_NAME:yy_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:P@ssw0rd} password: ${DB_PWD:123456}
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5
# 最小连接数 # 最小连接数
@@ -157,6 +157,8 @@ sa-token:
jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
# token 前缀 # token 前缀
token-prefix: Bearer token-prefix: Bearer
is-read-cookie: false
is-read-body: false
loki: loki:
url: http://localhost:3100/loki/api/v1 url: http://localhost:3100/loki/api/v1