feat(jyjc): 报检开发调整

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/JyjcController.java

 package com.yeejoin.amos.api.openapi.controller;
 
 import com.yeejoin.amos.api.openapi.face.dto.JyjcInspectionResultDataModel;
+import com.yeejoin.amos.api.openapi.face.dto.PipelineInspectionResultDto;
 import com.yeejoin.amos.api.openapi.feign.JyjcServiceFeignClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,4 +39,14 @@ public class JyjcController {
         return jyjcServiceFeignClient.saveResultDataBatch(resultDataModels);
     }
 
+    /**
+     * 设备定义列表数据查询
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/pipeline/result-submit")
+    @ApiOperation(httpMethod = "POST", value = "压力管道-检验检测结果回传", notes = "压力管道-检验检测结果回传")
+    public ResponseModel<List<PipelineInspectionResultDto>> pipelineResultSubmit(@RequestBody List<PipelineInspectionResultDto> resultDataModels) {
+        return jyjcServiceFeignClient.savePipelineResultDataBatch(resultDataModels);
+    }
+
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/dto/JyjcInspectionResultDataModel.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -18,7 +19,7 @@ import java.util.List;
  */
 @Data
 @ApiModel(value = "JyjcInspectionResultDataModel", description = "检验检测结果数据接收")
-public class JyjcInspectionResultDataModel {
+public class JyjcInspectionResultDataModel implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -76,4 +77,9 @@ public class JyjcInspectionResultDataModel {
      */
     private String traceId;
 
+    /**
+     * 设备唯一标识，record--首检时需要，此时设备无监管码及设备代码
+     */
+    private String equipId;
+
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/dto/PipelineInspectionResultDto.java

+package com.yeejoin.amos.api.openapi.face.dto;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 管道检验检测结果数据接收
+ *
+ * @author system_generator
+ */
+@Data
+@ApiModel(value = "PipelineInspectionResultDto", description = "管道检验检测结果数据接收")
+public class PipelineInspectionResultDto implements Serializable {
+
+    @ApiModelProperty(value = "报检单号")
+    private String applicationNo;
+
+    @ApiModelProperty(value = "监管码")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "核准证号/许可证号")
+    private String licenseNumber;
+
+    @ApiModelProperty(value = "检验报告编号")
+    private String resultNo;
+
+    @ApiModelProperty(value = "内部人员代码")
+    private String innerPersonCode;
+
+    @ApiModelProperty(value = "检验结论")
+    private String inspectionConclusion;
+
+    @ApiModelProperty(value = "检验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inspectionDate;
+
+    @ApiModelProperty(value = "下次检验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date nextInspectionDate;
+
+    @ApiModelProperty(value = "检验开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inspectionStartDate;
+
+    @ApiModelProperty(value = "检验结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inspectionEndDate;
+
+    @ApiModelProperty(value = "检验结果汇总")
+    private String inspectionResultSummary;
+
+    @ApiModelProperty(value = "不符合项")
+    private JSONArray nonConformance;
+
+    @ApiModelProperty(value = "附件")
+    private List<AttachmentData> attachments;
+
+    /**
+     * 校验检验系统唯一流水号,排查问题，跟踪问题使用
+     */
+    private String traceId;
+
+    @ApiModelProperty(value = "报检的管道")
+    private List<PipelineResultItemDto> inspectionEquips;
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/dto/PipelineResultItemDto.java

+package com.yeejoin.amos.api.openapi.face.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 压力管道汇总表数据项
+ *
+ * @author system_generator
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "压力管道汇总表数据项")
+public class PipelineResultItemDto {
+
+    @ApiModelProperty(value = "唯一标识")
+    private String equipId;
+
+    @ApiModelProperty(value = "公称直径")
+    private String nominalDiameter;
+
+
+    @ApiModelProperty(value = "公称壁厚")
+    private String wallThickness;
+
+
+    @ApiModelProperty(value = "管道长度")
+    private String pipeLength;
+
+
+    @ApiModelProperty(value = "设计压力")
+    private String pressure;
+
+
+    @ApiModelProperty(value = "设计温度")
+    private String temperature;
+
+
+    @ApiModelProperty(value = "设计介质")
+    private String medium;
+
+    @ApiModelProperty(value = "工作压力")
+    private String workPressure;
+
+    @ApiModelProperty(value = "工作温度")
+    private String workTemperature;
+
+    @ApiModelProperty(value = "工作介质")
+    private String workMedium;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/JyjcServiceFeignClient.java

@@ -2,8 +2,8 @@ package com.yeejoin.amos.api.openapi.feign;
 
 
 import com.yeejoin.amos.api.openapi.face.dto.JyjcInspectionResultDataModel;
+import com.yeejoin.amos.api.openapi.face.dto.PipelineInspectionResultDto;
 import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
-
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,4 +25,6 @@ public interface JyjcServiceFeignClient {
     @RequestMapping(value = "/jyjc-inspection-result/receive", method = RequestMethod.POST)
     ResponseModel<List<JyjcInspectionResultDataModel>> saveResultDataBatch(@RequestBody List<JyjcInspectionResultDataModel> resultDataModels);
 
+    @RequestMapping(value = "/jyjc-inspection-result/pipeline/receive", method = RequestMethod.POST)
+    ResponseModel<List<PipelineInspectionResultDto>> savePipelineResultDataBatch(@RequestBody List<PipelineInspectionResultDto> resultDataModels);
 }