为了适应页面需要的格式,修改焊口定位详情查看

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import lombok.Data;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/11/29
+ */
+@Data
+public class ColModel {
+    private String fid;
+    private String dataIndex;
+    private String name;
+    private String title;
+    private String type;
+    private String key;
+
+}

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/11/29
+ */
+@Data
+public class DataGridMock {
+    private Integer current;
+    private Integer total;
+    private Boolean pagination;
+    private Integer totalPage;
+    private List dataList;
+    private Integer pageSize;
+
+}

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/11/29
+ */
+@Data
+public class TableDto {
+   private  DataGridMock dataGridMock;
+   private List<ColModel> colModel;
+}

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.google.common.collect.Lists;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
@@ -13,6 +15,7 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -303,14 +306,145 @@ public class VerifyController extends BaseController {
 	 * @param
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/lookWeld")
 	@ApiOperation(httpMethod = "GET", value = "耐压所属焊口查看", notes = "耐压所属焊口查看")
-	public ResponseModel<Page<Object>> lookWeld(@RequestParam Long sequenceNbr) {
-		Page<Object> objectPage = new Page<>( );
+	public ResponseModel<Page<TableDto>> lookWeld(@RequestParam Long sequenceNbr) {
 		JSONArray dataList = verifyServiceImpl.getWeldLook(sequenceNbr);
-		objectPage.setRecords(dataList);
-		return ResponseHelper.buildResponse(objectPage);
+		//下面这些为了适应平台页面格式(并非逻辑)
+		String js=JSONObject.toJSONString(dataList, SerializerFeature.WriteClassName);
+		List<JSONObject> list = JSONObject.parseArray(js,JSONObject.class);
+		TableDto tableDto = new TableDto( );
+		DataGridMock dataGridMock = new DataGridMock( );
+		dataGridMock.setDataList(list);
+		dataGridMock.setTotal(list.size());
+		//dataGridMock.setTotalPage(1);
+		//dataGridMock.setPageSize(10);
+		//dataGridMock.setCurrent(1);
+		//dataGridMock.setPagination(false);
+		ColModel colModel1 = new ColModel( );
+		colModel1.setFid("code");
+		colModel1.setDataIndex("code");
+		colModel1.setName("焊口编号");
+		colModel1.setTitle("焊口编号");
+		colModel1.setType("dataGrid");
+		colModel1.setKey("code");
+		ColModel colModel2 = new ColModel( );
+		colModel2.setFid("location");
+		colModel2.setDataIndex("location");
+		colModel2.setName("焊接定位信息");
+		colModel2.setTitle("焊接定位信息");
+		colModel2.setType("dataGrid");
+		colModel2.setKey("location");
+		ColModel colModel3 = new ColModel( );
+		colModel3.setFid("peopleStatus");
+		colModel3.setDataIndex("peopleStatus");
+		colModel3.setName("焊接人员核验");
+		colModel3.setTitle("焊接人员核验");
+		colModel3.setType("dataGrid");
+		colModel3.setKey("peopleStatus");
+		ColModel colModel4 = new ColModel( );
+		colModel4.setFid("equipmentStatus");
+		colModel4.setDataIndex("equipmentStatus");
+		colModel4.setName("焊机核验");
+		colModel4.setTitle("焊机核验");
+		colModel4.setType("dataGrid");
+		colModel4.setKey("equipmentStatus");
+		ColModel colModel5 = new ColModel( );
+		colModel5.setFid("materialStatus");
+		colModel5.setDataIndex("materialStatus");
+		colModel5.setName("材料核验");
+		colModel5.setTitle("材料核验");
+		colModel5.setType("dataGrid");
+		colModel5.setKey("materialStatus");
+		ColModel colModel6 = new ColModel( );
+		colModel6.setFid("craftStatus");
+		colModel6.setDataIndex("craftStatus");
+		colModel6.setName("工艺过程核验");
+		colModel6.setTitle("工艺过程核验");
+		colModel6.setType("dataGrid");
+		colModel6.setKey("craftStatus");
+		ArrayList<ColModel> list1 = Lists.newArrayList( );
+		list1.add(colModel1);
+		list1.add(colModel2);
+		list1.add(colModel3);
+		list1.add(colModel4);
+		list1.add(colModel5);
+		list1.add(colModel6);
+		tableDto.setDataGridMock(dataGridMock);
+		tableDto.setColModel(list1);
+		ArrayList<TableDto> list2 = Lists.newArrayList( );
+       list2.add(tableDto);
+		Page<TableDto> objectPage1 = new Page<>( );
+		objectPage1.setRecords(list2);
+
+		return ResponseHelper.buildResponse(objectPage1);
+	}
+
+
+	/**焊口定位详情查看
+	* */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/calibration")
+	@ApiOperation(httpMethod = "GET", value = "焊口定位详情查看", notes = "焊口定位详情查看")
+	public ResponseModel<Page<TableDto>> calibration(@RequestParam Long sequenceNbr) {
+
+		JSONArray dataList = verifyServiceImpl.calibration(sequenceNbr);
+		String js=JSONObject.toJSONString(dataList, SerializerFeature.WriteClassName);
+		List<JSONObject> list = JSONObject.parseArray(js,JSONObject.class);
+		TableDto tableDto = new TableDto( );
+		DataGridMock dataGridMock = new DataGridMock( );
+		dataGridMock.setDataList(list);
+		dataGridMock.setTotal(list.size());
+		ColModel colModel1 = new ColModel( );
+		colModel1.setFid("code");
+		colModel1.setDataIndex("code");
+		colModel1.setName("焊口编号");
+		colModel1.setTitle("焊口编号");
+		colModel1.setType("dataGrid");
+		colModel1.setKey("code");
+		ColModel colModel2 = new ColModel( );
+		colModel2.setFid("craftLocation");
+		colModel2.setDataIndex("craftLocation");
+		colModel2.setName("焊接定位信息");
+		colModel2.setTitle("焊接定位信息");
+		colModel2.setType("dataGrid");
+		colModel2.setKey("craftLocation");
+		ColModel colModel3 = new ColModel( );
+		colModel3.setFid("layLocation");
+		colModel3.setDataIndex("layLocation");
+		colModel3.setName("焊口敷设定位信息");
+		colModel3.setTitle("焊口敷设定位信息");
+		colModel3.setType("dataGrid");
+		colModel3.setKey("layLocation");
+		ColModel colModel4 = new ColModel( );
+		colModel4.setFid("offset");
+		colModel4.setDataIndex("offset");
+		colModel4.setName("焊接敷设位置偏差（m）");
+		colModel4.setTitle("焊接敷设位置偏差（m）");
+		colModel4.setType("dataGrid");
+		colModel4.setKey("offset");
+		ColModel colModel5 = new ColModel( );
+		colModel5.setFid("verification");
+		colModel5.setDataIndex("verification");
+		colModel5.setName("核验信息");
+		colModel5.setTitle("核验信息");
+		colModel5.setType("dataGrid");
+		colModel5.setKey("verification");
+		ArrayList<ColModel> list1 = Lists.newArrayList( );
+		list1.add(colModel1);
+		list1.add(colModel2);
+		list1.add(colModel3);
+		list1.add(colModel4);
+		list1.add(colModel5);
+		tableDto.setDataGridMock(dataGridMock);
+		tableDto.setColModel(list1);
+		ArrayList<TableDto> list2 = Lists.newArrayList( );
+		list2.add(tableDto);
+		Page<TableDto> objectPage1 = new Page<>( );
+		objectPage1.setRecords(list2);
+
+		return ResponseHelper.buildResponse(objectPage1);
 	}
 
 }

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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.*;
@@ -871,6 +872,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
     }
     private static final String HEGE ="合格";
     private static final String NOTHEGE ="不合格";
+    private static final String _id="_id";
 //耐压所属焊口查看
     public JSONArray getWeldLook(Long sequenceNbr){
         JSONObject object = new JSONObject( );
@@ -881,10 +883,11 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
                 String codes = verify.getCode( );
                 if (!ValidationUtil.isEmpty(codes)) {
                     String[] codeArray = codes.split(",");
-                    int num =1;
+                    int num =0;
                     for (String code : codeArray) {
                         //查工艺
                         object.put("code",code);
+
                         String targetInfo = verify.getTargetInfo( );
                         if (!ValidationUtil.isEmpty(targetInfo)) {
                             List<Verify> verifyList = verifyMapper.selectByWelder(verify.getProjectId( ), null, code, StageEnum.焊接工艺.getStage( ), null);
@@ -936,6 +939,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
                                     object.put("materialStatus",NOTHEGE);
                                 }
                             }
+                            object.put(_id,num+1);
                         }
                        jsonArray.add(object);
                     }
@@ -944,4 +948,46 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         }
         return jsonArray;
     }
+
+
+    /**
+     * 焊口定位详情查看
+     */
+    public JSONArray calibration(Long sequenceNbr){
+        JSONArray jsonArray = new JSONArray( );
+        JSONObject object = new JSONObject( );
+        if (!ValidationUtil.isEmpty(sequenceNbr)){
+            Verify verify = verifyMapper.selectById(sequenceNbr); //定位信息
+            String codes = verify.getCode( );
+            String[] split = codes.split(",");
+            int num =0;
+            for (String code : split) {
+                object.put("code",code);
+                LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>( );
+                wrapper.eq(Verify::getCode,code).eq(Verify::getStage,StageEnum.焊接工艺.getStage());
+                List<Verify> verifyList = verifyMapper.selectList(wrapper);
+                Verify vfy= verifyList.stream( ).max((v1, v2) -> v1.getVerifyTime( ).compareTo(v2.getVerifyTime( ))).orElse(null);
+                String targetInfo = vfy.getTargetInfo( );
+                JSONObject jt = JSONObject.parseObject(targetInfo);
+                String craftLocation = jt.getString("location");
+                object.put("craftLocation",craftLocation);
+                LambdaQueryWrapper<Verify> wp = new LambdaQueryWrapper<>( );
+                wp.eq(Verify::getCode,code).eq(Verify::getStage,StageEnum.定位.getStage());
+                List<Verify> lists = verifyMapper.selectList(wp);
+                Verify verify1= lists.stream( ).max((v1, v2) -> v1.getVerifyTime( ).compareTo(v2.getVerifyTime( ))).orElse(null);
+                String targetInfo1 = verify1.getTargetInfo( );
+                JSONObject parseObject = JSONObject.parseObject(targetInfo1);
+                String layLocation = parseObject.getString("location");
+                object.put("layLocation",layLocation);
+                //缺一个位置偏差计算
+                object.put("offset","");
+                object.put("verification","");
+                object.put(_id,num+1);
+                jsonArray.add(object);
+            }
+
+        }
+
+return jsonArray;
+    }
 }