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
0d4c5b47
Commit
0d4c5b47
authored
Dec 29, 2023
by
赵剑炜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整日志记录
parent
547c5f2d
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
50 行增加
和
30 行删除
+50
-30
ManufacturerController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ManufacturerController.java
+1
-1
OrderController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
+4
-4
OutAndInboundController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java
+9
-6
PoliceController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
+19
-11
PolicemanFingerController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PolicemanFingerController.java
+3
-1
RepairUnitController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/RepairUnitController.java
+2
-1
SupplierController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/SupplierController.java
+4
-2
WarehouseController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java
+8
-4
没有找到文件。
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ManufacturerController.java
View file @
0d4c5b47
...
...
@@ -41,7 +41,7 @@ public class ManufacturerController {
}
//查询生产厂商(list)
@PostMapping
(
"/ShowManufacturerList
"
)
@PostMapping
(
path
=
"/ShowManufacturerList"
,
name
=
"查询生产厂商#enable
"
)
@ApiOperation
(
"查询生产厂商(list)"
)
public
ApiRes
<
List
<
Manufacturer
>>
showManufacturerList
(
@RequestBody
ManufacturerReq
req
){
return
ApiRes
.
success
(
manufacturerService
.
showManufacturerList
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
View file @
0d4c5b47
...
...
@@ -64,13 +64,13 @@ public class OrderController {
//查询任务列表(根据组织机构id)
@PostMapping
(
"/GetOrderPag
e"
)
@PostMapping
(
path
=
"/GetOrderPage"
,
name
=
"查询任务列表#enabl
e"
)
@ApiOperation
(
"/查询任务列表"
)
public
ApiRes
<
PageResult
<
OrderMainDto
>>
getOrderPage
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
OrderMainReq
req
){
return
ApiRes
.
success
(
orderMainService
.
getOrderPage
(
req
));
}
@PostMapping
(
"/GetDetailById
"
)
@PostMapping
(
path
=
"/GetDetailById"
,
name
=
"根据任务单id查看业务明细#enable
"
)
@ApiOperation
(
"根据任务单id查看业务明细"
)
public
ApiRes
<
OrderDto
>
GetDetailById
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
OrderMainReq
req
){
return
ApiRes
.
success
(
orderMainService
.
GetDetailById
(
req
));
...
...
@@ -90,7 +90,7 @@ public class OrderController {
//记账完成之后往消息队列推送消息表示该单子已经完成结算
@PostMapping
(
"/ShowAccountingPag
e"
)
@PostMapping
(
path
=
"/ShowAccountingPage"
,
name
=
"查看记账列表#enabl
e"
)
@ApiOperation
(
"查看记账列表"
)
public
ApiRes
<
PageResult
<
OrderLog
>>
ShowAccountingPage
(
@RequestBody
QueryOrderLogReq
req
){
return
ApiRes
.
success
(
orderMainService
.
ShowAccountingPage
(
req
));
...
...
@@ -149,7 +149,7 @@ public class OrderController {
//根据流程id获取单据的装备信息
@PostMapping
(
"/GetByProcessId
"
)
@PostMapping
(
path
=
"/GetByProcessId"
,
name
=
"根据流程id获取单据装备信息#enable
"
)
@ApiOperation
(
"根据流程id获取单据装备信息"
)
public
ApiRes
<
ProcessOrderDto
>
GetByProcessId
(
@RequestBody
OrderMainReq
req
){
return
ApiRes
.
success
(
orderMainService
.
GetByProcessId
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java
View file @
0d4c5b47
...
...
@@ -48,13 +48,13 @@ public class OutAndInboundController {
private
LogSummarySecondService
logSummarySecondService
;
@ApiOperation
(
"/查看出入库详情"
)
@PostMapping
(
"/GetDetailByLogSumId
"
)
@PostMapping
(
path
=
"/GetDetailByLogSumId"
,
name
=
"查看出入库详情#enable
"
)
public
ApiRes
<
List
<
LogDetailDto
>>
GetDetailByLogSumId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
LogDetailReq
req
){
return
ApiRes
.
success
(
logDetailService
.
GetDetailByLogSumId
(
req
));
}
//装备出入库记录(根据单据id)
@PostMapping
(
"/ShowInOutRecordsByOrder
"
)
@PostMapping
(
path
=
"/ShowInOutRecordsByOrder"
,
name
=
"出入库单据查询展示#enable
"
)
@ApiOperation
(
"出入库单据查询展示"
)
public
ApiRes
<
List
<
LogDetailDto
>>
ShowInOutRecordsByOrder
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
LogSummaryReq
req
){
return
ApiRes
.
success
(
logDetailService
.
ShowInOutRecordsByOrder
(
req
));
...
...
@@ -62,14 +62,16 @@ public class OutAndInboundController {
//装备出入库记录(根据条件查询)
@PostMapping
(
"/ShowInOutRecordsByItems"
)
@PostMapping
(
path
=
"/ShowInOutRecordsByItems"
,
name
=
"出入库记录条件查询展示#enable"
)
@ApiOperation
(
"出入库记录条件查询展示"
)
public
ApiRes
<
PageResult
<
LogSummary
>>
ShowInOutRecordsByItems
(
@RequestBody
@Validated
(
ValidationApi
.
page
.
class
)
LogSummaryReq
req
){
return
ApiRes
.
success
(
logSummaryService
.
ShowInOutRecordsByItems
(
req
));
}
//通过装备id查询某一件装备的出入库记录
@PostMapping
(
"/ShowInOutRecordsByEqs"
)
@PostMapping
(
path
=
"/ShowInOutRecordsByEqs"
,
name
=
"出入库记录装备id查询展示#enable"
)
@ApiOperation
(
"出入库记录装备id查询展示"
)
public
ApiRes
<
PageResult
<
LogDetail
>>
getInOutRecords
(
@RequestBody
@Validated
(
ValidationApi
.
page
.
class
)
InventoryReq
req
){
return
ApiRes
.
success
(
logDetailService
.
getInOutRecords
(
req
));
...
...
@@ -79,13 +81,14 @@ public class OutAndInboundController {
// public ApiRes<Boolean> OutInRecords(@RequestBody OutInLogsReq req){
// return ApiRes.success(logSummaryService.processInventoryRecords(req));
// }
@PostMapping
(
"/ShowRecordsByOrderId
"
)
@PostMapping
(
path
=
"/ShowRecordsByOrderId"
,
name
=
"出入库以及记账过程#enable
"
)
@ApiOperation
(
"出入库以及记账过程"
)
public
ApiRes
<
List
<
OrderLogDto
>>
ShowRecordsByOrderId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
LogSummaryReq
req
){
return
ApiRes
.
success
(
orderLogService
.
ShowRecordsByOrderId
(
req
));
}
@PostMapping
(
"getSecondInfoByLogSumId"
)
@PostMapping
(
path
=
"/getSecondInfoByLogSumId"
,
name
=
"根据出入库汇总id查询二级信息#enable"
)
@ApiOperation
(
"根据出入库汇总id查询二级信息"
)
public
ApiRes
<
List
<
LogSummarySecondDto
>>
getSecondInfoByLogSumId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
QueryLogSummarySecondReq
req
){
return
ApiRes
.
success
(
orderLogService
.
getSecondInfoByLogSumId
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
View file @
0d4c5b47
...
...
@@ -51,7 +51,7 @@ public class PoliceController {
return
ApiRes
.
success
(
policeId
);
}
//添加警员时先将没有组织机构号的警员查询出来
@PostMapping
(
"/GetPoliceWithoutOrg
"
)
@PostMapping
(
path
=
"/GetPoliceWithoutOrg"
,
name
=
"获取没有组织机构的警员信息#enable
"
)
@ApiOperation
(
"/获取没有组织机构的警员信息"
)
public
ApiRes
<
List
<
Policeman
>>
GetPoliceWithoutOrg
(){
return
ApiRes
.
success
(
policemanService
.
GetPoliceWithoutOrg
());
...
...
@@ -110,7 +110,8 @@ public class PoliceController {
//根据条件查询,只查询本级,不包含下级(list)
@PostMapping
(
"/ShowPoliceList"
)
@PostMapping
(
path
=
"/ShowPoliceList"
,
name
=
"根据条件查询所有警员信息#enable"
)
@ApiOperation
(
"根据条件查询所有警员信息(list)"
)
public
ApiRes
<
List
<
PolicemanDto
>>
GetAllPolicemanList
(
@RequestBody
PolicemanReq
req
){
List
<
PolicemanDto
>
policemanDtos
=
policemanService
.
GetAllPolicemanList
(
req
);
...
...
@@ -118,7 +119,7 @@ public class PoliceController {
}
//根据组条件查询,只查询本级,不包含下级(page)--可以根据组织机构查询
@PostMapping
(
"/ShowPolicePag
e"
)
@PostMapping
(
path
=
"/ShowPolicePage"
,
name
=
"根据条件查询所有警员信息#enabl
e"
)
@ApiOperation
(
"根据条件查询所有警员信息(page)"
)
public
ApiRes
<
PageResult
<
PolicemanDto
>>
GetAllPolicemanPage
(
@RequestBody
@Validated
(
ValidationApi
.
page
.
class
)
PolicemanReq
req
){
PageResult
<
PolicemanDto
>
policemanDtoPageResult
=
policemanService
.
GetAllPolicemanPage
(
req
);
...
...
@@ -131,7 +132,8 @@ public class PoliceController {
* @param req
* @return
*/
@PostMapping
(
"/GetPoliceDetail"
)
@PostMapping
(
path
=
"/GetPoliceDetail"
,
name
=
"查询单个警员信息#enable"
)
@ApiOperation
(
"查询单个警员信息"
)
public
ApiRes
<
PolicemanDto
>
GetOnePolice
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
PolicemanReq
req
)
{
return
ApiRes
.
success
(
policemanService
.
GetOnePolice
(
req
));
...
...
@@ -143,7 +145,8 @@ public class PoliceController {
* @param
* @return
*/
@PostMapping
(
"/GetPoliceData"
)
@PostMapping
(
path
=
"/GetPoliceData"
,
name
=
"查询与单警柜绑定的警员信息#enable"
)
@ApiOperation
(
"查询与单警柜绑定的警员信息(list)"
)
//根据单警柜id查询
public
ApiRes
<
List
<
PolicemanDto
>>
GetPoliceData
(
@RequestBody
CabinetReq
req
){
//获取该单警柜下所有警员的id
...
...
@@ -151,7 +154,7 @@ public class PoliceController {
return
ApiRes
.
success
(
policemanDtos
);
}
@PostMapping
(
"/GetPoliceDataPag
e"
)
@PostMapping
(
path
=
"/GetPoliceDataPage"
,
name
=
"查询与单警柜绑定的警员信息#enabl
e"
)
@ApiOperation
(
"查询与单警柜绑定的警员信息(page)"
)
//根据单警柜id查询
public
ApiRes
<
PageResult
<
PolicemanDto
>>
GetPoliceDataPage
(
@RequestBody
CabinetReq
req
){
//获取该单警柜下所有警员的id
...
...
@@ -179,7 +182,8 @@ public class PoliceController {
return
ApiRes
.
success
(
b
);
}
@PostMapping
(
"/SearchFaceInfo"
)
@PostMapping
(
path
=
"/SearchFaceInfo"
,
name
=
"查找人脸信息#enable"
)
@ApiOperation
(
"查找人脸信息"
)
public
ApiRes
<
Policeman
>
SearchFaceInfo
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
PolicemanReq
req
)
{
Policeman
policeman
=
policemanService
.
SearchFaceInfo
(
req
);
...
...
@@ -190,7 +194,8 @@ public class PoliceController {
}
//查询组织机构下的用户以及角色信息(也可以根据别的查询条件查询)
@PostMapping
(
"/ShowUserRole"
)
@PostMapping
(
path
=
"/ShowUserRole"
,
name
=
"查询用户角色信息#enable"
)
@ApiOperation
(
"查询用户角色信息"
)
public
ApiRes
<
PageResult
<
SysUserDto
>>
ShowUserRole
(
@RequestBody
SysUserReq
req
){
return
ApiRes
.
success
(
policemanService
.
ShowUserRole
(
req
));
...
...
@@ -227,7 +232,8 @@ public class PoliceController {
return
ApiRes
.
success
(
policemanService
.
PoliceReassignment
(
req
));
}
@PostMapping
(
"/ShowReassignmentPage"
)
@PostMapping
(
path
=
"/ShowReassignmentPage"
,
name
=
"查看警员调岗申请单#enable"
)
@ApiOperation
(
"查看警员调岗申请单"
)
public
ApiRes
<
PageResult
<
Reassignment
>>
ShowReassignmentPage
(
@RequestBody
QueryReassignmentReq
req
){
return
ApiRes
.
success
(
policemanService
.
ShowReassignmentPage
(
req
));
...
...
@@ -241,14 +247,16 @@ public class PoliceController {
//获取警员的装备信息
@PostMapping
(
"/GetPoliceEquipment"
)
@PostMapping
(
path
=
"/GetPoliceEquipment"
,
name
=
"获取警员装备信息#enable"
)
@ApiOperation
(
"获取警员装备信息"
)
public
ApiRes
<
List
<
PoliceEquipment
>>
GetPoliceEqs
(
@RequestBody
QueryReassignmentReq
req
){
return
ApiRes
.
success
(
policemanService
.
GetPoliceEqs
(
req
));
}
//查询组织机构为null的警员
@PostMapping
(
"/getPoliceWithoutOrg"
)
@PostMapping
(
path
=
"/getPoliceWithoutOrg"
,
name
=
"查询组织机构为空的警员#enable"
)
@ApiOperation
(
"查询组织机构为空的警员"
)
public
ApiRes
<
List
<
PolicemanDto
>>
getPoliceWithoutOrg
(){
return
ApiRes
.
success
(
policemanService
.
getPoliceWithoutOrg
());
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PolicemanFingerController.java
View file @
0d4c5b47
...
...
@@ -47,7 +47,8 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
}
@PostMapping
(
"/searchFingerInfo"
)
@PostMapping
(
path
=
"/searchFingerInfo"
,
name
=
"查找指纹信息#enable"
)
@ApiOperation
(
"查找指纹信息"
)
public
ApiRes
<
List
<
PoliceFinger
>>
searchFingerInfo
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
PolicemanFingerReq
req
)
{
return
ApiRes
.
success
(
policeFingerService
.
searchFingerInfo
(
req
));
...
...
@@ -60,6 +61,7 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
}
@ApiOperation
(
"/分页信息"
)
@PostMapping
(
path
=
"/GetInvInfoByEpc"
,
name
=
"根据EPC列表获取装备信息#enable"
)
@GetMapping
(
path
=
"/page"
,
name
=
"指纹信息分页"
)
public
ApiRes
<
PageResult
<
PoliceFinger
>>
page
(
PolicemanFingerReq
req
)
{
return
ApiRes
.
success
(
policeFingerService
.
findPage
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/RepairUnitController.java
View file @
0d4c5b47
...
...
@@ -43,7 +43,8 @@ public class RepairUnitController {
}
//查询报废/销毁单位(list)
@PostMapping
(
"/ShowRepairUnitList"
)
@PostMapping
(
path
=
"/ShowRepairUnitList"
,
name
=
"查询报废/销毁单位#enable"
)
@ApiOperation
(
"查询报废/销毁单位(list)"
)
public
ApiRes
<
List
<
RepairUnit
>>
showRepairUnitList
(
@RequestBody
RepairUnitReq
req
){
return
ApiRes
.
success
(
repairUnitService
.
showRepairUnitList
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/SupplierController.java
View file @
0d4c5b47
...
...
@@ -43,14 +43,16 @@ public class SupplierController {
return
ApiRes
.
success
(
supplierService
.
DeleteSupplier
(
req
));
}
@PostMapping
(
"/ShowSupplier"
)
@PostMapping
(
path
=
"/ShowSupplier"
,
name
=
"查询供应商列表#enable"
)
@ApiOperation
(
"查询供应商列表"
)
public
ApiRes
<
List
<
SupplierDto
>>
ShowSupplier
(
@RequestBody
QuerySupplierReq
req
){
return
ApiRes
.
success
(
supplierService
.
ShowSupplier
(
req
));
}
//供应商分页
@PostMapping
(
"/ShowSupplierPage"
)
@PostMapping
(
path
=
"/ShowSupplierPage"
,
name
=
"查询供应商列表#enable"
)
@ApiOperation
(
"查询供应商列表(page)"
)
public
ApiRes
<
PageResult
<
Supplier
>>
ShowSupplierPage
(
@RequestBody
QuerySupplierReq
req
){
return
ApiRes
.
success
(
supplierService
.
ShowSupplierPage
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java
View file @
0d4c5b47
...
...
@@ -67,14 +67,16 @@ public class WarehouseController {
* @param req
* @return
*/
@PostMapping
(
"/ShowWarehouse"
)
@PostMapping
(
path
=
"/ShowWarehouse"
,
name
=
"查询仓库列表#enable"
)
@ApiOperation
(
"查询仓库列表"
)
public
ApiRes
<
List
<
WarehouseDto
>>
getAllWarehouse
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
WarehouseReq
req
){
return
ApiRes
.
success
(
warehouseService
.
getAllWarehouse
(
req
.
getOrgId
()));
}
//通过仓库id查询列表
@PostMapping
(
"/GetWarehouseDetail"
)
@PostMapping
(
path
=
"/GetWarehouseDetail"
,
name
=
"查询单个仓库信息#enable"
)
@ApiOperation
(
"查询单个仓库信息"
)
public
ApiRes
<
WarehouseDto
>
getOneWarehouse
(
@RequestBody
@Validated
(
WarehouseReq
.
detail
.
class
)
WarehouseReq
req
)
{
return
ApiRes
.
success
(
warehouseService
.
getOneWarehouse
(
req
));
...
...
@@ -104,7 +106,8 @@ public class WarehouseController {
return
ApiRes
.
success
(
warehouseAreaService
.
deleteArea
(
req
));
}
@PostMapping
(
"/GetAreaList"
)
@PostMapping
(
path
=
"/GetAreaList"
,
name
=
"查询区域信息#enable"
)
@ApiOperation
(
"查询区域信息"
)
public
ApiRes
<
List
<
WarehouseAreaDto
>>
getAreaList
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
WarehouseAreaReq
req
){
return
ApiRes
.
success
(
warehouseAreaService
.
getAreaList
(
req
));
...
...
@@ -129,7 +132,8 @@ public class WarehouseController {
return
ApiRes
.
success
(
shelfService
.
DeleteShelf
(
req
));
}
@PostMapping
(
"/GetShelfList"
)
@PostMapping
(
path
=
"/GetShelfList"
,
name
=
"查询货架信息#enable"
)
@ApiOperation
(
"查询货架信息"
)
public
ApiRes
<
List
<
ShelfDto
>>
GetShelfList
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
ShelfReq
req
){
return
ApiRes
.
success
(
shelfService
.
GetShelfList
(
req
));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论