Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jyzb_platformV2
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Members
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
赵剑炜
jyzb_platformV2
Commits
de524b28
Commit
de524b28
authored
Jan 08, 2024
by
赵剑炜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加日志记录类型
parent
00484fb3
显示空白字符变更
内嵌
并排
正在显示
21 个修改的文件
包含
130 行增加
和
118 行删除
+130
-118
ApplicationController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ApplicationController.java
+1
-1
BussinessController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java
+1
-1
BussinessInventoryController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java
+5
-4
CabinetBoxController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetBoxController.java
+2
-2
CabinetController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java
+6
-5
DestoryUnitController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DestoryUnitController.java
+3
-3
DeviceConfigController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java
+7
-6
EquipmentSizeController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java
+6
-5
EquipmentTypeController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
+12
-6
InventoryController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
+18
-10
LogController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/LogController.java
+0
-14
ManufacturerController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ManufacturerController.java
+5
-4
OrderCommonController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderCommonController.java
+2
-2
OrderController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
+8
-8
PoliceController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
+16
-16
PolicemanFingerController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PolicemanFingerController.java
+4
-4
PubOrgController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
+5
-5
PublicController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
+1
-1
RepairUnitController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/RepairUnitController.java
+5
-4
SupplierController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/SupplierController.java
+6
-5
WarehouseController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java
+17
-12
没有找到文件。
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ApplicationController.java
View file @
de524b28
...
@@ -37,7 +37,7 @@ public class ApplicationController {
...
@@ -37,7 +37,7 @@ public class ApplicationController {
}
}
//新增或者修改应用信息
//新增或者修改应用信息
@PostMapping
(
path
=
"/AddOrUpdateCfg"
,
name
=
"新增应用信息"
)
@PostMapping
(
path
=
"/AddOrUpdateCfg"
,
name
=
"新增应用信息
#logType=30
"
)
@ApiOperation
(
"新增应用信息"
)
@ApiOperation
(
"新增应用信息"
)
public
ApiRes
<
String
>
AddOrUpdateCfg
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
ApplicationReq
req
){
public
ApiRes
<
String
>
AddOrUpdateCfg
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
ApplicationReq
req
){
return
ApiRes
.
success
(
applicationService
.
AddOrUpdateCfg
(
req
));
return
ApiRes
.
success
(
applicationService
.
AddOrUpdateCfg
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java
View file @
de524b28
...
@@ -33,7 +33,7 @@ public class BussinessController {
...
@@ -33,7 +33,7 @@ public class BussinessController {
//创建业务单
//创建业务单
@PostMapping
(
path
=
"/AddBussinessOrder"
,
name
=
"创建业务单"
)
@PostMapping
(
path
=
"/AddBussinessOrder"
,
name
=
"创建业务单
#logType=30
"
)
@ApiOperation
(
"创建业务单"
)
@ApiOperation
(
"创建业务单"
)
public
ApiRes
<
String
>
AddBussinessOrder
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateBusFormReq
req
){
public
ApiRes
<
String
>
AddBussinessOrder
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateBusFormReq
req
){
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java
View file @
de524b28
...
@@ -32,7 +32,8 @@ public class BussinessInventoryController {
...
@@ -32,7 +32,8 @@ public class BussinessInventoryController {
private
BussinessInventoryService
BussinessInventoryService
;
private
BussinessInventoryService
BussinessInventoryService
;
//盘库申请
//盘库申请
@PostMapping
(
path
=
"/AddStocktake"
,
name
=
"盘库申请"
)
@PostMapping
(
path
=
"/AddStocktake"
,
name
=
"盘库申请#logType=30"
)
@ApiOperation
(
"盘库申请"
)
@ApiOperation
(
"盘库申请"
)
public
ApiRes
<
String
>
AddStocktake
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateInventoryReq
req
){
public
ApiRes
<
String
>
AddStocktake
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateInventoryReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
...
@@ -57,7 +58,7 @@ public class BussinessInventoryController {
...
@@ -57,7 +58,7 @@ public class BussinessInventoryController {
return
ApiRes
.
success
(
BussinessInventoryService
.
Check
(
req
));
return
ApiRes
.
success
(
BussinessInventoryService
.
Check
(
req
));
}
}
//开始盘点,已废弃
//开始盘点,已废弃
@PostMapping
(
path
=
"/Start"
,
name
=
"开始盘点"
)
@PostMapping
(
path
=
"/Start"
,
name
=
"开始盘点
#logType=30
"
)
@ApiOperation
(
"开始盘点"
)
@ApiOperation
(
"开始盘点"
)
public
ApiRes
<
Boolean
>
Start
(
@RequestBody
UploadInventoryReq
req
){
public
ApiRes
<
Boolean
>
Start
(
@RequestBody
UploadInventoryReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
...
@@ -78,14 +79,14 @@ public class BussinessInventoryController {
...
@@ -78,14 +79,14 @@ public class BussinessInventoryController {
return
ApiRes
.
success
(
BussinessInventoryService
.
GetDetailById
(
req
));
return
ApiRes
.
success
(
BussinessInventoryService
.
GetDetailById
(
req
));
}
}
//盘库申请
//盘库申请
@PostMapping
(
path
=
"/UploadStock"
,
name
=
"上传盘点记录"
)
@PostMapping
(
path
=
"/UploadStock"
,
name
=
"上传盘点记录
#logType=30
"
)
@ApiOperation
(
"上传盘点记录"
)
@ApiOperation
(
"上传盘点记录"
)
public
ApiRes
<
Boolean
>
UploadStock
(
@RequestBody
UploadInventoryReq
req
){
public
ApiRes
<
Boolean
>
UploadStock
(
@RequestBody
UploadInventoryReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
return
ApiRes
.
success
(
BussinessInventoryService
.
UploadStock
(
req
));
return
ApiRes
.
success
(
BussinessInventoryService
.
UploadStock
(
req
));
}
}
//盘库申请
//盘库申请
@PostMapping
(
path
=
"/UseOrFinished"
,
name
=
"确认结果/结束盘点"
)
@PostMapping
(
path
=
"/UseOrFinished"
,
name
=
"确认结果/结束盘点
#logType=30
"
)
@ApiOperation
(
"确认结果/结束盘点"
)
@ApiOperation
(
"确认结果/结束盘点"
)
public
ApiRes
<
Boolean
>
UseOrFinished
(
@RequestBody
UploadInventoryReq
req
){
public
ApiRes
<
Boolean
>
UseOrFinished
(
@RequestBody
UploadInventoryReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetBoxController.java
View file @
de524b28
...
@@ -24,14 +24,14 @@ public class CabinetBoxController {
...
@@ -24,14 +24,14 @@ public class CabinetBoxController {
@Resource
@Resource
private
CabinetBoxService
cabinetBoxService
;
private
CabinetBoxService
cabinetBoxService
;
//添加箱门信息
//添加箱门信息
@PostMapping
(
path
=
"/AddBoxInfo"
,
name
=
"添加箱门信息"
)
@PostMapping
(
path
=
"/AddBoxInfo"
,
name
=
"添加箱门信息
#logType=30
"
)
@ApiOperation
(
"添加箱门信息"
)
@ApiOperation
(
"添加箱门信息"
)
public
ApiRes
<
String
>
AddOrUpdateBoxInfo
(
@RequestBody
UpdateCabinetReq
req
){
public
ApiRes
<
String
>
AddOrUpdateBoxInfo
(
@RequestBody
UpdateCabinetReq
req
){
return
ApiRes
.
success
(
cabinetBoxService
.
AddOrUpdateBoxInfo
(
req
));
return
ApiRes
.
success
(
cabinetBoxService
.
AddOrUpdateBoxInfo
(
req
));
}
}
//添加箱门信息
//添加箱门信息
@PostMapping
(
path
=
"/DeleteBox"
,
name
=
"添加箱门信息"
)
@PostMapping
(
path
=
"/DeleteBox"
,
name
=
"添加箱门信息
#logType=30
"
)
@ApiOperation
(
"删除箱门"
)
@ApiOperation
(
"删除箱门"
)
public
ApiRes
<
String
>
DeleteBox
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateCabinetReq
req
){
public
ApiRes
<
String
>
DeleteBox
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateCabinetReq
req
){
return
ApiRes
.
success
(
cabinetBoxService
.
DeleteBox
(
req
));
return
ApiRes
.
success
(
cabinetBoxService
.
DeleteBox
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java
View file @
de524b28
...
@@ -35,14 +35,14 @@ public class CabinetController {
...
@@ -35,14 +35,14 @@ public class CabinetController {
private
CabinetBoxService
cabinetBoxService
;
private
CabinetBoxService
cabinetBoxService
;
@PostMapping
(
path
=
"/AddCabinetInfo"
,
name
=
"添加单警柜信息"
)
@PostMapping
(
path
=
"/AddCabinetInfo"
,
name
=
"添加单警柜信息
#logType=30
"
)
@ApiOperation
(
"添加单警柜信息"
)
@ApiOperation
(
"添加单警柜信息"
)
public
ApiRes
<
String
>
addCabinetInfo
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateCabinetReq
req
){
public
ApiRes
<
String
>
addCabinetInfo
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateCabinetReq
req
){
String
cabinetId
=
cabinetService
.
addCabinetInfo
(
req
);
String
cabinetId
=
cabinetService
.
addCabinetInfo
(
req
);
return
ApiRes
.
success
(
cabinetId
);
return
ApiRes
.
success
(
cabinetId
);
}
}
@PostMapping
(
path
=
"/ErrorState"
,
name
=
"单警柜状态变更"
)
@PostMapping
(
path
=
"/ErrorState"
,
name
=
"单警柜状态变更
#logType=30
"
)
@ApiOperation
(
"单警柜状态变更"
)
@ApiOperation
(
"单警柜状态变更"
)
public
ApiRes
<
Boolean
>
ChangeCabinetState
(
@RequestBody
UpdateCabinetReq
req
)
{
public
ApiRes
<
Boolean
>
ChangeCabinetState
(
@RequestBody
UpdateCabinetReq
req
)
{
boolean
result
=
cabinetService
.
ChangeCabinetState
(
req
);
boolean
result
=
cabinetService
.
ChangeCabinetState
(
req
);
...
@@ -53,13 +53,14 @@ public class CabinetController {
...
@@ -53,13 +53,14 @@ public class CabinetController {
}
}
@PostMapping
(
path
=
"/DeleteCabinetInfo"
,
name
=
"删除单警柜信息"
)
@PostMapping
(
path
=
"/DeleteCabinetInfo"
,
name
=
"删除单警柜信息#logType=30"
)
@ApiOperation
(
"删除单警柜信息"
)
@ApiOperation
(
"删除单警柜信息"
)
public
ApiRes
<
Boolean
>
deleteCabinetInfo
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateCabinetReq
req
)
{
public
ApiRes
<
Boolean
>
deleteCabinetInfo
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateCabinetReq
req
)
{
return
ApiRes
.
success
(
cabinetService
.
deleteCabinetInfo
(
req
));
return
ApiRes
.
success
(
cabinetService
.
deleteCabinetInfo
(
req
));
}
}
@PostMapping
(
path
=
"/UpdateCabinetServer"
,
name
=
"修改单警柜信息,平台使用"
)
@PostMapping
(
path
=
"/UpdateCabinetServer"
,
name
=
"修改单警柜信息,平台使用
#logType=30
"
)
@ApiOperation
(
"修改单警柜信息,平台使用"
)
@ApiOperation
(
"修改单警柜信息,平台使用"
)
public
ApiRes
<
Boolean
>
UpdateCabinetServer
(
@RequestBody
UpdateCabinetReq
req
)
{
public
ApiRes
<
Boolean
>
UpdateCabinetServer
(
@RequestBody
UpdateCabinetReq
req
)
{
boolean
result
=
cabinetService
.
updateCabinetInfo
(
req
);
boolean
result
=
cabinetService
.
updateCabinetInfo
(
req
);
...
@@ -70,7 +71,7 @@ public class CabinetController {
...
@@ -70,7 +71,7 @@ public class CabinetController {
}
}
@PostMapping
(
path
=
"/UpdateCabinetClient"
,
name
=
"修改单警柜信息,警柜使用"
)
@PostMapping
(
path
=
"/UpdateCabinetClient"
,
name
=
"修改单警柜信息,警柜使用
#logType=30
"
)
@ApiOperation
(
"修改单警柜信息,警柜使用"
)
@ApiOperation
(
"修改单警柜信息,警柜使用"
)
public
ApiRes
<
Boolean
>
UpdateCabinetClient
(
@RequestBody
UpdateCabinetReq
req
)
{
public
ApiRes
<
Boolean
>
UpdateCabinetClient
(
@RequestBody
UpdateCabinetReq
req
)
{
boolean
result
=
cabinetService
.
updateCabinetInfo
(
req
);
boolean
result
=
cabinetService
.
updateCabinetInfo
(
req
);
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DestoryUnitController.java
View file @
de524b28
...
@@ -29,14 +29,14 @@ public class DestoryUnitController {
...
@@ -29,14 +29,14 @@ public class DestoryUnitController {
private
DestoryUnitService
destoryUnitService
;
private
DestoryUnitService
destoryUnitService
;
//创建报废/销毁单位
//创建报废/销毁单位
@PostMapping
(
path
=
"/AddDestoryUnit"
,
name
=
"创建报废
/销毁单位
"
)
@PostMapping
(
path
=
"/AddDestoryUnit"
,
name
=
"创建报废
,销毁单位#logType=30
"
)
@ApiOperation
(
"创建报废/销毁单位"
)
@ApiOperation
(
"创建报废/销毁单位"
)
public
ApiRes
<
String
>
addDestoryUnit
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
DestoryUnitReq
req
){
public
ApiRes
<
String
>
addDestoryUnit
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
DestoryUnitReq
req
){
return
ApiRes
.
success
(
destoryUnitService
.
addDestoryUnit
(
req
));
return
ApiRes
.
success
(
destoryUnitService
.
addDestoryUnit
(
req
));
}
}
//修改报废/销毁单位
//修改报废/销毁单位
@PostMapping
(
path
=
"/UpdateDestoryUnit"
,
name
=
"修改报废
/销毁单位
"
)
@PostMapping
(
path
=
"/UpdateDestoryUnit"
,
name
=
"修改报废
,销毁单位#logType=30
"
)
@ApiOperation
(
"修改报废/销毁单位"
)
@ApiOperation
(
"修改报废/销毁单位"
)
public
ApiRes
<
Boolean
>
updateDestoryUnit
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
DestoryUnitReq
req
){
public
ApiRes
<
Boolean
>
updateDestoryUnit
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
DestoryUnitReq
req
){
return
ApiRes
.
success
(
destoryUnitService
.
updateDestoryUnit
(
req
));
return
ApiRes
.
success
(
destoryUnitService
.
updateDestoryUnit
(
req
));
...
@@ -56,7 +56,7 @@ public class DestoryUnitController {
...
@@ -56,7 +56,7 @@ public class DestoryUnitController {
return
ApiRes
.
success
(
destoryUnitService
.
showDestoryUnitPage
(
req
));
return
ApiRes
.
success
(
destoryUnitService
.
showDestoryUnitPage
(
req
));
}
}
//删除报废/销毁单位
//删除报废/销毁单位
@PostMapping
(
path
=
"/DelDestoryUnit"
,
name
=
"修改报废/销毁单位"
)
@PostMapping
(
path
=
"/DelDestoryUnit"
,
name
=
"修改报废/销毁单位
#logType=30
"
)
@ApiOperation
(
"修改报废/销毁单位"
)
@ApiOperation
(
"修改报废/销毁单位"
)
public
ApiRes
<
Boolean
>
delDestoryUnit
(
@RequestBody
DestoryUnitReq
req
){
public
ApiRes
<
Boolean
>
delDestoryUnit
(
@RequestBody
DestoryUnitReq
req
){
return
ApiRes
.
success
(
destoryUnitService
.
delDestoryUnit
(
req
));
return
ApiRes
.
success
(
destoryUnitService
.
delDestoryUnit
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java
View file @
de524b28
...
@@ -36,13 +36,13 @@ public class DeviceConfigController {
...
@@ -36,13 +36,13 @@ public class DeviceConfigController {
private
WarehouseDevService
warehouseDevService
;
private
WarehouseDevService
warehouseDevService
;
//新增配置
//新增配置
@PostMapping
(
"/addDeviceConfig
"
)
@PostMapping
(
path
=
"/addDeviceConfig"
,
name
=
"新增配置#logType=30
"
)
@ApiOperation
(
"新增配置"
)
@ApiOperation
(
"新增配置"
)
public
ApiRes
<
Long
>
addDeviceConfig
(
@RequestBody
UpdateDeivceConfigReq
req
){
public
ApiRes
<
Long
>
addDeviceConfig
(
@RequestBody
UpdateDeivceConfigReq
req
){
return
ApiRes
.
success
(
deviceConfigService
.
addDeviceConfig
(
req
));
return
ApiRes
.
success
(
deviceConfigService
.
addDeviceConfig
(
req
));
}
}
//修改配置
//修改配置
@PostMapping
(
"/updateDeviceConfig
"
)
@PostMapping
(
path
=
"/updateDeviceConfig"
,
name
=
"修改配置#logType=30
"
)
@ApiOperation
(
"修改配置"
)
@ApiOperation
(
"修改配置"
)
public
ApiRes
<
Boolean
>
updateDeviceConfig
(
@RequestBody
UpdateDeivceConfigReq
req
){
public
ApiRes
<
Boolean
>
updateDeviceConfig
(
@RequestBody
UpdateDeivceConfigReq
req
){
return
ApiRes
.
success
(
deviceConfigService
.
updateDeviceConfig
(
req
));
return
ApiRes
.
success
(
deviceConfigService
.
updateDeviceConfig
(
req
));
...
@@ -61,13 +61,13 @@ public class DeviceConfigController {
...
@@ -61,13 +61,13 @@ public class DeviceConfigController {
}
}
//新增除湿机配置
//新增除湿机配置
@PostMapping
(
"/addWarehouseDev
"
)
@PostMapping
(
path
=
"/addWarehouseDev"
,
name
=
"新增除湿机配置#logType=30
"
)
@ApiOperation
(
"新增除湿机配置"
)
@ApiOperation
(
"新增除湿机配置"
)
public
ApiRes
<
String
>
addWarehouseDev
(
@RequestBody
UpdateWarehouseDevReq
req
){
public
ApiRes
<
String
>
addWarehouseDev
(
@RequestBody
UpdateWarehouseDevReq
req
){
return
ApiRes
.
success
(
warehouseDevService
.
addWarehouseDev
(
req
));
return
ApiRes
.
success
(
warehouseDevService
.
addWarehouseDev
(
req
));
}
}
//修改除湿机配置
//修改除湿机配置
@PostMapping
(
"/updateWarehouseDev
"
)
@PostMapping
(
path
=
"/updateWarehouseDev"
,
name
=
"修改除湿机配置#logType=30
"
)
@ApiOperation
(
"修改除湿机配置"
)
@ApiOperation
(
"修改除湿机配置"
)
public
ApiRes
<
Boolean
>
updateWarehouseDev
(
@RequestBody
UpdateWarehouseDevReq
req
){
public
ApiRes
<
Boolean
>
updateWarehouseDev
(
@RequestBody
UpdateWarehouseDevReq
req
){
return
ApiRes
.
success
(
warehouseDevService
.
updateWarehouseDev
(
req
));
return
ApiRes
.
success
(
warehouseDevService
.
updateWarehouseDev
(
req
));
...
@@ -79,13 +79,14 @@ public class DeviceConfigController {
...
@@ -79,13 +79,14 @@ public class DeviceConfigController {
return
ApiRes
.
success
(
warehouseDevService
.
showWarehouseDevList
(
req
));
return
ApiRes
.
success
(
warehouseDevService
.
showWarehouseDevList
(
req
));
}
}
@PostMapping
(
"/alignDeviceConfigInfo
"
)
@PostMapping
(
path
=
"/alignDeviceConfigInfo"
,
name
=
"同步更新通道/仓库主机配置#logType=30
"
)
@ApiOperation
(
"同步更新通道/仓库主机配置"
)
@ApiOperation
(
"同步更新通道/仓库主机配置"
)
public
ApiRes
<
List
<
String
>>
alignDeviceConfigInfo
(
@RequestBody
UpdateDeivceConfigReq
req
){
public
ApiRes
<
List
<
String
>>
alignDeviceConfigInfo
(
@RequestBody
UpdateDeivceConfigReq
req
){
return
ApiRes
.
success
(
deviceConfigService
.
alignDeviceConfigInfo
(
req
));
return
ApiRes
.
success
(
deviceConfigService
.
alignDeviceConfigInfo
(
req
));
}
}
@PostMapping
(
"/alignWarehouseDevInfo"
)
@PostMapping
(
path
=
"/alignWarehouseDevInfo"
,
name
=
"同步更新除湿机配置#logType=30"
)
@ApiOperation
(
"同步更新除湿机配置"
)
@ApiOperation
(
"同步更新除湿机配置"
)
public
ApiRes
<
List
<
WarehouseDevInfoDto
>>
alignWarehouseDevInfo
(
@RequestBody
UpdateWarehouseDevReq
req
){
public
ApiRes
<
List
<
WarehouseDevInfoDto
>>
alignWarehouseDevInfo
(
@RequestBody
UpdateWarehouseDevReq
req
){
return
ApiRes
.
success
(
warehouseDevService
.
alignWarehouseDevInfo
(
req
));
return
ApiRes
.
success
(
warehouseDevService
.
alignWarehouseDevInfo
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java
View file @
de524b28
...
@@ -34,13 +34,13 @@ public class EquipmentSizeController {
...
@@ -34,13 +34,13 @@ public class EquipmentSizeController {
@Resource
@Resource
public
EquipmentSizeService
equipmentSizeService
;
public
EquipmentSizeService
equipmentSizeService
;
@PostMapping
(
"/AddSize
"
)
@PostMapping
(
path
=
"/AddSize"
,
name
=
"添加号型信息#logType=30
"
)
@ApiOperation
(
"添加号型信息"
)
@ApiOperation
(
"添加号型信息"
)
public
ApiRes
<
String
>
addSize
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateEquipmentSizeReq
req
)
{
public
ApiRes
<
String
>
addSize
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateEquipmentSizeReq
req
)
{
return
ApiRes
.
success
(
equipmentSizeService
.
addSize
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
addSize
(
req
));
}
}
@PostMapping
(
"/DeleteSize
"
)
@PostMapping
(
path
=
"/DeleteSize"
,
name
=
"删除号型信息#logType=30
"
)
@ApiOperation
(
"删除号型信息"
)
@ApiOperation
(
"删除号型信息"
)
public
ApiRes
<
Boolean
>
deleteSize
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateEquipmentSizeReq
req
)
{
public
ApiRes
<
Boolean
>
deleteSize
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateEquipmentSizeReq
req
)
{
// ResponseResult returnMsg = equipmentSizeService.deleteSize(msg);
// ResponseResult returnMsg = equipmentSizeService.deleteSize(msg);
...
@@ -66,13 +66,14 @@ public class EquipmentSizeController {
...
@@ -66,13 +66,14 @@ public class EquipmentSizeController {
return
ApiRes
.
success
(
equipmentSizeService
.
getSizePages
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
getSizePages
(
req
));
}
}
@PostMapping
(
"/UpdateSize"
)
@PostMapping
(
path
=
"/UpdateSize"
,
name
=
"修改号型信息#logType=30"
)
@ApiOperation
(
"修改号型信息"
)
@ApiOperation
(
"修改号型信息"
)
public
ApiRes
<
Boolean
>
updateSize
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateEquipmentSizeReq
req
)
{
public
ApiRes
<
Boolean
>
updateSize
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateEquipmentSizeReq
req
)
{
return
ApiRes
.
success
(
equipmentSizeService
.
updateSize
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
updateSize
(
req
));
}
}
@PostMapping
(
"/ChangeSizeState
"
)
@PostMapping
(
path
=
"/ChangeSizeState"
,
name
=
"禁用/启用装备号型#logType=30
"
)
@ApiOperation
(
"禁用/启用装备号型"
)
@ApiOperation
(
"禁用/启用装备号型"
)
public
ApiRes
<
Boolean
>
changeSizeState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateEquipmentSizeReq
req
)
{
public
ApiRes
<
Boolean
>
changeSizeState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateEquipmentSizeReq
req
)
{
return
ApiRes
.
success
(
equipmentSizeService
.
changeSizeState
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
changeSizeState
(
req
));
...
@@ -91,7 +92,7 @@ public class EquipmentSizeController {
...
@@ -91,7 +92,7 @@ public class EquipmentSizeController {
// return ApiRes.success(equipmentSizeService.selectByTypeIds(req.getTypeIdsList()));
// return ApiRes.success(equipmentSizeService.selectByTypeIds(req.getTypeIdsList()));
// }
// }
@PostMapping
(
"/alignSizeInfo
"
)
@PostMapping
(
path
=
"/alignSizeInfo"
,
name
=
"同步更新号型信息#logType=30
"
)
@ApiOperation
(
"同步更新号型信息"
)
@ApiOperation
(
"同步更新号型信息"
)
public
ApiRes
<
List
<
SizeDto
>>
alignSizeInfo
(
@RequestBody
UpdateEquipmentSizeReq
req
){
public
ApiRes
<
List
<
SizeDto
>>
alignSizeInfo
(
@RequestBody
UpdateEquipmentSizeReq
req
){
return
ApiRes
.
success
(
equipmentSizeService
.
alignSizeInfo
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
alignSizeInfo
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
View file @
de524b28
...
@@ -30,20 +30,23 @@ public class EquipmentTypeController {
...
@@ -30,20 +30,23 @@ public class EquipmentTypeController {
@Resource
@Resource
public
EquipmentTypeService
equipmentTypeService
;
public
EquipmentTypeService
equipmentTypeService
;
@PostMapping
(
"/AddEquipment"
)
@PostMapping
(
path
=
"/AddEquipment"
,
name
=
"添加物资#logType=30"
)
@ApiOperation
(
"添加物资"
)
@ApiOperation
(
"添加物资"
)
public
ApiRes
<
String
>
addEquipment
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateEquipmentTypeReq
req
)
{
public
ApiRes
<
String
>
addEquipment
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateEquipmentTypeReq
req
)
{
return
ApiRes
.
success
(
equipmentTypeService
.
addEquipment
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
addEquipment
(
req
));
}
}
@PostMapping
(
"/DeleteEquipment"
)
@PostMapping
(
path
=
"/DeleteEquipment"
,
name
=
"删除装备信息#logType=30"
)
@ApiOperation
(
"删除装备信息"
)
@ApiOperation
(
"删除装备信息"
)
public
ApiRes
<
Boolean
>
deleteEquipment
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateEquipmentTypeReq
req
)
{
public
ApiRes
<
Boolean
>
deleteEquipment
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateEquipmentTypeReq
req
)
{
return
ApiRes
.
success
(
equipmentTypeService
.
deleteEquipment
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
deleteEquipment
(
req
));
}
}
@PostMapping
(
"/ChangeEquipmentState"
)
@PostMapping
(
path
=
"/ChangeEquipmentState"
,
name
=
"禁用启用装备类型#logType=30"
)
@ApiOperation
(
"禁用/启用装备类型"
)
@ApiOperation
(
"禁用/启用装备类型"
)
public
ApiRes
<
Boolean
>
changeEquipmentState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateEquipmentTypeReq
req
)
{
public
ApiRes
<
Boolean
>
changeEquipmentState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateEquipmentTypeReq
req
)
{
return
ApiRes
.
success
(
equipmentTypeService
.
changeEquipmentState
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
changeEquipmentState
(
req
));
...
@@ -56,6 +59,7 @@ public class EquipmentTypeController {
...
@@ -56,6 +59,7 @@ public class EquipmentTypeController {
}
}
@PostMapping
(
path
=
"/ShowEquipmentESList"
,
name
=
"查看业务单#enable"
)
@PostMapping
(
path
=
"/ShowEquipmentESList"
,
name
=
"查看业务单#enable"
)
//@PostMapping(path="/ShowEquipmentESList",name="通过ES模糊检索类别列表#logType=30")
@ApiOperation
(
"通过ES模糊检索类别列表"
)
@ApiOperation
(
"通过ES模糊检索类别列表"
)
public
ApiRes
<
ESTypeDto
>
ShowEquipmentESList
(
@RequestBody
QueryEquipmentTypeReq
req
)
throws
IOException
{
public
ApiRes
<
ESTypeDto
>
ShowEquipmentESList
(
@RequestBody
QueryEquipmentTypeReq
req
)
throws
IOException
{
return
ApiRes
.
success
(
equipmentTypeService
.
getTypeTreeByEs
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
getTypeTreeByEs
(
req
));
...
@@ -74,14 +78,15 @@ public class EquipmentTypeController {
...
@@ -74,14 +78,15 @@ public class EquipmentTypeController {
}
}
@PostMapping
(
"/UpdateEquipment
"
)
@PostMapping
(
path
=
"/UpdateEquipment"
,
name
=
"修改物资信息#logType=30
"
)
@ApiOperation
(
"修改物资信息"
)
@ApiOperation
(
"修改物资信息"
)
public
ApiRes
<
Boolean
>
updateEquipment
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateEquipmentTypeReq
req
)
{
public
ApiRes
<
Boolean
>
updateEquipment
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateEquipmentTypeReq
req
)
{
return
ApiRes
.
success
(
equipmentTypeService
.
updateEquipment
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
updateEquipment
(
req
));
}
}
@PostMapping
(
"/SetTypeParentIds"
)
@PostMapping
(
path
=
"/SetTypeParentIds"
,
name
=
"填充装备类型的parent_ids字段#logType=30"
)
@ApiOperation
(
"填充装备类型的parent_ids字段"
)
@ApiOperation
(
"填充装备类型的parent_ids字段"
)
public
ResponseResult
setTypeParentIds
()
{
public
ResponseResult
setTypeParentIds
()
{
ResponseResult
returnMsg
=
equipmentTypeService
.
setTypeParentIds
();
ResponseResult
returnMsg
=
equipmentTypeService
.
setTypeParentIds
();
...
@@ -98,7 +103,8 @@ public class EquipmentTypeController {
...
@@ -98,7 +103,8 @@ public class EquipmentTypeController {
@PostMapping
(
"/alignTypeInfo"
)
@PostMapping
(
path
=
"/alignTypeInfo"
,
name
=
"同步更新类型信息#logType=30"
)
@ApiOperation
(
"同步更新类型信息"
)
@ApiOperation
(
"同步更新类型信息"
)
public
ApiRes
<
List
<
TypeDto
>>
alignTypeInfo
(
@RequestBody
UpdateEquipmentTypeReq
req
){
public
ApiRes
<
List
<
TypeDto
>>
alignTypeInfo
(
@RequestBody
UpdateEquipmentTypeReq
req
){
return
ApiRes
.
success
(
equipmentTypeService
.
alignTypeInfo
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
alignTypeInfo
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
View file @
de524b28
...
@@ -51,7 +51,7 @@ public class InventoryController {
...
@@ -51,7 +51,7 @@ public class InventoryController {
//填充汇总信息(根据base_inventory表中数据汇总同步)--第一次进行数据同步,适用于3.0初始化inventory_summary表
//填充汇总信息(根据base_inventory表中数据汇总同步)--第一次进行数据同步,适用于3.0初始化inventory_summary表
//该方法只有插入语句,要注意inventory_summary表中没有数据,仅有结构,否则数据不准确
//该方法只有插入语句,要注意inventory_summary表中没有数据,仅有结构,否则数据不准确
@PostMapping
(
"/SetInventoryMsg
"
)
@PostMapping
(
path
=
"/SetInventoryMsg"
,
name
=
"填充汇总表信息#logType=30
"
)
@ApiOperation
(
"填充汇总表信息"
)
@ApiOperation
(
"填充汇总表信息"
)
public
ApiRes
<
Boolean
>
setInventoryMsg
(
InventorySumReq
req
)
{
public
ApiRes
<
Boolean
>
setInventoryMsg
(
InventorySumReq
req
)
{
boolean
result
=
inventoryService
.
setInventoryMsg
(
req
);
boolean
result
=
inventoryService
.
setInventoryMsg
(
req
);
...
@@ -64,21 +64,24 @@ public class InventoryController {
...
@@ -64,21 +64,24 @@ public class InventoryController {
//装备绑定箱门
//装备绑定箱门
@PostMapping
(
"/EquipmentBind"
)
@PostMapping
(
path
=
"/EquipmentBind"
,
name
=
"装备绑定箱门#logType=30"
)
@ApiOperation
(
"装备绑定箱门"
)
@ApiOperation
(
"装备绑定箱门"
)
public
ApiRes
<
Boolean
>
InventoryBind
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
EquipmentBindReq
req
){
public
ApiRes
<
Boolean
>
InventoryBind
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
EquipmentBindReq
req
){
return
ApiRes
.
success
(
inventoryService
.
InventoryBind
(
req
));
return
ApiRes
.
success
(
inventoryService
.
InventoryBind
(
req
));
}
}
//手动修改仓库数量信息,修改的是base_warehouse中的个别字段(总数,总价,入库数,出库数),是通过inventory_summary进行统计的
//手动修改仓库数量信息,修改的是base_warehouse中的个别字段(总数,总价,入库数,出库数),是通过inventory_summary进行统计的
@PostMapping
(
"/UpdateWarehouseInsNum"
)
@PostMapping
(
path
=
"/UpdateWarehouseInsNum"
,
name
=
"手动重置仓库库存数量信息#logType=30"
)
@ApiOperation
(
"手动重置仓库库存数量信息"
)
@ApiOperation
(
"手动重置仓库库存数量信息"
)
public
ApiRes
<
Boolean
>
UpdateWarehouseInsNum
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
WarehouseReq
req
){
public
ApiRes
<
Boolean
>
UpdateWarehouseInsNum
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
WarehouseReq
req
){
return
ApiRes
.
success
(
inventoryService
.
UpdateWarehouseInsNum
(
req
));
return
ApiRes
.
success
(
inventoryService
.
UpdateWarehouseInsNum
(
req
));
}
}
//手动修改单警柜数量信息,修改的是base_cabinet中的个别字段(总数,总价,入库数,出库数),是通过inventory_summary进行统计的
//手动修改单警柜数量信息,修改的是base_cabinet中的个别字段(总数,总价,入库数,出库数),是通过inventory_summary进行统计的
@PostMapping
(
"/UpdateCabinetInsNum"
)
@PostMapping
(
path
=
"/UpdateCabinetInsNum"
,
name
=
"手动重置单警柜库存数量信息#logType=30"
)
@ApiOperation
(
"手动重置单警柜库存数量信息"
)
@ApiOperation
(
"手动重置单警柜库存数量信息"
)
public
ApiRes
<
Boolean
>
UpdateCabinetInsNum
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetReq
req
){
public
ApiRes
<
Boolean
>
UpdateCabinetInsNum
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetReq
req
){
return
ApiRes
.
success
(
inventoryService
.
UpdateCabinetInsNum
(
req
));
return
ApiRes
.
success
(
inventoryService
.
UpdateCabinetInsNum
(
req
));
...
@@ -222,7 +225,8 @@ public class InventoryController {
...
@@ -222,7 +225,8 @@ public class InventoryController {
}
}
//导出,通过传递组织机构id,将该组织机构下的所有装备信息进行导出
//导出,通过传递组织机构id,将该组织机构下的所有装备信息进行导出
@PostMapping
(
"/ExportInventoryExcel"
)
@PostMapping
(
path
=
"/ExportInventoryExcel"
,
name
=
"组织机构装备导出#logType=30"
)
@ApiOperation
(
"组织机构装备导出"
)
@ApiOperation
(
"组织机构装备导出"
)
public
void
ExportInventoryExcel
(
@RequestBody
@Validated
(
ValidationApi
.
export
.
class
)
InventoryReq
req
)
{
public
void
ExportInventoryExcel
(
@RequestBody
@Validated
(
ValidationApi
.
export
.
class
)
InventoryReq
req
)
{
inventoryService
.
ExportInventoryExcel
(
req
);
inventoryService
.
ExportInventoryExcel
(
req
);
...
@@ -255,7 +259,8 @@ public class InventoryController {
...
@@ -255,7 +259,8 @@ public class InventoryController {
}
}
//批量信息修改(修改质保期,维保期,购入单价,生产日期,存放货架,货架位置)
//批量信息修改(修改质保期,维保期,购入单价,生产日期,存放货架,货架位置)
@PostMapping
(
"/BatchEditingInvsInfo"
)
@PostMapping
(
path
=
"/BatchEditingInvsInfo"
,
name
=
"批量信息修改#logType=30"
)
@ApiOperation
(
"批量信息修改"
)
@ApiOperation
(
"批量信息修改"
)
public
ApiRes
<
Boolean
>
BatchEditingInvsInfo
(
@RequestBody
BatchEditingInvsReq
req
){
public
ApiRes
<
Boolean
>
BatchEditingInvsInfo
(
@RequestBody
BatchEditingInvsReq
req
){
return
ApiRes
.
success
(
inventoryService
.
BatchEditingInvsInfo
(
req
));
return
ApiRes
.
success
(
inventoryService
.
BatchEditingInvsInfo
(
req
));
...
@@ -263,7 +268,8 @@ public class InventoryController {
...
@@ -263,7 +268,8 @@ public class InventoryController {
//首页上的装备统计数量
//首页上的装备统计数量
@PostMapping
(
"/EquipmentStatistics"
)
@PostMapping
(
path
=
"/EquipmentStatistics"
,
name
=
"装备数量数据统计#logType=30"
)
@ApiOperation
(
"装备数量数据统计"
)
@ApiOperation
(
"装备数量数据统计"
)
public
ApiRes
<
List
<
InventorySummary
>>
EquipmentStatistics
(
@RequestBody
InventorySumReq
req
){
public
ApiRes
<
List
<
InventorySummary
>>
EquipmentStatistics
(
@RequestBody
InventorySumReq
req
){
...
@@ -271,14 +277,16 @@ public class InventoryController {
...
@@ -271,14 +277,16 @@ public class InventoryController {
}
}
//判断epc是否存在
//判断epc是否存在
@PostMapping
(
"/checkEPCList"
)
@PostMapping
(
path
=
"/checkEPCList"
,
name
=
"判断epc是否存在#logType=30"
)
@ApiOperation
(
"判断epc是否存在"
)
@ApiOperation
(
"判断epc是否存在"
)
public
ApiRes
<
List
<
String
>>
checkEPCList
(
@RequestBody
EpcCheckReq
req
){
public
ApiRes
<
List
<
String
>>
checkEPCList
(
@RequestBody
EpcCheckReq
req
){
return
ApiRes
.
success
(
inventoryService
.
checkEPCList
(
req
));
return
ApiRes
.
success
(
inventoryService
.
checkEPCList
(
req
));
}
}
//调用存储过程将汇总信息进行插入
//调用存储过程将汇总信息进行插入
@PostMapping
(
"/insertToSummary"
)
@PostMapping
(
path
=
"/insertToSummary"
,
name
=
"将汇总信息进行插入更新#logType=30"
)
@ApiOperation
(
"将汇总信息进行插入更新"
)
@ApiOperation
(
"将汇总信息进行插入更新"
)
public
ApiRes
<
Boolean
>
insertToSummary
(){
public
ApiRes
<
Boolean
>
insertToSummary
(){
return
ApiRes
.
success
(
inventorySummaryService
.
insertToSummary
());
return
ApiRes
.
success
(
inventorySummaryService
.
insertToSummary
());
...
@@ -298,7 +306,7 @@ public class InventoryController {
...
@@ -298,7 +306,7 @@ public class InventoryController {
return
ApiRes
.
success
(
inventorySummaryService
.
selectSumByItems
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
selectSumByItems
(
req
));
}
}
@PostMapping
(
"/alignInventoryInfo
"
)
@PostMapping
(
path
=
"/alignInventoryInfo"
,
name
=
"同步更新装备信息#logType=30
"
)
@ApiOperation
(
"同步更新装备信息"
)
@ApiOperation
(
"同步更新装备信息"
)
public
ApiRes
<
List
<
EquipmentDto
>>
alignInventoryInfo
(
@RequestBody
InventoryReq
req
){
public
ApiRes
<
List
<
EquipmentDto
>>
alignInventoryInfo
(
@RequestBody
InventoryReq
req
){
return
ApiRes
.
success
(
inventoryService
.
alignInventoryInfo
(
req
));
return
ApiRes
.
success
(
inventoryService
.
alignInventoryInfo
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/LogController.java
deleted
100644 → 0
View file @
00484fb3
package
com
.
junmp
.
jyzb
.
controller
;
import
io.swagger.annotations.Api
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
@RestController
@Slf4j
@RequestMapping
(
"/Log"
)
@Api
(
tags
=
"日志模块"
)
public
class
LogController
{
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ManufacturerController.java
View file @
de524b28
...
@@ -27,14 +27,14 @@ public class ManufacturerController {
...
@@ -27,14 +27,14 @@ public class ManufacturerController {
private
ManufacturerService
manufacturerService
;
private
ManufacturerService
manufacturerService
;
//创建生产厂商
//创建生产厂商
@PostMapping
(
"/AddManufacturer
"
)
@PostMapping
(
path
=
"/AddManufacturer"
,
name
=
"创建生产厂商#logType=30
"
)
@ApiOperation
(
"创建生产厂商"
)
@ApiOperation
(
"创建生产厂商"
)
public
ApiRes
<
String
>
addManufacturer
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
ManufacturerReq
req
){
public
ApiRes
<
String
>
addManufacturer
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
ManufacturerReq
req
){
return
ApiRes
.
success
(
manufacturerService
.
addManufacturer
(
req
));
return
ApiRes
.
success
(
manufacturerService
.
addManufacturer
(
req
));
}
}
//修改生产厂商
//修改生产厂商
@PostMapping
(
"/UpdateManufacturer
"
)
@PostMapping
(
path
=
"/UpdateManufacturer"
,
name
=
"修改生产厂商#logType=30
"
)
@ApiOperation
(
"修改生产厂商"
)
@ApiOperation
(
"修改生产厂商"
)
public
ApiRes
<
Boolean
>
updateManufacturer
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
ManufacturerReq
req
){
public
ApiRes
<
Boolean
>
updateManufacturer
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
ManufacturerReq
req
){
return
ApiRes
.
success
(
manufacturerService
.
updateManufacturer
(
req
));
return
ApiRes
.
success
(
manufacturerService
.
updateManufacturer
(
req
));
...
@@ -48,13 +48,14 @@ public class ManufacturerController {
...
@@ -48,13 +48,14 @@ public class ManufacturerController {
}
}
//查询生产厂商(page)
//查询生产厂商(page)
@PostMapping
(
"/ShowManufacturerPage
"
)
@PostMapping
(
path
=
"/ShowManufacturerPage"
,
name
=
"修改生产厂商#logType=30
"
)
@ApiOperation
(
"修改生产厂商(page)"
)
@ApiOperation
(
"修改生产厂商(page)"
)
public
ApiRes
<
PageResult
<
Manufacturer
>>
showManufacturerPage
(
@RequestBody
ManufacturerReq
req
){
public
ApiRes
<
PageResult
<
Manufacturer
>>
showManufacturerPage
(
@RequestBody
ManufacturerReq
req
){
return
ApiRes
.
success
(
manufacturerService
.
showManufacturerPage
(
req
));
return
ApiRes
.
success
(
manufacturerService
.
showManufacturerPage
(
req
));
}
}
//删除生产厂商
//删除生产厂商
@PostMapping
(
"/DelManufacturer"
)
@PostMapping
(
path
=
"/DelManufacturer"
,
name
=
"修改生产厂商#logType=30"
)
@ApiOperation
(
"修改生产厂商"
)
@ApiOperation
(
"修改生产厂商"
)
public
ApiRes
<
Boolean
>
delManufacturer
(
@RequestBody
ManufacturerReq
req
){
public
ApiRes
<
Boolean
>
delManufacturer
(
@RequestBody
ManufacturerReq
req
){
return
ApiRes
.
success
(
manufacturerService
.
delManufacturer
(
req
));
return
ApiRes
.
success
(
manufacturerService
.
delManufacturer
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderCommonController.java
View file @
de524b28
...
@@ -23,13 +23,13 @@ public class OrderCommonController {
...
@@ -23,13 +23,13 @@ public class OrderCommonController {
@Resource
@Resource
private
OrderCommonService
orderCommonService
;
private
OrderCommonService
orderCommonService
;
@ApiOperation
(
"审核不通过,修改单子状态"
)
@ApiOperation
(
"审核不通过,修改单子状态"
)
@PostMapping
(
"/changeOrderExamineState
"
)
@PostMapping
(
path
=
"/changeOrderExamineState"
,
name
=
"审核不通过,修改单子状态#logType=30
"
)
public
ApiRes
<
Boolean
>
changeOrderExamineState
(
@RequestBody
HandleDataDTO
handleDataDTO
){
public
ApiRes
<
Boolean
>
changeOrderExamineState
(
@RequestBody
HandleDataDTO
handleDataDTO
){
return
ApiRes
.
success
(
orderCommonService
.
changeOrderExamineState
(
handleDataDTO
));
return
ApiRes
.
success
(
orderCommonService
.
changeOrderExamineState
(
handleDataDTO
));
}
}
@ApiOperation
(
"判断库存数量是否足够,如果不足则返回装备信息"
)
@ApiOperation
(
"判断库存数量是否足够,如果不足则返回装备信息"
)
@PostMapping
(
"/CheckSummaryStockNum
"
)
@PostMapping
(
path
=
"/CheckSummaryStockNum"
,
name
=
"判断库存数量是否足够,如果不足则返回装备信息#logType=30
"
)
public
ApiRes
<
String
>
CheckSummaryStockNum
(
@RequestBody
SearchItemReq
req
){
public
ApiRes
<
String
>
CheckSummaryStockNum
(
@RequestBody
SearchItemReq
req
){
return
ApiRes
.
success
(
orderCommonService
.
CheckSummaryStockNum
(
req
));
return
ApiRes
.
success
(
orderCommonService
.
CheckSummaryStockNum
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
View file @
de524b28
...
@@ -36,7 +36,7 @@ public class OrderController {
...
@@ -36,7 +36,7 @@ public class OrderController {
public
HandoverService
handoverService
;
public
HandoverService
handoverService
;
//通过工作流进行操作处理的
//通过工作流进行操作处理的
@PostMapping
(
"/AddOrder
"
)
@PostMapping
(
path
=
"/AddOrder"
,
name
=
"新增任务单#logType=30
"
)
@ApiOperation
(
"新增任务单"
)
@ApiOperation
(
"新增任务单"
)
public
ApiRes
<
List
<
String
>>
addOrder
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateOrderReq
req
)
{
public
ApiRes
<
List
<
String
>>
addOrder
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateOrderReq
req
)
{
...
@@ -47,7 +47,7 @@ public class OrderController {
...
@@ -47,7 +47,7 @@ public class OrderController {
//内部处理,任务单状态直接设置成finished 添加到数据并且直接推送到消息队列中去
//内部处理,任务单状态直接设置成finished 添加到数据并且直接推送到消息队列中去
@PostMapping
(
"/AddFinishOrder
"
)
@PostMapping
(
path
=
"/AddFinishOrder"
,
name
=
"新增已完成的任务单#logType=30
"
)
@ApiOperation
(
"新增已完成的任务单"
)
@ApiOperation
(
"新增已完成的任务单"
)
public
ApiRes
<
String
>
AddFinishOrder
(
@RequestBody
UpdateOrderReq
req
)
{
public
ApiRes
<
String
>
AddFinishOrder
(
@RequestBody
UpdateOrderReq
req
)
{
...
@@ -76,13 +76,13 @@ public class OrderController {
...
@@ -76,13 +76,13 @@ public class OrderController {
return
ApiRes
.
success
(
orderMainService
.
GetDetailById
(
req
));
return
ApiRes
.
success
(
orderMainService
.
GetDetailById
(
req
));
}
}
@PostMapping
(
"/PushState
"
)
@PostMapping
(
path
=
"/PushState"
,
name
=
"单据状态上报#logType=30
"
)
@ApiOperation
(
"单据状态上报"
)
@ApiOperation
(
"单据状态上报"
)
public
ApiRes
<
Boolean
>
PushState
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
OrderUploadReq
req
){
public
ApiRes
<
Boolean
>
PushState
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
OrderUploadReq
req
){
return
ApiRes
.
success
(
orderMainService
.
PushState
(
req
));
return
ApiRes
.
success
(
orderMainService
.
PushState
(
req
));
}
}
@PostMapping
(
"/Accounting
"
)
@PostMapping
(
path
=
"/Accounting"
,
name
=
"记账#logType=30
"
)
@ApiOperation
(
"记账"
)
@ApiOperation
(
"记账"
)
public
ApiRes
<
Boolean
>
Accounting
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateOrderReq
req
){
public
ApiRes
<
Boolean
>
Accounting
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateOrderReq
req
){
return
ApiRes
.
success
(
orderMainService
.
Accounting
(
req
));
return
ApiRes
.
success
(
orderMainService
.
Accounting
(
req
));
...
@@ -98,7 +98,7 @@ public class OrderController {
...
@@ -98,7 +98,7 @@ public class OrderController {
//个人装备管理申请单
//个人装备管理申请单
@PostMapping
(
"/AddPersonalEqsOrder
"
)
@PostMapping
(
path
=
"/AddPersonalEqsOrder"
,
name
=
"新增个人装备申请单#logType=30
"
)
@ApiOperation
(
"/新增个人装备申请单"
)
@ApiOperation
(
"/新增个人装备申请单"
)
public
ApiRes
<
List
<
String
>>
AddPersonalEqsOrder
(
@RequestBody
BaseOrderReq
req
){
public
ApiRes
<
List
<
String
>>
AddPersonalEqsOrder
(
@RequestBody
BaseOrderReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
...
@@ -114,7 +114,7 @@ public class OrderController {
...
@@ -114,7 +114,7 @@ public class OrderController {
}
}
//个人装备管理申请单的修改(移交申请)
//个人装备管理申请单的修改(移交申请)
@PostMapping
(
"/UpdatePersonalEqsOrder
"
)
@PostMapping
(
path
=
"/UpdatePersonalEqsOrder"
,
name
=
"修改个人装备申请单#logType=30
"
)
@ApiOperation
(
"修改个人装备申请单"
)
@ApiOperation
(
"修改个人装备申请单"
)
public
ApiRes
<
Boolean
>
UpdatePersonalEqsOrder
(
@RequestBody
BaseOrderReq
req
)
{
public
ApiRes
<
Boolean
>
UpdatePersonalEqsOrder
(
@RequestBody
BaseOrderReq
req
)
{
return
ApiRes
.
success
(
handoverService
.
UpdatePersonalEqsOrder
(
req
));
return
ApiRes
.
success
(
handoverService
.
UpdatePersonalEqsOrder
(
req
));
...
@@ -134,14 +134,14 @@ public class OrderController {
...
@@ -134,14 +134,14 @@ public class OrderController {
// }
// }
//入库单导出
//入库单导出
@PostMapping
(
"InOrderExport
"
)
@PostMapping
(
path
=
"/InOrderExport"
,
name
=
"入库单导出#logType=30
"
)
@ApiOperation
(
"入库单导出"
)
@ApiOperation
(
"入库单导出"
)
public
void
InOrderExport
(
@RequestBody
OrderMainReq
req
){
public
void
InOrderExport
(
@RequestBody
OrderMainReq
req
){
orderMainService
.
InOrderExport
(
req
);
orderMainService
.
InOrderExport
(
req
);
}
}
//出库单导出
//出库单导出
@PostMapping
(
"OutOrderExport
"
)
@PostMapping
(
path
=
"/OutOrderExport"
,
name
=
"入库单导出#logType=30
"
)
@ApiOperation
(
"入库单导出"
)
@ApiOperation
(
"入库单导出"
)
public
void
OutOrderExport
(
@RequestBody
OrderMainReq
req
){
public
void
OutOrderExport
(
@RequestBody
OrderMainReq
req
){
orderMainService
.
OutOrderExport
(
req
);
orderMainService
.
OutOrderExport
(
req
);
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
View file @
de524b28
...
@@ -44,7 +44,7 @@ public class PoliceController {
...
@@ -44,7 +44,7 @@ public class PoliceController {
@Resource
@Resource
public
PolicemanService
policemanService
;
public
PolicemanService
policemanService
;
@PostMapping
(
"/AddPoliceman
"
)
@PostMapping
(
path
=
"/AddPoliceman"
,
name
=
"添加警员信息#logType=30
"
)
@ApiOperation
(
"添加警员信息"
)
@ApiOperation
(
"添加警员信息"
)
public
ApiRes
<
String
>
AddPoliceman
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdatePolicemanReq
req
)
{
public
ApiRes
<
String
>
AddPoliceman
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdatePolicemanReq
req
)
{
String
policeId
=
policemanService
.
AddPoliceman
(
req
);
String
policeId
=
policemanService
.
AddPoliceman
(
req
);
...
@@ -57,7 +57,7 @@ public class PoliceController {
...
@@ -57,7 +57,7 @@ public class PoliceController {
return
ApiRes
.
success
(
policemanService
.
GetPoliceWithoutOrg
());
return
ApiRes
.
success
(
policemanService
.
GetPoliceWithoutOrg
());
}
}
@PostMapping
(
"/DeletePolice
"
)
@PostMapping
(
path
=
"/DeletePolice"
,
name
=
"删除警员信息#logType=30
"
)
@ApiOperation
(
"删除警员信息"
)
@ApiOperation
(
"删除警员信息"
)
public
ApiRes
<
Boolean
>
DeletePolice
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdatePolicemanReq
req
)
{
public
ApiRes
<
Boolean
>
DeletePolice
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdatePolicemanReq
req
)
{
boolean
b
=
policemanService
.
DeletePolice
(
req
);
boolean
b
=
policemanService
.
DeletePolice
(
req
);
...
@@ -68,14 +68,14 @@ public class PoliceController {
...
@@ -68,14 +68,14 @@ public class PoliceController {
}
}
//添加人脸和指纹照片或修改
//添加人脸和指纹照片或修改
@PostMapping
(
"/addFaceAndfinger
"
)
@PostMapping
(
path
=
"/addFaceAndfinger"
,
name
=
"添加警员人脸照片和指纹照片#logType=30
"
)
@ApiOperation
(
"添加警员人脸照片和指纹照片"
)
@ApiOperation
(
"添加警员人脸照片和指纹照片"
)
public
ApiRes
<
Boolean
>
addFaceAndfinger
(
@RequestBody
UpdatePolicemanReq
req
){
public
ApiRes
<
Boolean
>
addFaceAndfinger
(
@RequestBody
UpdatePolicemanReq
req
){
return
ApiRes
.
success
(
policemanService
.
addFaceAndfinger
(
req
));
return
ApiRes
.
success
(
policemanService
.
addFaceAndfinger
(
req
));
}
}
@PostMapping
(
"/ChangeUserState
"
)
@PostMapping
(
path
=
"/ChangeUserState"
,
name
=
"修改账号状态#logType=30
"
)
@ApiOperation
(
"修改账号状态"
)
@ApiOperation
(
"修改账号状态"
)
public
ApiRes
<
Boolean
>
ChangeUserState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdatePolicemanReq
req
)
{
public
ApiRes
<
Boolean
>
ChangeUserState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdatePolicemanReq
req
)
{
boolean
b
=
policemanService
.
ChangePoliceState
(
req
);
boolean
b
=
policemanService
.
ChangePoliceState
(
req
);
...
@@ -85,7 +85,7 @@ public class PoliceController {
...
@@ -85,7 +85,7 @@ public class PoliceController {
return
ApiRes
.
success
(
b
);
return
ApiRes
.
success
(
b
);
}
}
@PostMapping
(
"/UpdatePolice
"
)
@PostMapping
(
path
=
"/UpdatePolice"
,
name
=
"修改警员信息#logType=30
"
)
@ApiOperation
(
"修改警员信息"
)
@ApiOperation
(
"修改警员信息"
)
public
ApiRes
<
Boolean
>
UpdatePolice
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdatePolicemanReq
req
)
{
public
ApiRes
<
Boolean
>
UpdatePolice
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdatePolicemanReq
req
)
{
boolean
b
=
policemanService
.
UpdatePolice
(
req
);
boolean
b
=
policemanService
.
UpdatePolice
(
req
);
...
@@ -95,13 +95,13 @@ public class PoliceController {
...
@@ -95,13 +95,13 @@ public class PoliceController {
return
ApiRes
.
success
(
b
);
return
ApiRes
.
success
(
b
);
}
}
//重置密码
//重置密码
@PostMapping
(
"/reSetPassword
"
)
@PostMapping
(
path
=
"/reSetPassword"
,
name
=
"重置密码#logType=30
"
)
@ApiOperation
(
"重置密码"
)
@ApiOperation
(
"重置密码"
)
public
ApiRes
<
Boolean
>
reSetPassword
(
@RequestBody
@Validated
(
SysUserReq
.
resetPwd
.
class
)
SysUserReq
req
){
public
ApiRes
<
Boolean
>
reSetPassword
(
@RequestBody
@Validated
(
SysUserReq
.
resetPwd
.
class
)
SysUserReq
req
){
return
ApiRes
.
success
(
policemanService
.
reSetPassword
(
req
));
return
ApiRes
.
success
(
policemanService
.
reSetPassword
(
req
));
}
}
//修改密码
//修改密码
@PostMapping
(
"/updatePassword
"
)
@PostMapping
(
path
=
"/updatePassword"
,
name
=
"修改密码#logType=30
"
)
@ApiOperation
(
"修改密码"
)
@ApiOperation
(
"修改密码"
)
public
ApiRes
<
Boolean
>
updatePassword
(
@RequestBody
@Validated
(
SysUserReq
.
updatePwd
.
class
)
SysUserReq
req
){
public
ApiRes
<
Boolean
>
updatePassword
(
@RequestBody
@Validated
(
SysUserReq
.
updatePwd
.
class
)
SysUserReq
req
){
return
ApiRes
.
success
(
policemanService
.
updatePassword
(
req
));
return
ApiRes
.
success
(
policemanService
.
updatePassword
(
req
));
...
@@ -162,7 +162,7 @@ public class PoliceController {
...
@@ -162,7 +162,7 @@ public class PoliceController {
}
}
@PostMapping
(
"/AddFaceInfo
"
)
@PostMapping
(
path
=
"/AddFaceInfo"
,
name
=
"添加警员面部信息#logType=30
"
)
@ApiOperation
(
"添加警员面部信息"
)
@ApiOperation
(
"添加警员面部信息"
)
public
ApiRes
<
Boolean
>
AddFaceInfo
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
UpdatePolicemanReq
req
)
{
public
ApiRes
<
Boolean
>
AddFaceInfo
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
UpdatePolicemanReq
req
)
{
boolean
b
=
policemanService
.
AddFaceInfo
(
req
);
boolean
b
=
policemanService
.
AddFaceInfo
(
req
);
...
@@ -172,7 +172,7 @@ public class PoliceController {
...
@@ -172,7 +172,7 @@ public class PoliceController {
return
ApiRes
.
success
(
b
);
return
ApiRes
.
success
(
b
);
}
}
@PostMapping
(
"/UpdateFaceInfo
"
)
@PostMapping
(
path
=
"/UpdateFaceInfo"
,
name
=
"修改、删除人脸信息#logType=30
"
)
@ApiOperation
(
"修改、删除人脸信息"
)
@ApiOperation
(
"修改、删除人脸信息"
)
public
ApiRes
<
Boolean
>
UpdateFaceInfo
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdatePolicemanReq
req
)
{
public
ApiRes
<
Boolean
>
UpdateFaceInfo
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdatePolicemanReq
req
)
{
boolean
b
=
policemanService
.
UpdateFaceInfo
(
req
);
boolean
b
=
policemanService
.
UpdateFaceInfo
(
req
);
...
@@ -204,7 +204,7 @@ public class PoliceController {
...
@@ -204,7 +204,7 @@ public class PoliceController {
/**
/**
* 人员绑定箱门
* 人员绑定箱门
*/
*/
@PostMapping
(
"/PoliceBindBox
"
)
@PostMapping
(
path
=
"/PoliceBindBox"
,
name
=
"人员绑定箱门#logType=30
"
)
@ApiOperation
(
"人员绑定箱门"
)
@ApiOperation
(
"人员绑定箱门"
)
public
ApiRes
<
Boolean
>
PoliceBindBox
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
PolicemanReq
req
){
public
ApiRes
<
Boolean
>
PoliceBindBox
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
PolicemanReq
req
){
return
ApiRes
.
success
(
policemanService
.
PoliceBindBox
(
req
));
return
ApiRes
.
success
(
policemanService
.
PoliceBindBox
(
req
));
...
@@ -212,21 +212,21 @@ public class PoliceController {
...
@@ -212,21 +212,21 @@ public class PoliceController {
//删除账号的同时,将警员的信息进行更新
//删除账号的同时,将警员的信息进行更新
@PostMapping
(
"/UpdatePoliceInfo
"
)
@PostMapping
(
path
=
"/UpdatePoliceInfo"
,
name
=
"删除警员账号,修改警员信息#logType=30
"
)
@ApiOperation
(
"删除警员账号,修改警员信息"
)
@ApiOperation
(
"删除警员账号,修改警员信息"
)
public
ApiRes
<
Boolean
>
UpdatePoliceInfo
(
@RequestBody
UserOrgReq
req
){
public
ApiRes
<
Boolean
>
UpdatePoliceInfo
(
@RequestBody
UserOrgReq
req
){
return
ApiRes
.
success
(
policemanService
.
UpdatePoliceInfo
(
req
));
return
ApiRes
.
success
(
policemanService
.
UpdatePoliceInfo
(
req
));
}
}
//将警员和user一一对应并且关系表也一一对应
//将警员和user一一对应并且关系表也一一对应
@PostMapping
(
"/UpdatePoliceUser
"
)
@PostMapping
(
path
=
"/UpdatePoliceUser"
,
name
=
"将警员关系一一对应#logType=30
"
)
@ApiOperation
(
"将警员关系一一对应"
)
@ApiOperation
(
"将警员关系一一对应"
)
public
ApiRes
<
Boolean
>
UpdatePoliceUser
(){
public
ApiRes
<
Boolean
>
UpdatePoliceUser
(){
return
ApiRes
.
success
(
policemanService
.
UpdatePoliceUser
());
return
ApiRes
.
success
(
policemanService
.
UpdatePoliceUser
());
}
}
@PostMapping
(
"/PoliceReassignment
"
)
@PostMapping
(
path
=
"/PoliceReassignment"
,
name
=
"警员调岗申请单#logType=30
"
)
@ApiOperation
(
"警员调岗申请单"
)
@ApiOperation
(
"警员调岗申请单"
)
public
ApiRes
<
String
>
PoliceReassignment
(
@RequestBody
UpdateReassignmentReq
req
){
public
ApiRes
<
String
>
PoliceReassignment
(
@RequestBody
UpdateReassignmentReq
req
){
return
ApiRes
.
success
(
policemanService
.
PoliceReassignment
(
req
));
return
ApiRes
.
success
(
policemanService
.
PoliceReassignment
(
req
));
...
@@ -239,7 +239,7 @@ public class PoliceController {
...
@@ -239,7 +239,7 @@ public class PoliceController {
return
ApiRes
.
success
(
policemanService
.
ShowReassignmentPage
(
req
));
return
ApiRes
.
success
(
policemanService
.
ShowReassignmentPage
(
req
));
}
}
@PostMapping
(
"/ChangePoliceOrg
"
)
@PostMapping
(
path
=
"/ChangePoliceOrg"
,
name
=
"警员调岗(业务过程)#logType=30
"
)
@ApiOperation
(
"警员调岗(业务过程)"
)
@ApiOperation
(
"警员调岗(业务过程)"
)
public
ApiRes
<
Boolean
>
changePoliceOrg
(
@RequestBody
UpdateReassignmentReq
req
){
public
ApiRes
<
Boolean
>
changePoliceOrg
(
@RequestBody
UpdateReassignmentReq
req
){
return
ApiRes
.
success
(
policemanService
.
changePoliceOrg
(
req
));
return
ApiRes
.
success
(
policemanService
.
changePoliceOrg
(
req
));
...
@@ -263,13 +263,13 @@ public class PoliceController {
...
@@ -263,13 +263,13 @@ public class PoliceController {
}
}
@PostMapping
(
"/alignPoliceInfo
"
)
@PostMapping
(
path
=
"/alignPoliceInfo"
,
name
=
"同步更新警员信息#logType=30
"
)
@ApiOperation
(
"同步更新警员信息"
)
@ApiOperation
(
"同步更新警员信息"
)
public
ApiRes
<
List
<
PoliceDto
>>
alignPoliceInfo
(
@RequestBody
PolicemanReq
req
){
public
ApiRes
<
List
<
PoliceDto
>>
alignPoliceInfo
(
@RequestBody
PolicemanReq
req
){
return
ApiRes
.
success
(
policemanService
.
alignPoliceInfo
(
req
));
return
ApiRes
.
success
(
policemanService
.
alignPoliceInfo
(
req
));
}
}
@PostMapping
(
"/alignUserInfo
"
)
@PostMapping
(
path
=
"/alignUserInfo"
,
name
=
"同步更新用户信息#logType=30
"
)
@ApiOperation
(
"同步更新用户信息"
)
@ApiOperation
(
"同步更新用户信息"
)
public
ApiRes
<
List
<
UserDto
>>
alignUserInfo
(
@RequestBody
PolicemanReq
req
){
public
ApiRes
<
List
<
UserDto
>>
alignUserInfo
(
@RequestBody
PolicemanReq
req
){
return
ApiRes
.
success
(
policemanService
.
alignUserInfo
(
req
));
return
ApiRes
.
success
(
policemanService
.
alignUserInfo
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PolicemanFingerController.java
View file @
de524b28
...
@@ -26,20 +26,20 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
...
@@ -26,20 +26,20 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
@Resource
@Resource
PoliceFingerService
policeFingerService
;
PoliceFingerService
policeFingerService
;
@PostMapping
(
"/AddFingerInfo
"
)
@PostMapping
(
path
=
"/AddFingerInfo"
,
name
=
"添加指纹信息#logType=30
"
)
@ApiOperation
(
"添加指纹信息"
)
@ApiOperation
(
"添加指纹信息"
)
public
ApiRes
<
Integer
>
addFingerInfo
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdatePoliceFingerReq
req
)
{
public
ApiRes
<
Integer
>
addFingerInfo
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdatePoliceFingerReq
req
)
{
return
ApiRes
.
success
(
policeFingerService
.
addFingerInfo
(
req
))
;
return
ApiRes
.
success
(
policeFingerService
.
addFingerInfo
(
req
))
;
}
}
@PostMapping
(
"/UpdateFingerInfo
"
)
@PostMapping
(
path
=
"/UpdateFingerInfo"
,
name
=
"修改指纹信息#logType=30
"
)
@ApiOperation
(
"修改指纹信息"
)
@ApiOperation
(
"修改指纹信息"
)
public
ApiRes
<
Boolean
>
updateFingerInfo
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdatePoliceFingerReq
req
)
{
public
ApiRes
<
Boolean
>
updateFingerInfo
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdatePoliceFingerReq
req
)
{
return
ApiRes
.
success
(
policeFingerService
.
updateFingerInfo
(
req
))
;
return
ApiRes
.
success
(
policeFingerService
.
updateFingerInfo
(
req
))
;
}
}
@PostMapping
(
"/insertOrUpdateFingerInfo
"
)
@PostMapping
(
path
=
"/insertOrUpdateFingerInfo"
,
name
=
"新增或者修改指纹信息#logType=30
"
)
@ApiOperation
(
"新增或者修改指纹信息"
)
@ApiOperation
(
"新增或者修改指纹信息"
)
public
ApiRes
<
Boolean
>
insertOrUpdateFingerInfo
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
UpdatePoliceFingerReq
req
)
{
public
ApiRes
<
Boolean
>
insertOrUpdateFingerInfo
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
UpdatePoliceFingerReq
req
)
{
return
ApiRes
.
success
(
policeFingerService
.
insertOrUpdateFingerInfo
(
req
))
;
return
ApiRes
.
success
(
policeFingerService
.
insertOrUpdateFingerInfo
(
req
))
;
...
@@ -54,7 +54,7 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
...
@@ -54,7 +54,7 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
return
ApiRes
.
success
(
policeFingerService
.
searchFingerInfo
(
req
));
return
ApiRes
.
success
(
policeFingerService
.
searchFingerInfo
(
req
));
}
}
@PostMapping
(
"/DeleteFingerInfo
"
)
@PostMapping
(
path
=
"/DeleteFingerInfo"
,
name
=
"删除警员指纹信息#logType=30
"
)
@ApiOperation
(
"删除警员指纹信息"
)
@ApiOperation
(
"删除警员指纹信息"
)
public
ApiRes
<
Boolean
>
deletePoliceFinger
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdatePoliceFingerReq
req
)
{
public
ApiRes
<
Boolean
>
deletePoliceFinger
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdatePoliceFingerReq
req
)
{
return
ApiRes
.
success
(
policeFingerService
.
deleteFinger
(
req
));
return
ApiRes
.
success
(
policeFingerService
.
deleteFinger
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
View file @
de524b28
...
@@ -27,7 +27,7 @@ public class PubOrgController {
...
@@ -27,7 +27,7 @@ public class PubOrgController {
@Resource
@Resource
public
PubOrgService
pubOrgService
;
public
PubOrgService
pubOrgService
;
@GetMapping
(
"/SetOrgParentIds
"
)
@GetMapping
(
path
=
"/SetOrgParentIds"
,
name
=
"填充组织机构的parent_ids字段#logType=30
"
)
@ApiOperation
(
"填充组织机构的parent_ids字段"
)
@ApiOperation
(
"填充组织机构的parent_ids字段"
)
public
ResponseResult
setOrgParentIds
()
{
public
ResponseResult
setOrgParentIds
()
{
//传入当前的组织机构id,展示所有本级及下级的
//传入当前的组织机构id,展示所有本级及下级的
...
@@ -35,7 +35,7 @@ public class PubOrgController {
...
@@ -35,7 +35,7 @@ public class PubOrgController {
return
returnMsg
;
return
returnMsg
;
}
}
@PostMapping
(
"/SetDName
"
)
@PostMapping
(
path
=
"/setShortName"
,
name
=
"填充组织机构简称到数据库#logType=30
"
)
@ApiOperation
(
"填充组织机构简称到数据库"
)
@ApiOperation
(
"填充组织机构简称到数据库"
)
public
ResponseResult
setShortName
(
@RequestBody
Map
<
String
,
Object
>
orgId
)
{
public
ResponseResult
setShortName
(
@RequestBody
Map
<
String
,
Object
>
orgId
)
{
ResponseResult
returnMsg
=
pubOrgService
.
setShortName
(
orgId
);
ResponseResult
returnMsg
=
pubOrgService
.
setShortName
(
orgId
);
...
@@ -57,7 +57,7 @@ public class PubOrgController {
...
@@ -57,7 +57,7 @@ public class PubOrgController {
public
ApiRes
<
ESOrgDto
>
GetCurrentESList
(
@RequestBody
QueryOrgReq
req
)
throws
IOException
{
public
ApiRes
<
ESOrgDto
>
GetCurrentESList
(
@RequestBody
QueryOrgReq
req
)
throws
IOException
{
return
ApiRes
.
success
(
pubOrgService
.
getOrgTreeByEs
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
getOrgTreeByEs
(
req
));
}
}
@PostMapping
(
"/ChangeOrgState
"
)
@PostMapping
(
path
=
"/ChangeOrgState"
,
name
=
"改变组织机构状态信息#logType=30
"
)
@ApiOperation
(
"改变组织机构状态信息"
)
@ApiOperation
(
"改变组织机构状态信息"
)
public
ApiRes
<
Boolean
>
changeOrgState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateOrgReq
req
)
{
public
ApiRes
<
Boolean
>
changeOrgState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateOrgReq
req
)
{
return
ApiRes
.
success
(
pubOrgService
.
ChangeState
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
ChangeState
(
req
));
...
@@ -78,13 +78,13 @@ public class PubOrgController {
...
@@ -78,13 +78,13 @@ public class PubOrgController {
//新增
//新增
@ApiOperation
(
"新增组织机构信息"
)
@ApiOperation
(
"新增组织机构信息"
)
@PostMapping
(
"/addPubOrg
"
)
@PostMapping
(
path
=
"/addPubOrg"
,
name
=
"新增组织机构信息#logType=30
"
)
public
ApiRes
<
Long
>
addPubOrg
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateOrgReq
req
){
public
ApiRes
<
Long
>
addPubOrg
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateOrgReq
req
){
return
ApiRes
.
success
(
pubOrgService
.
addPubOrg
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
addPubOrg
(
req
));
}
}
//修改(名字,状态)
//修改(名字,状态)
@ApiOperation
(
"修改组织机构信息"
)
@ApiOperation
(
"修改组织机构信息"
)
@PostMapping
(
"/updatePubOrg
"
)
@PostMapping
(
path
=
"/updatePubOrg"
,
name
=
"修改组织机构信息#logType=30
"
)
public
ApiRes
<
Boolean
>
updatePubOrg
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateOrgReq
req
){
public
ApiRes
<
Boolean
>
updatePubOrg
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateOrgReq
req
){
return
ApiRes
.
success
(
pubOrgService
.
updatePubOrg
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
updatePubOrg
(
req
));
}
}
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
View file @
de524b28
...
@@ -80,7 +80,7 @@ public class PublicController {
...
@@ -80,7 +80,7 @@ public class PublicController {
//上传人脸照片
//上传人脸照片
@PostMapping
(
"/uploadPolicePhoto
"
)
@PostMapping
(
path
=
"/uploadPolicePhoto"
,
name
=
"上传人脸照片#logType=30
"
)
public
ApiRes
<
UploadPolicePhotoDto
>
uploadPolicePhoto
(
@RequestPart
(
"picture"
)
MultipartFile
picture
,
UploadPolicePhotoReq
req
)
{
public
ApiRes
<
UploadPolicePhotoDto
>
uploadPolicePhoto
(
@RequestPart
(
"picture"
)
MultipartFile
picture
,
UploadPolicePhotoReq
req
)
{
return
ApiRes
.
success
(
policemanService
.
uploadPolicePhoto
(
picture
,
req
));
return
ApiRes
.
success
(
policemanService
.
uploadPolicePhoto
(
picture
,
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/RepairUnitController.java
View file @
de524b28
...
@@ -29,14 +29,14 @@ public class RepairUnitController {
...
@@ -29,14 +29,14 @@ public class RepairUnitController {
private
RepairUnitService
repairUnitService
;
private
RepairUnitService
repairUnitService
;
//创建报废/销毁单位
//创建报废/销毁单位
@PostMapping
(
"/AddRepairUnit
"
)
@PostMapping
(
path
=
"/AddRepairUnit"
,
name
=
"创建报废/销毁单位#logType=30
"
)
@ApiOperation
(
"创建报废/销毁单位"
)
@ApiOperation
(
"创建报废/销毁单位"
)
public
ApiRes
<
String
>
addRepairUnit
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
RepairUnitReq
req
){
public
ApiRes
<
String
>
addRepairUnit
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
RepairUnitReq
req
){
return
ApiRes
.
success
(
repairUnitService
.
addRepairUnit
(
req
));
return
ApiRes
.
success
(
repairUnitService
.
addRepairUnit
(
req
));
}
}
//修改报废/销毁单位
//修改报废/销毁单位
@PostMapping
(
"/UpdateRepairUnit
"
)
@PostMapping
(
path
=
"/UpdateRepairUnit"
,
name
=
"修改报废/销毁单位#logType=30
"
)
@ApiOperation
(
"修改报废/销毁单位"
)
@ApiOperation
(
"修改报废/销毁单位"
)
public
ApiRes
<
Boolean
>
updateRepairUnit
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
RepairUnitReq
req
){
public
ApiRes
<
Boolean
>
updateRepairUnit
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
RepairUnitReq
req
){
return
ApiRes
.
success
(
repairUnitService
.
updateRepairUnit
(
req
));
return
ApiRes
.
success
(
repairUnitService
.
updateRepairUnit
(
req
));
...
@@ -51,13 +51,14 @@ public class RepairUnitController {
...
@@ -51,13 +51,14 @@ public class RepairUnitController {
}
}
//查询报废/销毁单位(page)
//查询报废/销毁单位(page)
@PostMapping
(
"/ShowRepairUnitPage
"
)
@PostMapping
(
path
=
"/ShowRepairUnitPage"
,
name
=
"修改报废/销毁单位(page)#logType=30
"
)
@ApiOperation
(
"修改报废/销毁单位(page)"
)
@ApiOperation
(
"修改报废/销毁单位(page)"
)
public
ApiRes
<
PageResult
<
RepairUnit
>>
showRepairUnitPage
(
@RequestBody
RepairUnitReq
req
){
public
ApiRes
<
PageResult
<
RepairUnit
>>
showRepairUnitPage
(
@RequestBody
RepairUnitReq
req
){
return
ApiRes
.
success
(
repairUnitService
.
showRepairUnitPage
(
req
));
return
ApiRes
.
success
(
repairUnitService
.
showRepairUnitPage
(
req
));
}
}
//删除报废/销毁单位
//删除报废/销毁单位
@PostMapping
(
"/DelRepairUnit"
)
@PostMapping
(
path
=
"/DelRepairUnit"
,
name
=
"修改报废/销毁单位#logType=30"
)
@ApiOperation
(
"修改报废/销毁单位"
)
@ApiOperation
(
"修改报废/销毁单位"
)
public
ApiRes
<
Boolean
>
delRepairUnit
(
@RequestBody
RepairUnitReq
req
){
public
ApiRes
<
Boolean
>
delRepairUnit
(
@RequestBody
RepairUnitReq
req
){
return
ApiRes
.
success
(
repairUnitService
.
delRepairUnit
(
req
));
return
ApiRes
.
success
(
repairUnitService
.
delRepairUnit
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/SupplierController.java
View file @
de524b28
...
@@ -31,13 +31,13 @@ public class SupplierController {
...
@@ -31,13 +31,13 @@ public class SupplierController {
@Resource
@Resource
public
SupplierService
supplierService
;
public
SupplierService
supplierService
;
@PostMapping
(
"/AddSupplier
"
)
@PostMapping
(
path
=
"/AddSupplier"
,
name
=
"添加供应商#logType=30
"
)
@ApiOperation
(
"添加供应商"
)
@ApiOperation
(
"添加供应商"
)
public
ApiRes
<
String
>
AddSupplier
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateSupplierReq
req
)
{
public
ApiRes
<
String
>
AddSupplier
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateSupplierReq
req
)
{
return
ApiRes
.
success
(
supplierService
.
AddSupplier
(
req
));
return
ApiRes
.
success
(
supplierService
.
AddSupplier
(
req
));
}
}
@PostMapping
(
"/DeleteSupplier
"
)
@PostMapping
(
path
=
"/DeleteSupplier"
,
name
=
"删除供应商信息#logType=30
"
)
@ApiOperation
(
"删除供应商信息"
)
@ApiOperation
(
"删除供应商信息"
)
public
ApiRes
<
Boolean
>
DeleteSupplier
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateSupplierReq
req
)
{
public
ApiRes
<
Boolean
>
DeleteSupplier
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateSupplierReq
req
)
{
return
ApiRes
.
success
(
supplierService
.
DeleteSupplier
(
req
));
return
ApiRes
.
success
(
supplierService
.
DeleteSupplier
(
req
));
...
@@ -59,19 +59,20 @@ public class SupplierController {
...
@@ -59,19 +59,20 @@ public class SupplierController {
}
}
@PostMapping
(
"/UpdateSupplier"
)
@PostMapping
(
path
=
"/UpdateSupplier"
,
name
=
"修改供应商信息#logType=30"
)
@ApiOperation
(
"修改供应商信息"
)
@ApiOperation
(
"修改供应商信息"
)
public
ApiRes
<
Boolean
>
updateSupplier
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateSupplierReq
req
)
{
public
ApiRes
<
Boolean
>
updateSupplier
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateSupplierReq
req
)
{
return
ApiRes
.
success
(
supplierService
.
UpdateSupplier
(
req
));
return
ApiRes
.
success
(
supplierService
.
UpdateSupplier
(
req
));
}
}
@PostMapping
(
"/ChangeSupplierState
"
)
@PostMapping
(
path
=
"/ChangeSupplierState"
,
name
=
"修改供应商状态#logType=30
"
)
@ApiOperation
(
"修改供应商状态"
)
@ApiOperation
(
"修改供应商状态"
)
public
ApiRes
<
Boolean
>
changeSupplierState
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateSupplierReq
req
)
{
public
ApiRes
<
Boolean
>
changeSupplierState
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateSupplierReq
req
)
{
return
ApiRes
.
success
(
supplierService
.
ChangeSupplierState
(
req
));
return
ApiRes
.
success
(
supplierService
.
ChangeSupplierState
(
req
));
}
}
@PostMapping
(
"/alignSupplierInfo
"
)
@PostMapping
(
path
=
"/alignSupplierInfo"
,
name
=
"同步更新号型信息#logType=30
"
)
@ApiOperation
(
"同步更新号型信息"
)
@ApiOperation
(
"同步更新号型信息"
)
public
ApiRes
<
List
<
SupplierInfoDto
>>
alignSupplierInfo
(
@RequestBody
UpdateSupplierReq
req
){
public
ApiRes
<
List
<
SupplierInfoDto
>>
alignSupplierInfo
(
@RequestBody
UpdateSupplierReq
req
){
return
ApiRes
.
success
(
supplierService
.
alignSupplierInfo
(
req
));
return
ApiRes
.
success
(
supplierService
.
alignSupplierInfo
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java
View file @
de524b28
...
@@ -43,20 +43,23 @@ public class WarehouseController {
...
@@ -43,20 +43,23 @@ public class WarehouseController {
public
ShelfService
shelfService
;
public
ShelfService
shelfService
;
@PostMapping
(
"/AddWarehouse"
)
@PostMapping
(
path
=
"/AddWarehouse"
,
name
=
"添加仓库#logType=30"
)
@ApiOperation
(
"添加仓库"
)
@ApiOperation
(
"添加仓库"
)
public
ApiRes
<
String
>
AddWarehouse
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateWarehouseReq
req
)
{
public
ApiRes
<
String
>
AddWarehouse
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateWarehouseReq
req
)
{
return
ApiRes
.
success
(
warehouseService
.
AddWarehouse
(
req
));
return
ApiRes
.
success
(
warehouseService
.
AddWarehouse
(
req
));
}
}
@PostMapping
(
"/DeleteWarehouse"
)
@PostMapping
(
path
=
"/DeleteWarehouse"
,
name
=
"删除仓库信息#logType=30"
)
@ApiOperation
(
"删除仓库信息"
)
@ApiOperation
(
"删除仓库信息"
)
public
ApiRes
<
Boolean
>
DeleteWarehouse
(
@RequestBody
UpdateWarehouseReq
req
)
{
public
ApiRes
<
Boolean
>
DeleteWarehouse
(
@RequestBody
UpdateWarehouseReq
req
)
{
return
ApiRes
.
success
(
warehouseService
.
DeleteWarehouse
(
req
));
return
ApiRes
.
success
(
warehouseService
.
DeleteWarehouse
(
req
));
}
}
@PostMapping
(
"/ChangeWarehouseState"
)
@PostMapping
(
path
=
"/ChangeWarehouseState"
,
name
=
"禁用/启用仓库#logType=30"
)
@ApiOperation
(
"禁用/启用仓库"
)
@ApiOperation
(
"禁用/启用仓库"
)
public
ApiRes
<
Boolean
>
changeWarehouseState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
WarehouseReq
req
)
{
public
ApiRes
<
Boolean
>
changeWarehouseState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
WarehouseReq
req
)
{
return
ApiRes
.
success
(
warehouseService
.
changeWarehouseState
(
req
));
return
ApiRes
.
success
(
warehouseService
.
changeWarehouseState
(
req
));
...
@@ -82,25 +85,27 @@ public class WarehouseController {
...
@@ -82,25 +85,27 @@ public class WarehouseController {
return
ApiRes
.
success
(
warehouseService
.
getOneWarehouse
(
req
));
return
ApiRes
.
success
(
warehouseService
.
getOneWarehouse
(
req
));
}
}
@PostMapping
(
"/UpdateWarehouse"
)
@PostMapping
(
path
=
"/UpdateWarehouse"
,
name
=
"修改仓库信息#logType=30"
)
@ApiOperation
(
"修改仓库信息"
)
@ApiOperation
(
"修改仓库信息"
)
public
ApiRes
<
Boolean
>
updateWarehouse
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateWarehouseReq
req
)
{
public
ApiRes
<
Boolean
>
updateWarehouse
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateWarehouseReq
req
)
{
return
ApiRes
.
success
(
warehouseService
.
updateWarehouse
(
req
));
return
ApiRes
.
success
(
warehouseService
.
updateWarehouse
(
req
));
}
}
@PostMapping
(
"/AddArea
"
)
@PostMapping
(
path
=
"/AddArea"
,
name
=
"添加区域#logType=30
"
)
@ApiOperation
(
"添加区域"
)
@ApiOperation
(
"添加区域"
)
public
ApiRes
<
String
>
addArea
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateWarehouseAreaReq
req
)
{
public
ApiRes
<
String
>
addArea
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateWarehouseAreaReq
req
)
{
return
ApiRes
.
success
(
warehouseAreaService
.
addArea
(
req
));
return
ApiRes
.
success
(
warehouseAreaService
.
addArea
(
req
));
}
}
@PostMapping
(
"/UpdateArea
"
)
@PostMapping
(
path
=
"/UpdateArea"
,
name
=
"修改区域#logType=30
"
)
@ApiOperation
(
"修改区域"
)
@ApiOperation
(
"修改区域"
)
public
ApiRes
<
Boolean
>
updateArea
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateWarehouseAreaReq
req
)
{
public
ApiRes
<
Boolean
>
updateArea
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateWarehouseAreaReq
req
)
{
return
ApiRes
.
success
(
warehouseAreaService
.
updateArea
(
req
));
return
ApiRes
.
success
(
warehouseAreaService
.
updateArea
(
req
));
}
}
@PostMapping
(
"/DeleteArea"
)
@PostMapping
(
path
=
"/DeleteArea"
,
name
=
"删除区域#logType=30"
)
@ApiOperation
(
"删除区域"
)
@ApiOperation
(
"删除区域"
)
public
ApiRes
<
Boolean
>
deleteArea
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateWarehouseAreaReq
req
)
{
public
ApiRes
<
Boolean
>
deleteArea
(
@RequestBody
@Validated
(
ValidationApi
.
delete
.
class
)
UpdateWarehouseAreaReq
req
)
{
return
ApiRes
.
success
(
warehouseAreaService
.
deleteArea
(
req
));
return
ApiRes
.
success
(
warehouseAreaService
.
deleteArea
(
req
));
...
@@ -114,19 +119,19 @@ public class WarehouseController {
...
@@ -114,19 +119,19 @@ public class WarehouseController {
}
}
@PostMapping
(
"/AddShelf
"
)
@PostMapping
(
path
=
"/AddShelf"
,
name
=
"添加货架#logType=30
"
)
@ApiOperation
(
"添加货架"
)
@ApiOperation
(
"添加货架"
)
public
ApiRes
<
String
>
AddShelf
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateShelfReq
req
)
{
public
ApiRes
<
String
>
AddShelf
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateShelfReq
req
)
{
return
ApiRes
.
success
(
shelfService
.
AddShelf
(
req
));
return
ApiRes
.
success
(
shelfService
.
AddShelf
(
req
));
}
}
@PostMapping
(
"/UpdateShelf
"
)
@PostMapping
(
path
=
"/UpdateShelf"
,
name
=
"修改货架#logType=30
"
)
@ApiOperation
(
"修改货架"
)
@ApiOperation
(
"修改货架"
)
public
ApiRes
<
Boolean
>
UpdateShelf
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateShelfReq
req
)
{
public
ApiRes
<
Boolean
>
UpdateShelf
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
UpdateShelfReq
req
)
{
return
ApiRes
.
success
(
shelfService
.
UpdateShelf
(
req
));
return
ApiRes
.
success
(
shelfService
.
UpdateShelf
(
req
));
}
}
@PostMapping
(
"/DeleteShelf
"
)
@PostMapping
(
path
=
"/DeleteShelf"
,
name
=
"删除货架#logType=30
"
)
@ApiOperation
(
"删除货架"
)
@ApiOperation
(
"删除货架"
)
public
ApiRes
<
Boolean
>
DeleteShelf
(
@RequestBody
@Validated
(
ShelfReq
.
delete
.
class
)
UpdateShelfReq
req
)
{
public
ApiRes
<
Boolean
>
DeleteShelf
(
@RequestBody
@Validated
(
ShelfReq
.
delete
.
class
)
UpdateShelfReq
req
)
{
return
ApiRes
.
success
(
shelfService
.
DeleteShelf
(
req
));
return
ApiRes
.
success
(
shelfService
.
DeleteShelf
(
req
));
...
@@ -139,13 +144,13 @@ public class WarehouseController {
...
@@ -139,13 +144,13 @@ public class WarehouseController {
return
ApiRes
.
success
(
shelfService
.
GetShelfList
(
req
));
return
ApiRes
.
success
(
shelfService
.
GetShelfList
(
req
));
}
}
@PostMapping
(
"/alignWarehouseInfo
"
)
@PostMapping
(
path
=
"/alignWarehouseInfo"
,
name
=
"同步更新仓库信息#logType=30
"
)
@ApiOperation
(
"同步更新仓库信息"
)
@ApiOperation
(
"同步更新仓库信息"
)
public
ApiRes
<
List
<
WarehouseInfoDto
>>
alignWarehouseInfo
(
@RequestBody
UpdateWarehouseReq
req
){
public
ApiRes
<
List
<
WarehouseInfoDto
>>
alignWarehouseInfo
(
@RequestBody
UpdateWarehouseReq
req
){
return
ApiRes
.
success
(
warehouseService
.
alignWarehouseInfo
(
req
));
return
ApiRes
.
success
(
warehouseService
.
alignWarehouseInfo
(
req
));
}
}
@PostMapping
(
"/updateHumidityAndtemperature
"
)
@PostMapping
(
path
=
"/updateHumidityAndtemperature"
,
name
=
"更新温湿度#logType=30
"
)
@ApiOperation
(
"更新温湿度"
)
@ApiOperation
(
"更新温湿度"
)
public
ApiRes
<
Boolean
>
updateHumidityAndtemperature
(
@RequestBody
HumidityAndtemperature
req
){
public
ApiRes
<
Boolean
>
updateHumidityAndtemperature
(
@RequestBody
HumidityAndtemperature
req
){
return
ApiRes
.
success
(
warehouseService
.
updateHumidityAndtemperature
(
req
));
return
ApiRes
.
success
(
warehouseService
.
updateHumidityAndtemperature
(
req
));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论