已约检数据

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/synchronization/SynchronizationController.java

@@ -58,6 +58,13 @@ public class SynchronizationController {
         return CommonResult.success(null);
     }
 
+    @GetMapping("/taskBoiler/{taskNo}")
+    @PermitAll
+    public CommonResult<Object> taskBoiler(@PathVariable String taskNo) {
+        syncTaskBoilerEquipmentJob.execute(taskNo);
+        return CommonResult.success(null);
+    }
+
     @GetMapping("/taskPipe")
     @PermitAll
     public CommonResult<Object> taskPipe() {
@@ -65,6 +72,13 @@ public class SynchronizationController {
         return CommonResult.success(null);
     }
 
+    @GetMapping("/taskPipe/{taskNo}")
+    @PermitAll
+    public CommonResult<Object> taskPipe(@PathVariable String taskNo) {
+        syncTaskPipeEquipmentJob.execute(taskNo);
+        return CommonResult.success(null);
+    }
+
     @GetMapping("/authorizeSignature/{reportId}")
     public CommonResult<List<SignatureDto>> authorizeSignature(@PathVariable String reportId, @RequestParam(value = "name", required = false) String name) {
         return CommonResult.success(synchronizationService.authorizeSignature(reportId, name));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/framework/cron/SyncTaskBoilerEquipmentJob.java

@@ -143,6 +143,19 @@ public class SyncTaskBoilerEquipmentJob {
             throw new ServiceException(999, "同步任务单设备信息异常");
         }
     }
+    public void execute(String taskNo) {
+        log.info("开始同步任务单设备信息");
+        try {
+            // 1. 同步任务单主表信息
+//            syncTaskOrders();
+//            syncTaskOrdersWithLimit(200);
+            syncTaskOrders(taskNo);
+            log.info("任务单设备信息同步完成");
+        } catch (Exception e) {
+            log.error("同步任务单设备信息异常:", e);
+            throw new ServiceException(999, "同步任务单设备信息异常");
+        }
+    }
 
     /**
      * 同步任务单主表信息
@@ -1452,14 +1465,17 @@ public class SyncTaskBoilerEquipmentJob {
                 case "锅炉水（耐）压试验记录" -> {
                     return "锅炉水（耐）压试验";
                 }
+                case "液压试验" -> {
+                    return "锅炉水（耐）压试验";
+                }
                 case "工业锅炉热力管道在线检验" -> {
                     return "工业锅炉热力管道在线检验";
                 }
                 case "锅炉热力管道" -> {
-                    return "工业锅炉热力管道全面检验记录";
+                    return "工业锅炉热力管道全面检验";
                 }
                 case "内窥镜检验" -> {
-                    return "内窥镜检测记录";
+                    return "内窥镜检测";
                 }
                 // 可以添加更多映射关系
                 default -> {
@@ -1861,6 +1877,67 @@ public class SyncTaskBoilerEquipmentJob {
         }
     }
 
+    /**
+     * 同步指定数量的任务单数据（用于测试）
+     *
+     * @param taskNo 任务单编号
+     */
+    public void syncTaskOrders(String taskNo) {
+        log.info("开始同步任务单主表信息，任务单编号: {}", taskNo);
+        selfProxy.updateAllOrderInfo();
+        try {
+            // 1. 先查询总数量
+            String apiUrl = "http://192.168.20.70:28081/api/checktask_gd";
+            String apiKey = "cecb02cf8d1c7be3a05987d6acc6d913666d9cb72cc061039ffb19ecaead1bb9";
+
+            String url = apiUrl + "?apiKey=" + apiKey + "&TASKNO=" + taskNo + "&pageSize=100";
+
+            Request request = new Request.Builder()
+                    .url(url)
+                    .build();
+            OkHttpClient client = new OkHttpClient();
+
+            try (Response response = client.newCall(request).execute()) {
+                if (response.isSuccessful() && response.body() != null) {
+                    String body = response.body().string();
+
+                    // 先解析为JSONObject
+                    JSONObject jsonResponse = JSONObject.parseObject(body);
+                    JSONArray dataArray = jsonResponse.getJSONArray("data");
+
+                    if (dataArray != null && !dataArray.isEmpty()) {
+                        // 手动转换为CheckTaskDto列表
+                        List<CheckTaskDto> taskOrderList = new ArrayList<>();
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject item = dataArray.getJSONObject(i);
+                            CheckTaskDto taskOrder = item.toJavaObject(CheckTaskDto.class);
+                            taskOrderList.add(taskOrder);
+                            log.info("任务单数据: {}", taskOrder);
+                        }
+
+                        log.info("查询到 {} 条任务单数据，开始处理", taskOrderList.size());
+                        selfProxy.processTaskOrders(taskOrderList);
+                        log.info("限制数量同步完成，处理了 {} 条任务单", taskOrderList.size());
+                    } else {
+                        log.info("没有查询到任务单数据");
+                    }
+                } else {
+                    log.error("查询任务单数据失败，状态码：{}", response.code());
+                    return;
+                }
+            } catch (IOException e) {
+                log.error("查询任务单数据异常:", e);
+                throw new ServiceException(999, "查询任务单数据异常");
+            }
+
+            log.info("限制数量任务单同步完成");
+
+        } catch (Exception e) {
+            log.error("同步任务单主表信息异常:", e);
+            throw new ServiceException(999, "同步任务单主表信息异常");
+        }
+    }
+
     /**
      * 更新任务单金额
      * 通过BoilerTaskOrderItemReportDO的金额合计去更新BoilerTaskOrderItemDO，再更新BoilerTaskOrderDO金额

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/framework/cron/SyncTaskPipeEquipmentJob.java

@@ -132,7 +132,7 @@ public class SyncTaskPipeEquipmentJob {
     @Resource
     private SyncTaskPipeEquipmentJob selfProxy;
 
-    @XxlJob("syncPipeTaskEquipmentJob")
+
     public void execute() {
         log.info("开始同步管道任务单设备信息");
         try {
@@ -144,6 +144,18 @@ public class SyncTaskPipeEquipmentJob {
             throw new ServiceException(999, "同步管道任务单设备信息异常");
         }
     }
+    public void execute(String taskNo) {
+        log.info("开始同步管道任务单设备信息");
+        try {
+//            syncTaskOrders();
+//            syncTaskOrdersWithLimit(200);
+            syncTaskOrders(taskNo);
+            log.info("管道任务单设备信息同步完成");
+        } catch (Exception e) {
+            log.error("同步管道任务单设备信息异常:", e);
+            throw new ServiceException(999, "同步管道任务单设备信息异常");
+        }
+    }
 
     /**
      * 同步任务单主表信息
@@ -1528,6 +1540,9 @@ public class SyncTaskPipeEquipmentJob {
             case "磁粉检测（2026版）" -> {
                 return "磁粉检测";
             }
+            case "管道测厚" -> {
+                return "压力管道壁厚测定";
+            }
             default -> {
                 log.info("工业管道: 未找到检验项目名称映射: {}", originalName);
                 return originalName;
@@ -1820,6 +1835,64 @@ public class SyncTaskPipeEquipmentJob {
         }
     }
 
+    /**
+     * 同步指定数量的管道任务单数据（用于测试）
+     *
+     * @param taskNo 任务单编号
+     */
+    public void syncTaskOrders(String taskNo) {
+        log.info("开始同步管道任务单主表信息，任务单编号: {}", taskNo);
+        try {
+            String apiUrl = "http://192.168.20.70:28081/api/checktask_gd";
+            String apiKey = "cecb02cf8d1c7be3a05987d6acc6d913666d9cb72cc061039ffb19ecaead1bb9";
+
+//            String url = apiUrl + "?apiKey=" + apiKey + "&pageNum=0&pageSize=" + limit;
+            String url = apiUrl + "?apiKey=" + apiKey + "&TASKNO=" + taskNo;
+
+            Request request = new Request.Builder()
+                    .url(url)
+                    .build();
+            OkHttpClient client = new OkHttpClient();
+
+            try (Response response = client.newCall(request).execute()) {
+                if (response.isSuccessful() && response.body() != null) {
+                    String body = response.body().string();
+
+                    JSONObject jsonResponse = JSONObject.parseObject(body);
+                    JSONArray dataArray = jsonResponse.getJSONArray("data");
+
+                    if (dataArray != null && !dataArray.isEmpty()) {
+                        List<CheckTaskDto> taskOrderList = new ArrayList<>();
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject item = dataArray.getJSONObject(i);
+                            CheckTaskDto taskOrder = item.toJavaObject(CheckTaskDto.class);
+                            taskOrderList.add(taskOrder);
+                            log.info("任务单数据: {}", taskOrder);
+                        }
+
+                        log.info("查询到 {} 条管道任务单数据，开始处理", taskOrderList.size());
+                        selfProxy.processTaskOrders(taskOrderList);
+                        log.info("限制数量管道同步完成，处理了 {} 条任务单", taskOrderList.size());
+                    } else {
+                        log.info("没有查询到管道任务单数据");
+                    }
+                } else {
+                    log.error("查询管道任务单数据失败，状态码：{}", response.code());
+                    return;
+                }
+            } catch (IOException e) {
+                log.error("查询管道任务单数据异常:", e);
+                throw new ServiceException(999, "查询管道任务单数据异常");
+            }
+
+            log.info("限制数量管道任务单同步完成");
+
+        } catch (Exception e) {
+            log.error("同步管道任务单主表信息异常:", e);
+            throw new ServiceException(999, "同步管道任务单主表信息异常");
+        }
+    }
+
     /**
      * 更新管道任务单金额
      * 通过PipeTaskOrderItemReportDO的金额合计去更新PipeTaskOrderItemDO，再更新PipeTaskOrderDO金额

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10020_202400ReportOFData.java

@@ -92,7 +92,7 @@ public class QC10020_202400ReportOFData implements IDynamicOFData {
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                result.put("usePressure",equipBoilerDO.getUsepressure());
+                result.put("usePressure",equipBoilerDO.getDesignWorkPressure());
             }
 
             //二维码