reafact(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.dto.InspectMockAppData;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -49,4 +47,14 @@ public class JyjcController {
         return jyjcServiceFeignClient.savePipelineResultDataBatch(resultDataModels);
     }
 
+    /**
+     * 设备定义列表数据查询
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PutMapping(value = "/inspect-app/test-push")
+    @ApiOperation(httpMethod = "PUT", value = "报检对接联调测试数据生成测试接口", notes = "报检对接联调测试数据生成测试接口,模拟用户报检及审批通过后推送报检信息")
+    public ResponseModel<Boolean> inspectAppTestPush(@RequestBody InspectMockAppData inspectMockAppData) {
+        return jyjcServiceFeignClient.inspectAppTestPush(inspectMockAppData);
+    }
+
 }

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

+package com.yeejoin.amos.api.openapi.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 测试报检基础数据
+ */
+@Data
+public class InspectMockAppData {
+
+    @NotBlank(message = "设备种类代码不能为空")
+    private String equList;
+
+    @NotBlank(message = "设备类别代码不能为空")
+    private String equCategory;
+
+    private String equDefine;
+
+    @NotBlank(message = "检验检测类型不能为空")
+    private String inspectType;
+
+    @NotBlank(message = "报检单位代码不能为空")
+    private String applicationUnitCode;
+
+    @NotBlank(message = "报检单位名称不能为空")
+    private String applicationUnitName;
+
+    @NotBlank(message = "检验机构信用代码不能为空")
+    private String inspectionUnitCode;
+
+    @NotBlank(message = "检验机构名称不能为空")
+    private String inspectionUnitName;
+
+
+    @NotBlank(message = "申请联系人")
+    private String applicationContactName;
+
+
+    @NotBlank(message = "申请联系人电话")
+    private String applicationContactPhone;
+
+    @NotBlank(message = "对接唯一标识")
+    private String appId;
+
+    @Min(value = 1, message = "最少申请1个设备报检")
+    @Max(value = 10, message = "最少申请10个设备报检")
+    private Integer size;
+}

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

 package com.yeejoin.amos.api.openapi.feign;
 
 
+import com.yeejoin.amos.api.openapi.dto.InspectMockAppData;
 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;
@@ -32,4 +33,12 @@ public interface JyjcServiceFeignClient {
      */
     @RequestMapping(value = "/jyjc-inspection-result/pipeline/receive", method = RequestMethod.POST)
     ResponseModel<List<PipelineInspectionResultDto>> savePipelineResultDataBatch(@RequestBody List<PipelineInspectionResultDto> resultDataModels);
+
+    /**
+     *  报检结果接收-压力管道
+     * @param inspectMockAppData 测试报检基础数据
+     * @return 上传的数据
+     */
+    @RequestMapping(value = "/jyjc-inspection-application/test-push", method = RequestMethod.PUT)
+    ResponseModel<Boolean> inspectAppTestPush(@RequestBody InspectMockAppData inspectMockAppData);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/InspectMockAppData.java

@@ -2,7 +2,10 @@ package com.yeejoin.amos.boot.module.jyjc.api.dto;
 
 import lombok.Data;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @Data
 public class InspectMockAppData {
@@ -41,5 +44,8 @@ public class InspectMockAppData {
     @NotBlank(message = "对接唯一标识")
     private String appId;
 
-    private Integer size = 1;
+    @Min(value = 1, message = "最少申请1个设备报检")
+    @Max(value = 10, message = "最多申请10个设备报检")
+    @NotNull(message = "size不能为空")
+    private Integer size;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -398,7 +398,7 @@ public class JyjcInspectionApplicationController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "模拟报检接口", notes = "模拟报检接口,联调使用，模拟用户的报检接收")
-    @PutMapping(value = "/mock/app")
+    @PutMapping(value = "/test-push")
     public ResponseModel<Boolean> testAppAndPassApp(@Validated @RequestBody InspectMockAppData appData, BindingResult bindingResult) {
         List<FieldError> fieldErrors = bindingResult.getFieldErrors();
         if (!fieldErrors.isEmpty()) {