Skip to content

A
amos-boot-biz
Commit 7c579c3e 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 5251f7c7 8c3e4d28
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 69 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/OpenDto.java
View file @ 7c579c3e
......@@ -11,7 +11,7 @@ import lombok.Data;
public class OpenDto {
private String oldPhoto; //原照片
private String newPhoto; //新照片对比
private String newPhoto; //新照片
private String accord; //符合性
private String valid; //有效性
private String result;//结果
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/VerifyMapper.java
View file @ 7c579c3e
......@@ -23,7 +23,7 @@ public interface VerifyMapper extends BaseMapper<Verify> {
* @return
*/
List<Verify> commonality(String stage,SmartListDto smartListDto);
List<Verify> commonality(String stage,SmartListDto smartListDto, List listId);
@Select("select * from tz_ugp_verify where target_info = #{targetInfo}")
Verify selectByTargetInfo(String targetInfo);
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml
View file @ 7c579c3e
......@@ -62,6 +62,13 @@
pt.code like '%${smartListDto.projectCode}%'
</if>
<if test="listId != null and ! listId.isEmpty() and listId.size() > 0">
and vf.project_id in
<foreach collection="listId" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallationQualityController.java
View file @ 7c579c3e
......@@ -41,7 +41,7 @@ private InstallationQualityImpl services;
private WeldServiceImpl weld;
//查看质量监检信息
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/find")
@ApiOperation(httpMethod = "GET", value = "质量问题闭环管理-安装质量监检信息-质量监检信息", notes = "质量问题闭环管理-安装质量监检信息-质量监检信息")
public ResponseModel<Page<PercentOfPassDto>> find(@RequestParam(value = "current") int current, @RequestParam
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/VerifyController.java
View file @ 7c579c3e
......@@ -133,7 +133,7 @@ public class VerifyController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectTubular")
@ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表")
public ResponseModel<Page<SmartListDto>> selectTubular(@RequestParam(value = "current") int current, @RequestParam
......@@ -155,7 +155,7 @@ public class VerifyController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectWorker")
@ApiOperation(httpMethod = "GET", value = "查询焊接人员检验信息列表", notes = "查询焊接人员检验信息列表")
public ResponseModel<Page<SmartListDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam
......@@ -175,7 +175,7 @@ public class VerifyController extends BaseController {
* @param size
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectFacility")
@ApiOperation(httpMethod = "GET", value = "查询焊接设备检验信息列表", notes = "查询焊接设备检验信息列表")
public ResponseModel<Page<SmartListDto>> selectFacility(@RequestParam(value = "current") int current, @RequestParam
......@@ -196,7 +196,7 @@ public class VerifyController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectCraft")
@ApiOperation(httpMethod = "GET", value = "查询焊接工艺检验信息列表", notes = "查询焊接工艺检验信息列表")
public ResponseModel<Page<SmartListDto>> selectCraft(@RequestParam(value = "current") int current, @RequestParam
......@@ -216,7 +216,7 @@ public class VerifyController extends BaseController {
* @param size
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectVoltage")
@ApiOperation(httpMethod = "GET", value = "查询管道耐压检验信息列表", notes = "查询管道耐压检验信息列表")
public ResponseModel<Page<SmartListDto>> selectVoltage(@RequestParam(value = "current") int current, @RequestParam
......@@ -235,7 +235,7 @@ public class VerifyController extends BaseController {
* @param smartListDto
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/depth")
@ApiOperation(httpMethod = "GET", value = "敷设质量", notes = "敷设质量")
public ResponseModel<Page<SmartListDto>> depth(@RequestParam(value = "current") int current, @RequestParam
......@@ -282,7 +282,7 @@ public class VerifyController extends BaseController {
/**
* cpp
* 主键id查询verity表
* 弹窗详情
*
* @param
* @return
......@@ -295,14 +295,6 @@ public class VerifyController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/photo")
@ApiOperation(httpMethod = "GET", value = "获取图片", notes = "获取图片")
public ResponseModel<Map> photo(@RequestParam Long sequenceNbr) {
Map map = new HashMap<>( );
map.put("newPhoto", "https://img2.baidu.com/it/u=806791452,2765805606&fm=253&fmt=auto&app=138&f=JPEG?w=350&h=500");
return ResponseHelper.buildResponse(map);
}
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallationQualityImpl.java
View file @ 7c579c3e
......@@ -52,7 +52,6 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
for (QualityInfo qualityInfo : qfList) {
PercentOfPassDto percentOfPassDto = new PercentOfPassDto ( );
percentOfPassDto.setName (qualityInfo.getProject ( ).getName ( ));
percentOfPassDto.setAddress (qualityInfo.getProject ( ).getAddress ( ));
percentOfPassDto.setProgressStatus (qualityInfo.getProject ( ).getProgressStatus ( ));
......@@ -115,13 +114,10 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
}
}
//如果条件name为空的,直接查询全部
page.setRecords (newsData);
page.setTotal (newsData.size ());
return page;
}
return page;
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
View file @ 7c579c3e
......@@ -181,8 +181,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
/*焊评审核(后期优化)
* @return
*/
......
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 @ 7c579c3e
......@@ -5,14 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mao.expertSystem.WeldingQualification;
import com.mao.expertSystem.material.MyPqr;
import com.mao.expertSystem.material.MyWps;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
......@@ -99,9 +92,11 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
private EquipmentServiceImpl equipmentService;
@Autowired
QualityProblemServiceImpl qualityProblemService;
private QualityProblemServiceImpl qualityProblemService;
@Autowired
private ProjectServiceImpl projectServiceImpl;
@Autowired
ProjectServiceImpl projectServiceImpl;
private ProjectResourceServiceImpl projectResourceService;
/**
......@@ -128,8 +123,19 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
*/
private static final String HEGE ="合格期内";
private static final String NOTHEGE ="超期未检";
public Page<SmartListDto> commonality(String stage,Page<SmartListDto> page,SmartListDto smartListDto){
List<Verify> verifyList = verifyMapper.commonality(stage,smartListDto);
//新加获取项目列表
List<Project> projectList = projectResourceService.getProjectList( );
List<Long> listId = new ArrayList<>( );
for (Project project : projectList) {
listId.add(project.getSequenceNbr());
}
List<Verify> verifyList=null;
if (listId != null && listId.size()>0) {
verifyList = verifyMapper.commonality(stage,smartListDto,listId);
}
List<SmartListDto> dtoList =new ArrayList<>();
//进入焊前
if (verifyList !=null && verifyList.size() !=0){
......@@ -139,6 +145,17 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
dto.setProjectId(verify.getProjectId()); //项目id
dto.setName(verify.getProject().getName());//项目名称
dto.setProjectCode(verify.getProject().getCode());//项目编号
//检验检测单位id 检验负责人id 监检员id(后续需修改)
Long verifyUnitId = verify.getVerifyUnitId( );
Long chargerPersonId = verify.getChargerPersonId( );
Long inspectorId = verify.getInspectorId( );
if (inspectorId != null && chargerPersonId !=null && verifyUnitId!=null) {
dto.setCompanyName("检测单位");
dto.setUsrName("检验负责人");
dto.setInspector("监检员");
}
//检验状态
String status = verify.getStatus( );
if (status.equals(VerifyEnum.已通过.getStatus())) {
......@@ -184,18 +201,24 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
}
}
//持证判断(写死)
dto.setPeopleStatus("合格期内");
dto.setFacilityStatus("合格期内");
dto.setCompanyName("检测单位");
dto.setUsrName("检验负责人");
dto.setInspector("cs");
dto.setFacilityNumber("XH007");
dto.setFacilityName("焊机xxx");
dto.setDuration("6");
dto.setPressureNumber("1xm001");
dto.setPressureName("耐压设备");
dto.setPressureCode("DF988x");
//人员持证判断(写死)
String peopleStatus = jsonObject.getString("peopleStatus");
if (!StringUtils.isEmpty(peopleStatus)) {
dto.setPeopleStatus(peopleStatus);
}
//设备检定状态(写死)
String facilityStatus = jsonObject.getString("peopleStatus");
if (!StringUtils.isEmpty(facilityStatus)) {
dto.setFacilityStatus(facilityStatus);
}
//焊接工艺时长
String duration = jsonObject.getString("peopleStatus");
if (!StringUtils.isEmpty(duration)) {
dto.setFacilityStatus(duration);
}
Long weldingId = jsonObject.getLong("weldingId");
if (weldingId !=null) {
EquipmentDto equipmentDto = equipmentService.queryBySeq(weldingId);
......@@ -213,13 +236,14 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//管材厂家 生产编号
dto.setManufacturer(materialDto.getManufacturer());
dto.setBatchNumber(materialDto.getBatchNum());
//生产日期需要判断(加判断)是否在有效期内
Date manufactureDate = materialDto.getManufactureDate( );
//将判断结果
dto.setPermission(HEGE);
}
}
String permission = jsonObject.getString("permission");
if (!StringUtils.isEmpty(permission)) {
dto.setPermission(permission);
}
//工艺
String craft = jsonObject.getString("craft");
if (!StringUtils.isEmpty(craft)) {
dto.setCraft(craft);
......@@ -251,10 +275,18 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
if (!StringUtils.isEmpty(locationType)) {
dto.setPreciseWeldingPosition(locationType);
}
String resuts = jsonObject.getString("resuts");
if (!StringUtils.isEmpty(resuts)) {
dto.setResuts(resuts);
}
// //判断标定检验结果 (写死) getResuts
dto.setResuts("合格");
//这些后面只需要删除即可
dto.setPeopleStatus("合格期内");
dto.setFacilityStatus("合格期内");
dto.setDuration("6");
dto.setPressureNumber("1xm001");
dto.setResuts("合格");
dtoList.add(dto);
......@@ -291,21 +323,29 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
String photo = jsonObject.getString("photo");//图片
Verify verify = new Verify( );
jsonObject.put("welderId",welderId);
//属性赋值
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
verify.setProjectId(projectId);//项目id
verify.setType(TYPE);//检验方式
verify.setVerifyTime(time);//获取当前时间
List<Verify> verifyList = verifyMapper.selectByWelder(projectId,welderId,null,null,random);/**这里json*/
//人员
if (stage.equals(StageEnum.焊前人员.getVerifyName())) {
verify.setStage(StageEnum.焊前人员.getStage()); //阶段
/**写死*/
Boolean flag =true;
//1.人脸识别校验
//2.焊工资质有效期判断,查询焊工信息获取
//3.证书是否和项目符合
//失败
//属性赋值
jsonObject.put("accord","符合");
jsonObject.put("valid","有效");
jsonObject.put("peopleStatus","合格");
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
this.addFailData(verify,jsonObject,new QualityProblem());
return VerifyEnum.未通过.getName();
......@@ -321,6 +361,13 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
verify.setStage(StageEnum.焊前管材质量.getStage());
/**校验*/
Boolean flag = true;
jsonObject.put("valid","有效");
jsonObject.put("accord","符合");
jsonObject.put("manufacturer","前端上传的管材厂家");
jsonObject.put("batchNumber","前端上传管材批号");
jsonObject.put("permission","最终管材质量效验结果");
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
//不通过, 添加数据并返回未通过结果
this.addFailData(verify,jsonObject,new QualityProblem());
......@@ -337,7 +384,14 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
* 效验假数据
*/
Boolean flag =true ;
//后面需要修改此处
jsonObject.put("valid","有效");
jsonObject.put("accord","符合");
jsonObject.put("facilityStatus","合格期内");
jsonObject.put("facilityNumber","传的焊机编号");
jsonObject.put("facilityName","前端传的焊机名称");
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
//校验不通过
this.addFailData(verify,jsonObject,new QualityProblem());
......@@ -346,7 +400,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//效验通过
this.addSuccessData(verify,null,jsonObject);
}
//工艺效验
//工艺
if (stage.equals(StageEnum.焊接工艺.getVerifyName())){
//焊口编号是否上传
String code = jsonObject.getString("code");
......@@ -405,6 +459,10 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
if (VerifyEnum.已通过.getName().equals(result)) {
flag =true;
}
jsonObject.put("duration","前端传的时长");
jsonObject.put("facilityNumber","前端传的焊机编号");
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
//校验不通过
this.addFailData(verify,jsonObject,new QualityProblem());
......@@ -479,7 +537,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
* 效验假数据
*/
Boolean flag =true ;
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
//校验不通过
jsonObject.put("code",manyCode);
......@@ -525,6 +584,9 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
*/
Boolean flag =true ;
jsonObject.put("facilityName","前端传的焊机名称");
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
//校验不通过
jsonObject.put("code",manyCode);
......@@ -568,7 +630,9 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
* 效验假数据
*/
Boolean flag =true ;
jsonObject.put("resuts","标定结果");
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
//校验不通过
jsonObject.put("code",manyCode);
......@@ -611,8 +675,9 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
/**
* 效验假数据
*/
Boolean flag =false ;
Boolean flag =true ;
String targetInfo = jsonObject.toString();
verify.setTargetInfo(targetInfo);//json信息
if (!flag) {
//校验不通过
jsonObject.put("code",manyCode);
......@@ -739,19 +804,24 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
/**
* 主键id查询 (图片和结果)
* 弹窗
* @param sequenceNbr
* @return
*/
public OpenDto selectById(Long sequenceNbr){
public OpenDto selectById(Long sequenceNbr ){
Verify verify = verifyMapper.selectById(sequenceNbr);
OpenDto openDto = new OpenDto( );
if (verify !=null && !StringUtils.isEmpty( verify.getStatus())) {
String targetInfo= verify.getTargetInfo();
JSONObject object = JSONObject.parseObject(targetInfo);
//获取照片
openDto.setNewPhoto("https://img2.baidu.com/it/u=806791452,2765805606&fm=253&fmt=auto&app=138&f=JPEG?w=350&h=500");
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");
String newPhoto = object.getString("photo");
if (!StringUtils.isEmpty(newPhoto)) {
// openDto.setNewPhoto(newPhoto);
}
openDto.setNewPhoto("upload/ugp/amos_studio/EF4E6343E355665B6663DE139226F06A.jpg");
openDto.setOldPhoto("upload/ugp/amos_studio/EF4E6343E355665B6663DE139226F06A.jpg");
if (verify.getStatus().equals("0")) {
openDto.setResult(VerifyEnum.未通过.getName());
}
......@@ -759,10 +829,23 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
openDto.setResult(VerifyEnum.已通过.getName());
}
//符合性
openDto.setAccord("符合");
//有效性
//有效性
String peopleStatus = object.getString("valid");
if (!StringUtils.isEmpty(peopleStatus)) {
//openDto.setValid(peopleStatus);
}
//符合性
String accord = object.getString("accord");
if (!StringUtils.isEmpty(accord)) {
//openDto.setAccord(accord);
}
//后面需删除
openDto.setValid("有效");
openDto.setAccord("符合");
}
return openDto ;
}
......
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