Skip to content

A
amos-boot-biz
Commit 9d77ad73 authored by wanglong's avatar wanglong
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents d06208d6 73a92493
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 35 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/VerifyEnum.java
View file @ 9d77ad73
......@@ -12,7 +12,6 @@ public enum VerifyEnum {
未通过("0","未通过","智能检验"),
已通过("1","已通过","人工检验");
private String status;
private String name;
......
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 @ 9d77ad73
......@@ -315,15 +315,16 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
*/
private static final String TYPE="智能检验";
//@BusinessIdentify
@BusinessIdentify
public String checks(JSONObject jsonObject) {
if (jsonObject == null || jsonObject.size() ==0) {
return VerifyEnum.未通过.getName();
}
//通过userid和projectId来对应
Long welderId = orgService.getReginParams( ).getBusinessInfo( ).getUserSequenceNbr( );
Long random = jsonObject.getLong("random");//随机值
Long projectId= jsonObject.getLong("projectId");//项目id
Long welderId = jsonObject.getLong("welderId"); //用户id
//假数据Long welderId = jsonObject.getLong("welderId"); //焊工id
String location = jsonObject.getString("location");//焊接定位信息
String stage = jsonObject.getString("stage");//阶段检验
Date time = new Date();// //获取当前校验时间
......@@ -386,6 +387,11 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
//工艺效验
if (stage.equals(StageEnum.焊接工艺.getVerifyName())){
//焊口编号是否上传
String code = jsonObject.getString("code");
if (StringUtils.isEmpty(code)) {
return VerifyEnum.未通过.getName();
}
//判断人员是否效验通过
List<Verify> welderList = verifyList.stream( ).filter(b -> b.getStage( ).equals(StageEnum.焊前人员.getStage( ))).collect(Collectors.toList( ));
//判断管材是否效验通过
......@@ -432,12 +438,12 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
}*/
//如果焊前效验已经通过进行效验步骤
Boolean flag =false;
verify.setStage(StageEnum.焊接工艺.getStage());
/**
* 效验假数据
*/
Boolean flag =true ;
String result = jsonObject.getString("result");
if (VerifyEnum.已通过.getName().equals(result)) {
flag =true;
}
if (!flag) {
//校验不通过
this.addFailData(verify,jsonObject,new QualityProblem());
......@@ -451,10 +457,13 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//查询工艺是否校验通过(可能有好几个焊口码)
//获取前端传的焊口编号(工艺阶段焊口编号必传)
String manyCode = jsonObject.getString("manyCode");//获取多个焊口编号
if (StringUtils.isEmpty(manyCode)) {
return VerifyEnum.未通过.getName();
}
String[] codeArray = manyCode.split(",");
//工艺的效验
for (String code : codeArray) {
List<Verify> verifyList1 = verifyMapper.selectByWelder(projectId, welderId, code,StageEnum.焊接工艺.getStage(),random);
List<Verify> verifyList1 = verifyMapper.selectByWelder(projectId, welderId, code,StageEnum.焊接工艺.getStage(),null);
for (Verify verify1 : verifyList1) {
//工艺阶段未效验
if (verify1 == null) {
......@@ -502,8 +511,6 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
}
}*/
//如果工艺效验已经通过进行耐压校验步骤,(特别注意,只需要效验头部和尾部耐压)
verify.setStage(StageEnum.管道耐压.getStage());
verify.setCode(manyCode);
......@@ -523,9 +530,13 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
//埋深
if (stage.equals(StageEnum.敷设质量.getVerifyName())){
//查询耐压是否校验通过
String manyCode = jsonObject.getString("manyCode");//获取多个焊口编号
Verify verify1 = verifyMapper.selectByCode(manyCode, projectId, StageEnum.管道耐压.getStage( ),random);
if (StringUtils.isEmpty(manyCode)) {
return VerifyEnum.未通过.getName();
}
Verify verify1 = verifyMapper.selectByCode(manyCode, projectId, StageEnum.管道耐压.getStage( ),null);
//耐压没有效验数据
if (verify1 == null) {
return VerifyEnum.未通过.getName();
......@@ -567,7 +578,10 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
if (stage.equals(StageEnum.定位.getVerifyName())){
//查询埋深是否校验通过
String manyCode = jsonObject.getString("manyCode");
Verify v1 = verifyMapper.selectByCode(manyCode, projectId, StageEnum.敷设质量.getStage( ),random);
if (StringUtils.isEmpty(manyCode)) {
return VerifyEnum.未通过.getName();
}
Verify v1 = verifyMapper.selectByCode(manyCode, projectId, StageEnum.敷设质量.getStage( ),null);
//埋深没有效验数据
if (v1 == null) {
return VerifyEnum.未通过.getName();
......@@ -608,7 +622,10 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//回填
if (stage.equals(StageEnum.回填.getVerifyName())) {
String manyCode = jsonObject.getString("manyCode");
Verify v1 = verifyMapper.selectByCode(manyCode, projectId, StageEnum.定位.getStage( ),random);
if (StringUtils.isEmpty(manyCode)) {
return VerifyEnum.未通过.getName();
}
Verify v1 = verifyMapper.selectByCode(manyCode, projectId, StageEnum.定位.getStage( ),null);
//判断定位没有校验数据
if (v1 == null) {
return VerifyEnum.未通过.getName();
......@@ -1335,7 +1352,6 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
openDto.setOldPhoto("https://img2.baidu.com/it/u=1534411088,173440019&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1666976400&t=3e985017d01fe1c0cfe639335abc2fe8");
if (verify.getStatus().equals("0")) {
openDto.setResult(VerifyEnum.未通过.getName());
}
if (verify.getStatus().equals("1")) {
openDto.setResult(VerifyEnum.已通过.getName());
......@@ -1348,19 +1364,12 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//有效性
openDto.setValid("有效");
}
return openDto ;
}
/**
* 参数校验的公共方法
* 评价
* @return
......@@ -1368,11 +1377,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
private static final String CONFORM ="符合";
private static final String NOTCONFORM ="不符合";
public Boolean checkMehtod(JSONObject jsonObject) {
/**
* 初步的是工艺的效验方法
*/
//数据校验
public Boolean evaluate(JSONObject jsonObject) {
MyPqr pqr = new MyPqr( );
MyWps wps = new MyWps( );
// 初始化
......@@ -1380,13 +1386,55 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
HashMap<String, String> stringStringHashMap = null;
String stage = jsonObject.getString("stage");
if (!StringUtils.isEmpty(stage)) {
//数据
pqr.setMaterial_a_thickness(1.4);
pqr.setMaterial_b_thickness(5);
pqr.setIf_bend("lateral_bending");
wps.setMaterial_a_thickness(1.5);
wps.setMaterial_b_thickness(1.4);
pqr.setWelding_method(jsonObject.getString("pqr_welding_method"));
pqr.setMaterial_a_number(jsonObject.getString("pqr_material_a_number"));
pqr.setMaterial_a_class(jsonObject.getString("pqr_material_a_class"));
pqr.setMaterial_a_thickness(jsonObject.getDouble("pqr_material_a_thickness"));
pqr.setMaterial_a_group(jsonObject.getString("pqr_material_a_group"));
pqr.setMaterial_a_standard(jsonObject.getString("pqr_material_a_standard"));
pqr.setMaterial_b_number(jsonObject.getString("pqr_material_b_number"));
pqr.setMaterial_b_class(jsonObject.getString("pqr_material_b_class"));
pqr.setMaterial_b_thickness(jsonObject.getDouble("pqr_material_b_thickness"));
pqr.setMaterial_b_group(jsonObject.getString("pqr_material_b_group"));
pqr.setMaterial_b_standard(jsonObject.getString("pqr_material_b_standard"));
pqr.setIf_shock(jsonObject.getString("pqr_if_shock"));
pqr.setIf_bend(jsonObject.getString("pqr_if_bend"));
pqr.setGtaw_weld_material_class(jsonObject.getString("pqr_gtaw_weld_material_class"));
pqr.setSmaw_weld_material_class(jsonObject.getString("pqr_smaw_weld_material_class"));
pqr.setSaw_weld_material_class_1(jsonObject.getString("pqr_saw_weld_material_class_1"));
pqr.setSaw_weld_material_class_2(jsonObject.getString("pqr_saw_weld_material_class_2"));
pqr.setGmaw_weld_material_class(jsonObject.getString("pqr_gmaw_weld_material_class"));
pqr.setIf_heat_treatment(jsonObject.getString("pqr_if_heat_treatment"));
pqr.setTemperature(jsonObject.getDouble("pqr_temperature"));
pqr.setCombox_type(jsonObject.getString("pqr_combox_type"));
pqr.setTemperature_time(jsonObject.getDouble("pqr_temperature_time"));
pqr.setMaterial_minT_of_a_b_thickness(jsonObject.getDouble("pqr_material_minT_of_a_b_thickness"));
wps.setWelding_method(jsonObject.getString("wps_welding_method"));
wps.setMaterial_a_number(jsonObject.getString("wps_material_a_number"));
wps.setMaterial_a_class(jsonObject.getString("wps_material_a_class"));
wps.setMaterial_a_thickness(jsonObject.getDouble("wps_material_a_thickness"));
wps.setMaterial_a_group(jsonObject.getString("wps_material_a_group"));
wps.setMaterial_a_standard(jsonObject.getString("wps_material_a_standard"));
wps.setMaterial_b_number(jsonObject.getString("wps_material_b_number"));
wps.setMaterial_b_class(jsonObject.getString("wps_material_b_class"));
wps.setMaterial_b_thickness(jsonObject.getDouble("wps_material_b_thickness"));
wps.setMaterial_b_group(jsonObject.getString("wps_material_b_group"));
wps.setMaterial_b_standard(jsonObject.getString("wps_material_b_standard"));
wps.setIf_shock(jsonObject.getString("wps_if_shock"));
wps.setIf_bend(jsonObject.getString("wps_if_bend"));
wps.setGtaw_weld_material_class(jsonObject.getString("wps_gtaw_weld_material_class"));
wps.setSmaw_weld_material_class(jsonObject.getString("wps_smaw_weld_material_class"));
wps.setSaw_weld_material_class_1(jsonObject.getString("wps_saw_weld_material_class_1"));
wps.setSaw_weld_material_class_2(jsonObject.getString("wps_saw_weld_material_class_2"));
wps.setGmaw_weld_material_class(jsonObject.getString("wps_gmaw_weld_material_class"));
wps.setIf_heat_treatment(jsonObject.getString("wps_if_heat_treatment"));
wps.setTemperature(jsonObject.getDouble("wps_temperature"));
wps.setCombox_type(jsonObject.getString("wps_combox_type"));
wps.setTemperature_time(jsonObject.getDouble("wps_temperature_time"));
wps.setMaterial_minT_of_a_b_thickness(jsonObject.getDouble("wps_material_minT_of_a_b_thickness"));
}
stringStringHashMap = new WeldingQualification( ).equipmentWeldingQualification(pqr, wps);
......
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