Commit cf748436 authored by wanglong's avatar wanglong

添加管材效验接口,敷设监检接口,焊口敷设位置标定检验接口

parent 1eba123e
...@@ -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;
......
...@@ -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 = "GET", value = "焊接工艺效验", notes = "焊接工艺效验") @ApiOperation(httpMethod = "POST", value = "焊接工艺效验", notes = "焊接工艺效验")
@PostMapping(value = "/weldeffect") @PostMapping(value = "/weldeEffect")
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));
}
} }
...@@ -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<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment