修改校验,以及依赖的更新

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java

@@ -15,13 +15,14 @@ import java.util.Map;
 @AllArgsConstructor
 public enum  StageEnum {
 
-    焊前人员("人员确定","STAFF","人员"),
-    焊前设备("设备确定","EQUIPMENT","设备"),
-    焊前管材质量("管材确定","BEFORE-WELDING","管材"),
+    焊前人员("","STAFF","人员"),
+    焊前设备("焊前确定","EQUIPMENT","设备"),
+    焊前管材质量("","BEFORE-WELDING","管材"),
     焊接工艺("工艺确定","CRAFT","工艺"),
     管道耐压("耐压确定","VOLTAGE","耐压"),
     敷设质量("敷设确定","LAY","敷设"),
-    定位("定位确定","LOTCATION","定位");
+    定位("定位确定","LOTCATION","定位"),
+    回填("回填确定","BACKFILL","回填");
 
     private String name;
     private String stage;
@@ -32,11 +33,11 @@ public enum  StageEnum {
 
 
 
-    public static Map<String,String> getNameByNameMap = new HashMap<>();
+    public static Map<String,String> getStageByNameMap = new HashMap<>();
     public static Map<String,String> getStatusByVerifyNameMap = new HashMap<>();
     static {
         for(StageEnum enums:StageEnum.values()){
-            getNameByNameMap.put(enums.stage,enums.name);
+            getStageByNameMap.put(enums.stage,enums.name);
             getStatusByVerifyNameMap.put(enums.stage, enums.verifyName);
         }
     }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/AcceptDto.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * @Author cpp
  * @Description
@@ -32,7 +30,6 @@ public class AcceptDto  extends BaseDto {
     private String userId;
     @ApiModelProperty(value = "阶段检验")
     private String stage;
-
    //设备
    @ApiModelProperty(value = "设备id")
    private String facilityId;
@@ -45,6 +42,8 @@ public class AcceptDto  extends BaseDto {
     private String materialId;
     @ApiModelProperty(value = "管材图片信息")
     private String materialPhoto;
+    @ApiModelProperty(value = "管材校验需要数据")
+     private   TubingCheck tubingCheck;
 
     //工艺
     @ApiModelProperty(value = "焊接工艺")
@@ -58,8 +57,6 @@ public class AcceptDto  extends BaseDto {
     private String depthType;
      @ApiModelProperty(value = "埋深")
      private String depth;
-     @ApiModelProperty(value = "埋深定位信息")
-     private String depthLocation;
      @ApiModelProperty(value = "埋深图片信息")
      private String depthPhoto;
 
@@ -68,8 +65,7 @@ public class AcceptDto  extends BaseDto {
     private String pressureId;
     @ApiModelProperty(value = "压力测试")
     private String pressureTest;
-    @ApiModelProperty(value = "耐压测试定位信息")
-    private String pressureLocation;
+
     @ApiModelProperty(value = "耐压图片信息")
     private String pressurePhoto;
     //定位

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/OpenDto.java

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import lombok.Data;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/27
+ */
+@Data
+public class OpenDto {
+
+    private String oldPhoto; //原照片
+    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/dto/SmartListDto.java

@@ -58,16 +58,12 @@ public class SmartListDto extends BaseDto {
     private String permission;
     @ApiModelProperty(value = "焊工编号")
     private String personWeld;
-    @ApiModelProperty(value = "管材定位信息")
-    private String tubularlocatingInformation;
 
     //设备
     @ApiModelProperty(value = "焊机编号")
     private String facilityNumber;
     @ApiModelProperty(value = "焊机名称")
     private String facilityName;
-    @ApiModelProperty(value = "焊机定位信息")
-    private String facilityLocation;
     @ApiModelProperty(value = "检定状态")
     private String facilityStatus;
 
@@ -78,7 +74,7 @@ public class SmartListDto extends BaseDto {
     private String peopleName;
     @ApiModelProperty(value = "持证状态")
     private String peopleStatus;
-    @ApiModelProperty(value = "焊接定位信息")
+    @ApiModelProperty(value = "定位信息")
     private String peopleLocation;
 
      // 工艺
@@ -97,14 +93,17 @@ public class SmartListDto extends BaseDto {
     private String pressureCode;
     @ApiModelProperty(value = "测试压力Mpa")
     private String mpa;
-    @ApiModelProperty(value = "耐压测试定位")
-    private String pressureLocation;
 
-    //敷设位置标定检验
+    //定位检验
     @ApiModelProperty(value = "焊口精确定位方式")
     private String preciseWeldingPosition;
     @ApiModelProperty(value = "位置标定检验结果")
     private String resuts;
+   //埋深
+   @ApiModelProperty(value = "埋深检测方式")
+   private String detectionMethod;
+    @ApiModelProperty(value = "埋深m")
+    private String burialDepth;
 
 
     @ApiModelProperty(value = "检验检测阶段")

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TubingCheck.java

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/25
+ */
+@Data
+public class TubingCheck {
+    private static final long serialVersionUID = 1L;
+
+    private String comboxType;//焊后热处理
+
+    private Double  materialAthickness; //第一个管材a厚度
+
+    private Double  materialBthickness;//第一个管材b厚度
+
+    private String  ifBend; //是否弯曲
+    private Double  wpsmaterialAthickness; //第二个管材a厚度
+    private Double  wpsmaterialBthickness; //第二个管材b厚度
+
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/IInstallationQualityMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface IInstallationQualityMapper extends BaseMapper<QualityInfo> {
 
-       List<QualityInfo> findss();
+       List<QualityInfo> findss(PercentOfPassDto dto);
 
 
 

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/VerifyMapper.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.SmartListDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -24,4 +25,11 @@ public interface VerifyMapper extends BaseMapper<Verify> {
 
     List<Verify> commonality(String stage,SmartListDto smartListDto);
 
+    @Select("select * from tz_ugp_verify where target_info = #{targetInfo}")
+    Verify selectByTargetInfo(String targetInfo);
+   //
+    List<Verify> selectByWelder(Long projectId,Long welderId,String code,String stage,Long random);
+    Verify selectByCode(String code,Long projectId,String stage,Long random);
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/InstallationQualityMapper.xml

@@ -49,6 +49,10 @@
             qy.is_delete =0
             and
             pt.is_delete=0
+            <if test="name !='' and name != null">
+                and
+                pt.name like  concat( '%',#{name},'%')
+            </if>
 
 
 </select>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml

@@ -64,4 +64,34 @@
 
     </select>
 
+
+    <select id="selectByWelder" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify">
+
+        SELECT * FROM tz_ugp_verify where
+        project_id =#{projectId}
+        and target_info -> "$.welderId" = #{welderId}
+        <if test="code !=null and code !=''">
+            and
+            target_info -> "$.code" =#{code}
+        </if>
+        <if test="stage !=null and stage !=''">
+            and stage =#{stage}
+        </if>
+        <if test="random !=null and random !=''">
+            and
+            target_info -> "$.random" =#{random}
+        </if>
+    </select>
+
+
+    <select id="selectByCode" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify">
+         SELECT * FROM tz_ugp_verify where
+        code =#{code}
+        and project_id =#{projectId}
+        and stage =#{stage}
+        <if test="random !=null and random !=''">
+            and
+            target_info -> "$.random" =#{random}
+        </if>
+    </select>
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-biz/pom.xml

@@ -34,19 +34,8 @@
         <dependency>
             <groupId>fakepath</groupId>
             <artifactId>ugp-welding-evaluation-inspection-sdk</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.xerial</groupId>
-            <artifactId>sqlite-jdbc</artifactId>
-            <version>3.36.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-compiler</artifactId>
-            <version>7.10.0.Final</version>
-        </dependency>
-
 
     </dependencies>
     <build>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallationQualityController.java

@@ -45,7 +45,7 @@ private WeldServiceImpl weld;
     @GetMapping(value = "/find")
     @ApiOperation(httpMethod = "GET", value = "质量问题闭环管理-安装质量监检信息-质量监检信息", notes = "质量问题闭环管理-安装质量监检信息-质量监检信息")
     public ResponseModel<Page<PercentOfPassDto>> find(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size,PercentOfPassDto percentOfPassDto) {
+            (value = "size") int size, PercentOfPassDto percentOfPassDto) {
         Page<PercentOfPassDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Attachment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*;
+import io.swagger.annotations.ApiModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/VerifyController.java

@@ -3,13 +3,19 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
 import com.yeejoin.amos.boot.module.ugp.api.service.IVerifyService;
+import netscape.javascript.JSObject;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.VerifyServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -220,9 +226,28 @@ public class VerifyController extends BaseController {
 		return ResponseHelper.buildResponse(service.commonality(StageEnum.管道耐压.getStage(),page,smartListDto));
 	}
 
+
+	/**
+	 * 敷设质量
+	 * @param current
+	 * @param size
+	 * @param smartListDto
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/depth")
+	@ApiOperation(httpMethod = "GET", value = "敷设质量", notes = "敷设质量")
+	public ResponseModel<Page<SmartListDto>> depth(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size,SmartListDto smartListDto) {
+		Page<SmartListDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(service.commonality(StageEnum.敷设质量.getStage(),page,	smartListDto));
+	}
+
 	/**   cpp
 	 *
-	 *敷设位置标定检验列表
+	 *位置标定检验列表
 	 * @param current
 	 * @param size
 	 * @return
@@ -242,17 +267,39 @@ public class VerifyController extends BaseController {
 	/**
 	 *  cpp
 	 *     校验
-	 * @param dto
+	 * @param jsonObject
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@PostMapping(value = "/checks")
 	@ApiOperation(httpMethod = "POST", value = "校验app上传数据", notes = "校验app上传数据")
-	public ResponseModel<String> checks(@RequestBody AcceptDto dto) {
-		return ResponseHelper.buildResponse(verifyServiceImpl.checks(dto));
+	public ResponseModel<String> checks(@RequestBody JSONObject jsonObject) {
+		return ResponseHelper.buildResponse(verifyServiceImpl.checks(jsonObject));
+	}
+
+	/**
+	 *  cpp
+	 *     主键id查询verity表
+	 * @param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/selectById")
+	@ApiOperation(httpMethod = "GET", value = "主键id查询verity表", notes = "主键id查询verity表")
+	public ResponseModel<OpenDto> selectById(@RequestParam Long sequenceNbr ) {
+		return ResponseHelper.buildResponse(verifyServiceImpl.selectById(sequenceNbr));
 	}
 
 
+	@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);
+	}
+
 
 
 
@@ -299,14 +346,29 @@ public class VerifyController extends BaseController {
 	}
 
 
-	/**
-	 *焊口敷设位置标定检验
-	 */
+
+
+
 	@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));
+	@PostMapping(value = "/postadd")
+	public ResponseModel<String> postadd(@RequestBody JSONObject jsonObject) {
+		String code = jsonObject.getString("code");
+		Long projectId = jsonObject.getLong("projectId");
+		jsonObject.getString("userId");
+		Verify verify = new Verify( );
+		verify.setProjectId(projectId);
+		verify.setTargetInfo(code);
+		boolean save = verifyServiceImpl.save(verify);
+		if (!save) {
+			//
+		return 	ResponseHelper.buildResponse("新增失败");
 		}
 
+		return ResponseHelper.buildResponse("成功");
+	}
+
+
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallationQualityImpl.java

@@ -46,9 +46,7 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
     @Override
     public Page<PercentOfPassDto> find(Page<PercentOfPassDto> page,PercentOfPassDto pd) {
 
-        String name = pd.getName( );
-
-        List<QualityInfo> qfList = mapper.findss ( );
+        List<QualityInfo> qfList = mapper.findss ( pd);
         List<PercentOfPassDto> list = new ArrayList<> ( );
 
         for (QualityInfo qualityInfo : qfList) {
@@ -118,22 +116,12 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
                 }
             }
 
-            //name不为空走条件筛选
-            if (!StringUtils.isEmpty(name)) {
-                //进行数据筛选
-                List<PercentOfPassDto> collect = newsData.stream ( ).filter (b -> b.getName ( ).equals (name)).collect (Collectors.toList ( ));
-                page.setRecords (collect);
-                page.setTotal (collect.size ());
-                return  page;
-
-            }else {
-
                 //如果条件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/WeldServiceImpl.java

@@ -80,14 +80,14 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         //获取登录人信息
         OrgUsr orgUsr = orgService.getOrgUsr();
         //获取登录人企业下的所有焊口
-        if (orgUsr.getOrgExpandAttr1() == 安装单位) {
+        if (orgUsr.getOrgExpandAttr1().equals(安装单位)) {
 
             List<WeldDto> L = weldDtoPage.getRecords().stream().filter(b -> b.getInstallCompany().equals(orgUsr.getParentId())).collect(Collectors.toList());
             weldDtoPage.setRecords(L);
         }
 
         //根据 所在地 筛选焊口
-        if (orgUsr.getOrgExpandAttr1() == 监察单位) {
+        if (orgUsr.getOrgExpandAttr1().equals(监察单位)) {
 
             LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
             LambdaQueryWrapper<SuperviseRule> eq = wrapper.eq(SuperviseRule::getSuperviseDeptId, orgUsr.getParentId());
@@ -171,11 +171,15 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
     }
 
     /**
-     * 通过项目多个id获取数据
+     * 通过项目id获取数据
      * @param projectId
      * @return
      */
     public List<WeldDto> getProjectId(Long projectId){
         return weldMapper.select(projectId);
     }
+
+
+
+
 }
\ No newline at end of file