Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
cf748436
Commit
cf748436
authored
Oct 20, 2022
by
wanglong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加管材效验接口,敷设监检接口,焊口敷设位置标定检验接口
parent
1eba123e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
10 deletions
+41
-10
StageEnum.java
.../com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java
+9
-7
VerifyController.java
...amos/boot/module/ugp/biz/controller/VerifyController.java
+31
-2
WelderController.java
...amos/boot/module/ugp/biz/controller/WelderController.java
+1
-1
VerifyServiceImpl.java
...s/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
+0
-0
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java
View file @
cf748436
...
@@ -15,17 +15,19 @@ import java.util.Map;
...
@@ -15,17 +15,19 @@ import java.util.Map;
@AllArgsConstructor
@AllArgsConstructor
public
enum
StageEnum
{
public
enum
StageEnum
{
焊前人员
(
"人员确定"
,
"STAFF"
),
焊前人员
(
"人员确定"
,
"STAFF"
,
"人员"
),
焊前设备
(
"设备确定"
,
"EQUIPMENT"
),
焊前设备
(
"设备确定"
,
"EQUIPMENT"
,
"设备"
),
焊前管材质量
(
"管材确定"
,
"BEFORE-WELDING"
),
焊前管材质量
(
"管材确定"
,
"BEFORE-WELDING"
,
"管材"
),
焊接工艺
(
"工艺确定"
,
"CRAFT"
),
焊接工艺
(
"工艺确定"
,
"CRAFT"
,
"工艺"
),
管道耐压
(
"耐压确定"
,
"VOLTAGE"
),
管道耐压
(
"耐压确定"
,
"VOLTAGE"
,
"耐压"
),
敷设质量
(
"敷设确定"
,
"LAY"
),
敷设质量
(
"敷设确定"
,
"LAY"
,
"敷设"
),
定位
(
"定位确定"
,
"LOTCATION"
);
定位
(
"定位确定"
,
"LOTCATION"
,
"定位"
);
private
String
name
;
private
String
name
;
private
String
stage
;
private
String
stage
;
private
String
verifyName
;
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/VerifyController.java
View file @
cf748436
...
@@ -212,12 +212,41 @@ public class VerifyController extends BaseController {
...
@@ -212,12 +212,41 @@ public class VerifyController extends BaseController {
* 焊接工艺效验
* 焊接工艺效验
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@ApiOperation
(
httpMethod
=
"
GE
T"
,
value
=
"焊接工艺效验"
,
notes
=
"焊接工艺效验"
)
@ApiOperation
(
httpMethod
=
"
POS
T"
,
value
=
"焊接工艺效验"
,
notes
=
"焊接工艺效验"
)
@PostMapping
(
value
=
"/weldeffect"
)
@PostMapping
(
value
=
"/welde
E
ffect"
)
public
ResponseModel
<
String
>
weldEffect
(
@RequestBody
JSONObject
jsonObject
)
{
public
ResponseModel
<
String
>
weldEffect
(
@RequestBody
JSONObject
jsonObject
)
{
return
ResponseHelper
.
buildResponse
(
verifyServiceImpl
.
weldEffect
(
jsonObject
));
return
ResponseHelper
.
buildResponse
(
verifyServiceImpl
.
weldEffect
(
jsonObject
));
}
}
/**
* 管材耐压效验
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"管材耐压效验"
,
notes
=
"管材耐压效验"
)
@PostMapping
(
value
=
"/materialEffect"
)
public
ResponseModel
<
String
>
materialEffect
(
@RequestBody
JSONObject
jsonObject
)
{
return
ResponseHelper
.
buildResponse
(
verifyServiceImpl
.
materialEffect
(
jsonObject
));
}
/**
* 敷设质量检验
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"敷设质量检验"
,
notes
=
"敷设质量检验"
)
@PostMapping
(
value
=
"/layEffect"
)
public
ResponseModel
<
String
>
layEffect
(
@RequestBody
JSONObject
jsonObject
)
{
return
ResponseHelper
.
buildResponse
(
verifyServiceImpl
.
layEffect
(
jsonObject
));
}
/**
*焊口敷设位置标定检验
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"焊口敷设位置标定检验"
,
notes
=
"焊口敷设位置标定检验"
)
@PostMapping
(
value
=
"/positionEffect"
)
public
ResponseModel
<
String
>
positionEffect
(
@RequestBody
JSONObject
jsonObject
)
{
return
ResponseHelper
.
buildResponse
(
verifyServiceImpl
.
positionEffect
(
jsonObject
));
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java
View file @
cf748436
...
@@ -64,7 +64,7 @@ public class WelderController extends BaseController {
...
@@ -64,7 +64,7 @@ public class WelderController extends BaseController {
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@GetMapping
(
value
=
"/selectWelder"
)
@GetMapping
(
value
=
"/selectWelder"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"
新增焊工信息"
,
notes
=
"新增
焊工信息"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"
获取焊工信息"
,
notes
=
"获取
焊工信息"
)
public
ResponseModel
<
List
<
JSONObject
>>
selectWelder
(
@RequestParam
(
"code"
)
String
code
)
{
public
ResponseModel
<
List
<
JSONObject
>>
selectWelder
(
@RequestParam
(
"code"
)
String
code
)
{
List
<
JSONObject
>
jsonObjectList
=
new
ArrayList
<>();
List
<
JSONObject
>
jsonObjectList
=
new
ArrayList
<>();
LambdaQueryWrapper
<
Project
>
wrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
Project
>
wrapper
=
new
LambdaQueryWrapper
<>();
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
View file @
cf748436
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment