人员，设备，管材的校验，以及校验成功公共方法，校验失败的公共方法

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

@@ -44,4 +44,4 @@ public enum  StageEnum {
 
 
 
-}
+}
\ No newline at end of file

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * @Author cpp
  * @Description
@@ -17,7 +19,64 @@ import lombok.EqualsAndHashCode;
 public class AcceptDto  extends BaseDto {
 
     private static final long serialVersionUID = 1L;
+   //人员信息
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+    @ApiModelProperty(value = "焊口编号")
+    private String code;
+    @ApiModelProperty(value = "焊接定位信息")
+    private String peopleLocation;
+    @ApiModelProperty(value = "人脸识别图片信息")
+    private String peoplePhoto;
+    @ApiModelProperty(value = "人员id")
+    private String userId;
+    @ApiModelProperty(value = "阶段检验")
+    private String stage;
+
+   //设备
+   @ApiModelProperty(value = "设备id")
+   private String facilityId;
+    @ApiModelProperty(value = "检定状态")
+    private String calibrationStatus;
+    @ApiModelProperty(value = "设备图片")
+    private String facilityPhoto;
+    //管材
+    @ApiModelProperty(value = "管材id")
+    private String materialId;
+    @ApiModelProperty(value = "管材图片信息")
+    private String materialPhoto;
+
+    //工艺
+    @ApiModelProperty(value = "焊接工艺")
+    private String craft;
+    @ApiModelProperty(value = "焊机设备id")
+    private String weldingId;
+    @ApiModelProperty(value = "工艺图片")
+    private String craftPhoto;
+    //埋深
+    @ApiModelProperty(value = "埋深检测方式")
+    private String depthType;
+     @ApiModelProperty(value = "埋深")
+     private String depth;
+     @ApiModelProperty(value = "埋深定位信息")
+     private String depthLocation;
+     @ApiModelProperty(value = "埋深图片信息")
+     private String depthPhoto;
 
+    //耐压
+    @ApiModelProperty(value = "耐压设备id")
+    private String pressureId;
+    @ApiModelProperty(value = "压力测试")
+    private String pressureTest;
+    @ApiModelProperty(value = "耐压测试定位信息")
+    private String pressureLocation;
+    @ApiModelProperty(value = "耐压图片信息")
+    private String pressurePhoto;
+    //定位
+    @ApiModelProperty(value = "焊口精确定位方式")
+    private String locationType;
+   @ApiModelProperty(value = "图片信息")
+   private String locationPhoto;
 
 
 

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @Author cpp
+ * @Description  智能监检列表
+ * @Date 2022/10/19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="SmartListDto", description="智能监检列表")
+public class SmartListDto extends BaseDto {
+
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+    @ApiModelProperty(value = "项目编号")
+    private String projectCode;
+
+    @ApiModelProperty(value = "检验检测单位")
+    private String companyName;
+
+    @ApiModelProperty(value = "检验负责人")
+    private String usrName;
+
+    @ApiModelProperty(value = "检验员")
+    private String inspector;
+
+    @ApiModelProperty(value = "检验状态")
+    private String status;
+
+    @ApiModelProperty(value = "检验方式")
+    private String type;
+
+    @ApiModelProperty(value = "交检日期")
+    private Date submitTime;
+
+    @ApiModelProperty(value = "检验时间")
+    private Date verifyTime;
+
+    //管材
+    @ApiModelProperty(value = "焊口编号")
+    private String code;
+    @ApiModelProperty(value = "管材厂家")
+    private String manufacturer;
+    @ApiModelProperty(value = "管材批号")
+    private String batchNumber;
+    @ApiModelProperty(value = "质量许可")
+    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;
+
+
+
+    //人员
+    @ApiModelProperty(value = "焊工姓名")
+    private String peopleName;
+    @ApiModelProperty(value = "持证状态")
+    private String peopleStatus;
+    @ApiModelProperty(value = "焊接定位信息")
+    private String peopleLocation;
+
+     // 工艺
+     @ApiModelProperty(value = "焊接工艺")
+     private String craft;
+
+    @ApiModelProperty(value = "焊接时长")
+    private String duration;
+
+    //耐压
+    @ApiModelProperty(value = "耐压测试编号")
+    private String pressureNumber;
+    @ApiModelProperty(value = "耐压设备名称")
+    private String pressureName;
+    @ApiModelProperty(value = "耐压设备编码")
+    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 stage;
+
+
+
+
+
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Project.java

@@ -148,5 +148,4 @@ public class Project extends BaseEntity {
      */
     @TableField("remark")
     private String remark;
-
 }

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

@@ -19,4 +19,7 @@ public interface WeldMapper extends BaseMapper<Weld> {
    @Select ("select project_id,super_inspec_status from tz_ugp_weld where project_id =#{projectId}")
     List<WeldDto> select(Long projectId);
 
+   @Select("SELECT * from tz_ugp_weld where code = #{code} and project_id =#{projectId}")
+    Weld getWeldByCodeAndProjectId(String code,Long projectId);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IVerifyService.java

 package com.yeejoin.amos.boot.module.ugp.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.ugp.api.dto.FacilityDto;
-import com.yeejoin.amos.boot.module.ugp.api.dto.IntelligentInspectionDto;
-import com.yeejoin.amos.boot.module.ugp.api.dto.TubingDto;
-import com.yeejoin.amos.boot.module.ugp.api.dto.WorkerDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.SmartListDto;
 
 /**
  * 智能监检管理表接口类
@@ -13,9 +10,6 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.WorkerDto;
  * @date 2022-09-22
  */
 public interface IVerifyService {
-
-    Page<TubingDto> selectInspection(Page<TubingDto> page, TubingDto dto);
-    Page<WorkerDto> selectWorker(Page<WorkerDto> page, WorkerDto dto);
-    Page<FacilityDto> selectFacility(Page<FacilityDto> page, FacilityDto dto);
+    Page<SmartListDto> commonality(String stage, Page<SmartListDto> page);
 
 }

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

@@ -48,9 +48,10 @@
         vf.project_id =pt.sequence_nbr
         and
         pt.is_delete='0'
+        <if test="stage != '' and stage != null">
         and
 		vf.stage =#{stage}
-
+        </if>
     </select>
 
 </mapper>

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

@@ -21,6 +21,17 @@
             <artifactId>amos-boot-module-common-biz</artifactId>
             <version>${amos-biz-boot.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-biz-common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.24</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

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

 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.service.IVerifyService;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -111,7 +112,7 @@ public class VerifyController extends BaseController {
      *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "智能监检管理表列表全部数据查询",   notes = "智能监检管理表列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<VerifyDto>> selectForList() {
@@ -126,46 +127,42 @@ public class VerifyController extends BaseController {
 
 
 
-
 	/**   cpp
 	 *
 	 *焊接管材检验信息列表
 	 * @param current
 	 * @param size
-	 * @param dto
 	 * @return
 	 */
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/selectInspection")
+	@GetMapping(value = "/selectTubular")
 	@ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表")
-	public ResponseModel<Page<TubingDto>> selectInspection(@RequestParam(value = "current") int current, @RequestParam
-			(value = "size") int size, TubingDto dto) {
-		Page<TubingDto> page = new Page<>();
+	public ResponseModel<Page<SmartListDto>> selectTubular(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size) {
+		Page<SmartListDto> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
-		return ResponseHelper.buildResponse(service.selectInspection(page,dto));
+		return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前管材质量.getStage(),page));
 	}
-
-
 	/**   cpp
 	 *
 	 *查询焊接人员检验信息列表
 	 * @param current
 	 * @param size
-	 * @param dto
+	 * @param
 	 * @return
 	 */
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/selectWorker")
 	@ApiOperation(httpMethod = "GET", value = "查询焊接人员检验信息列表", notes = "查询焊接人员检验信息列表")
-	public ResponseModel<Page<WorkerDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam
-			(value = "size") int size, WorkerDto dto) {
-		Page<WorkerDto> page = new Page<>();
+	public ResponseModel<Page<SmartListDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size) {
+		Page<SmartListDto> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
-		return ResponseHelper.buildResponse(service.selectWorker(page,dto));
+		return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前人员.getStage(),page));
 	}
 
 	/**   cpp
@@ -173,41 +170,104 @@ public class VerifyController extends BaseController {
 	 *查询焊接设备检验信息列表
 	 * @param current
 	 * @param size
-	 * @param dto
 	 * @return
 	 */
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/selectFacility")
 	@ApiOperation(httpMethod = "GET", value = "查询焊接设备检验信息列表", notes = "查询焊接设备检验信息列表")
-	public ResponseModel<Page<FacilityDto>> selectFacility(@RequestParam(value = "current") int current, @RequestParam
-			(value = "size") int size, FacilityDto dto) {
-		Page<FacilityDto> page = new Page<>();
+	public ResponseModel<Page<SmartListDto>> selectFacility(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size) {
+		Page<SmartListDto> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
-		return ResponseHelper.buildResponse(service.selectFacility(page,dto));
+		return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前设备.getStage(),page));
 	}
+	/**   cpp
+	 *
+	 *查询焊接工艺检验信息列表
+	 * @param current
+	 * @param size
+	 * @return
+	 */
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectCraft")
+	@ApiOperation(httpMethod = "GET", value = "查询焊接工艺检验信息列表", notes = "查询焊接工艺检验信息列表")
+	public ResponseModel<Page<SmartListDto>> selectCraft(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size) {
+		Page<SmartListDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(service.commonality(StageEnum.焊接工艺.getStage(),page));
+	}
+	/**   cpp
+	 *
+	 *查询管道耐压检验信息列表
+	 * @param current
+	 * @param size
+	 * @return
+	 */
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectVoltage")
+	@ApiOperation(httpMethod = "GET", value = "查询管道耐压检验信息列表", notes = "查询管道耐压检验信息列表")
+	public ResponseModel<Page<SmartListDto>> selectVoltage(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size) {
+		Page<SmartListDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(service.commonality(StageEnum.管道耐压.getStage(),page));
+	}
 
+	/**   cpp
+	 *
+	 *敷设位置标定检验列表
+	 * @param current
+	 * @param size
+	 * @return
+	 */
 
-
-
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectLocation")
+	@ApiOperation(httpMethod = "GET", value = "敷设位置标定检验列表", notes = "敷设位置标定检验列表")
+	public ResponseModel<Page<SmartListDto>> selectLocation(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size) {
+		Page<SmartListDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(service.commonality(StageEnum.定位.getStage(),page));
+	}
 
 	/**
 	 *  cpp
-	 *
-	 *    校验
+	 *     校验
 	 * @param dto
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@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));
 	}
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	/**
 	 * 焊接工艺效验
 	 */