feat:1.代码提交

jeecg-module-system/pom.xml

@@ -73,6 +73,10 @@
             <properties>
                 <package.environment>hkl</package.environment>
             </properties>
+            <!-- 是否默认 true表示默认-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
 
         <!-- 测试环境 -->
@@ -81,10 +85,6 @@
             <properties>
                 <package.environment>test</package.environment>
             </properties>
-            <!-- 是否默认 true表示默认-->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
 
         <!-- 压测环境-->
@@ -114,4 +114,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

jeecg-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -37,7 +37,6 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
                 "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
                 "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
                 "----------------------------------------------------------");
-
     }
 
-}
\ No newline at end of file
+}

jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java

@@ -29,7 +29,8 @@ public class CodeGenerate {
 
         // 表名
         String[] tables = {
-                "t_dsa_config_tqi_limit",
+                "t_dsa_analysis_over_report_check_unit_device_map",
+                "t_dsa_analysis_tqi_report_check_unit_device_map",
         };
 
 

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/algorithm/AnalysisAlgorithm.java

@@ -42,8 +42,6 @@ public class AnalysisAlgorithm {
     @Resource
     private IRailInspectionEquipmentItemDetailService railInspectionEquipmentItemDetailService;
     @Resource
-    private IMovementCheckDataUnitDeviceMapService movementCheckDataUnitDeviceMapService;
-    @Resource
     private IAnalysisBatchUnitDeviceService analysisBatchUnitDeviceService;
     @Resource
     private IAnalysisBatchUnitDeviceTransfiniteService analysisBatchUnitDeviceTransfiniteService;
@@ -82,6 +80,20 @@ public class AnalysisAlgorithm {
     @Resource
     private IMovementAdditiveInfoUnitDeviceMapService movementAdditiveInfoUnitDeviceMapService;
 
+    @Resource
+    private IAnalysisLabourCheckDataUnitDeviceMapService analysisLabourCheckDataUnitDeviceMapService;
+
+    @Resource
+    private IAnalysisRailDeviceCheckDataUnitDeviceMapService analysisRailDeviceCheckDataUnitDeviceMapService;
+
+    @Resource
+    private IAnalysisAdditiveCheckUnitDeviceMapService analysisAdditiveCheckUnitDeviceMapService;
+
+    @Resource
+    private IAnalysisOverReportCheckUnitDeviceMapService analysisOverReportCheckUnitDeviceMapService;
+
+    @Resource
+    private IAnalysisTqiReportCheckUnitDeviceMapService analysisTqiReportCheckUnitDeviceMapService;
 
     @Transactional
     public void analysis(String analysisBatchId) {
@@ -135,6 +147,23 @@ public class AnalysisAlgorithm {
             // 删除轨检车tqi得分
             analysisBatchUnitDeviceTqiScoreService.lambdaUpdate().eq(AnalysisBatchUnitDeviceTqiScore::getAnalysisBatchId, analysisBatch.getId()).remove();
 
+            // 删除关联关系
+            analysisLabourCheckDataUnitDeviceMapService.lambdaUpdate()
+                    .eq(AnalysisLabourCheckDataUnitDeviceMap::getAnalysisBatchId, analysisBatchId)
+                    .remove();
+            analysisRailDeviceCheckDataUnitDeviceMapService.lambdaUpdate()
+                    .eq(AnalysisRailDeviceCheckDataUnitDeviceMap::getAnalysisBatchId, analysisBatchId)
+                    .remove();
+            analysisAdditiveCheckUnitDeviceMapService.lambdaUpdate()
+                    .eq(AnalysisAdditiveCheckUnitDeviceMap::getAnalysisBatchId, analysisBatchId)
+                    .remove();
+            analysisOverReportCheckUnitDeviceMapService.lambdaUpdate()
+                    .eq(AnalysisOverReportCheckUnitDeviceMap::getAnalysisBatchId, analysisBatchId)
+                    .remove();
+            analysisTqiReportCheckUnitDeviceMapService.lambdaUpdate()
+                    .eq(AnalysisTqiReportCheckUnitDeviceMap::getAnalysisBatchId, analysisBatchId)
+                    .remove();
+
 
             // 3.1 保存分析批次-单元设备
             List<ConfigGradeLimit> configGradeLimitList = configGradeLimitService.lambdaQuery().eq(ConfigGradeLimit::getSpeedMax, analysisBatch.getSpeedMax()).eq(ConfigGradeLimit::getSpeedMin, analysisBatch.getSpeedMin()).eq(ConfigGradeLimit::getDelFlag, '0').list();
@@ -247,16 +276,18 @@ public class AnalysisAlgorithm {
 
 
                 // 保存人工检查数据超限
-                AnalysisBatchUnitDeviceTransfinite labourCheckTransfinite = (AnalysisBatchUnitDeviceTransfinite) unitDevice.get("labourCheckTransfinite");
-                if (ObjectUtil.isNotEmpty(labourCheckTransfinite)) {
-                    labourCheckTransfinite.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
-                    labourCheckTransfinite.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
-                    labourCheckTransfinite.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
-                    labourCheckTransfinite.setUnitId(analysisBatchUnitDevice.getUnitId());
-                    labourCheckTransfinite.setUnitCode(analysisBatchUnitDevice.getUnitCode());
-                    labourCheckTransfinite.setUnitType(analysisBatchUnitDevice.getUnitType());
-                    labourCheckTransfinite.setUnitTypeName(analysisBatchUnitDevice.getUnitTypeName());
-                    transfiniteList.add(labourCheckTransfinite);
+                List<AnalysisBatchUnitDeviceTransfinite> labourCheckTransfiniteList = (List<AnalysisBatchUnitDeviceTransfinite>) unitDevice.get("labourCheckTransfinite");
+                if (ObjectUtil.isNotEmpty(labourCheckTransfiniteList)) {
+                    for (AnalysisBatchUnitDeviceTransfinite labourCheckTransfinite : labourCheckTransfiniteList) {
+                        labourCheckTransfinite.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
+                        labourCheckTransfinite.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
+                        labourCheckTransfinite.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
+                        labourCheckTransfinite.setUnitId(analysisBatchUnitDevice.getUnitId());
+                        labourCheckTransfinite.setUnitCode(analysisBatchUnitDevice.getUnitCode());
+                        labourCheckTransfinite.setUnitType(analysisBatchUnitDevice.getUnitType());
+                        labourCheckTransfinite.setUnitTypeName(analysisBatchUnitDevice.getUnitTypeName());
+                        transfiniteList.add(labourCheckTransfinite);
+                    }
                 }
 
                 // 保存人工检查数据计算得分
@@ -276,16 +307,18 @@ public class AnalysisAlgorithm {
 
 
                 // 保存轨检仪检查数据超限
-                AnalysisBatchUnitDeviceTransfinite railDeviceTransfinite = (AnalysisBatchUnitDeviceTransfinite) unitDevice.get("railDeviceTransfinite");
-                if (ObjectUtil.isNotEmpty(railDeviceTransfinite)) {
-                    railDeviceTransfinite.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
-                    railDeviceTransfinite.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
-                    railDeviceTransfinite.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
-                    railDeviceTransfinite.setUnitId(analysisBatchUnitDevice.getUnitId());
-                    railDeviceTransfinite.setUnitCode(analysisBatchUnitDevice.getUnitCode());
-                    railDeviceTransfinite.setUnitType(analysisBatchUnitDevice.getUnitType());
-                    railDeviceTransfinite.setUnitTypeName(analysisBatchUnitDevice.getUnitTypeName());
-                    transfiniteList.add(railDeviceTransfinite);
+                List<AnalysisBatchUnitDeviceTransfinite> railDeviceTransfiniteList = (List<AnalysisBatchUnitDeviceTransfinite>) unitDevice.get("railDeviceTransfinite");
+                if (ObjectUtil.isNotEmpty(railDeviceTransfiniteList)) {
+                    for (AnalysisBatchUnitDeviceTransfinite railDeviceTransfinite : railDeviceTransfiniteList) {
+                        railDeviceTransfinite.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
+                        railDeviceTransfinite.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
+                        railDeviceTransfinite.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
+                        railDeviceTransfinite.setUnitId(analysisBatchUnitDevice.getUnitId());
+                        railDeviceTransfinite.setUnitCode(analysisBatchUnitDevice.getUnitCode());
+                        railDeviceTransfinite.setUnitType(analysisBatchUnitDevice.getUnitType());
+                        railDeviceTransfinite.setUnitTypeName(analysisBatchUnitDevice.getUnitTypeName());
+                        transfiniteList.add(railDeviceTransfinite);
+                    }
                 }
 
 
@@ -374,6 +407,64 @@ public class AnalysisAlgorithm {
                     }
                 }
 
+                // 保存人工检查数据分析批次映射
+                List<AnalysisLabourCheckDataUnitDeviceMap> labourCheckDataUnitDeviceMapList = (List<AnalysisLabourCheckDataUnitDeviceMap>) unitDevice.get("labourCheckDataUnitDeviceMapList");
+                if (ObjectUtil.isNotEmpty(labourCheckDataUnitDeviceMapList)) {
+                    for (AnalysisLabourCheckDataUnitDeviceMap labourCheckDataUnitDeviceMap : labourCheckDataUnitDeviceMapList) {
+                        labourCheckDataUnitDeviceMap.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
+                        labourCheckDataUnitDeviceMap.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
+                        labourCheckDataUnitDeviceMap.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
+                    }
+                    analysisLabourCheckDataUnitDeviceMapService.saveBatch(labourCheckDataUnitDeviceMapList);
+                }
+
+
+                // 保存添乘仪数据分析批次映射
+                List<AnalysisRailDeviceCheckDataUnitDeviceMap> railDeviceCheckDataUnitDeviceMapList = (List<AnalysisRailDeviceCheckDataUnitDeviceMap>) unitDevice.get("railDeviceCheckDataUnitDeviceMapList");
+                if (ObjectUtil.isNotEmpty(railDeviceCheckDataUnitDeviceMapList)) {
+                    for (AnalysisRailDeviceCheckDataUnitDeviceMap railDeviceCheckDataUnitDeviceMap : railDeviceCheckDataUnitDeviceMapList) {
+                        railDeviceCheckDataUnitDeviceMap.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
+                        railDeviceCheckDataUnitDeviceMap.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
+                        railDeviceCheckDataUnitDeviceMap.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
+                    }
+                    analysisRailDeviceCheckDataUnitDeviceMapService.saveBatch(railDeviceCheckDataUnitDeviceMapList);
+                }
+
+                // 保存轨检车数据分析批次映射
+                List<AnalysisAdditiveCheckUnitDeviceMap> additiveCheckUnitDeviceMapList = (List<AnalysisAdditiveCheckUnitDeviceMap>) unitDevice.get("additiveCheckUnitDeviceMapList");
+                if (ObjectUtil.isNotEmpty(additiveCheckUnitDeviceMapList)) {
+                    for (AnalysisAdditiveCheckUnitDeviceMap additiveCheckUnitDeviceMap : additiveCheckUnitDeviceMapList) {
+                        additiveCheckUnitDeviceMap.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
+                        additiveCheckUnitDeviceMap.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
+                        additiveCheckUnitDeviceMap.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
+                    }
+                    analysisAdditiveCheckUnitDeviceMapService.saveBatch(additiveCheckUnitDeviceMapList);
+                }
+
+                // 保存轨检车数据分析批次映射
+                List<AnalysisOverReportCheckUnitDeviceMap> overReportCheckUnitDeviceMapList = (List<AnalysisOverReportCheckUnitDeviceMap>) unitDevice.get("overReportCheckUnitDeviceMapList");
+                if (ObjectUtil.isNotEmpty(overReportCheckUnitDeviceMapList)) {
+                    for (AnalysisOverReportCheckUnitDeviceMap reportCheckUnitDeviceMap : overReportCheckUnitDeviceMapList) {
+                        reportCheckUnitDeviceMap.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
+                        reportCheckUnitDeviceMap.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
+                        reportCheckUnitDeviceMap.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
+                    }
+                    analysisOverReportCheckUnitDeviceMapService.saveBatch(overReportCheckUnitDeviceMapList);
+                }
+
+
+                // 保存轨检车Tqi数据分析批次映射
+                List<AnalysisTqiReportCheckUnitDeviceMap> tqiReportCheckUnitDeviceMapList = (List<AnalysisTqiReportCheckUnitDeviceMap>) unitDevice.get("tqiReportCheckUnitDeviceMapList");
+                if (ObjectUtil.isNotEmpty(tqiReportCheckUnitDeviceMapList)) {
+                    for (AnalysisTqiReportCheckUnitDeviceMap tqiReportCheckUnitDeviceMap : tqiReportCheckUnitDeviceMapList) {
+                        tqiReportCheckUnitDeviceMap.setAnalysisBatchUnitDeviceId(analysisBatchUnitDevice.getId());
+                        tqiReportCheckUnitDeviceMap.setAnalysisBatchId(analysisBatchUnitDevice.getAnalysisBatchId());
+                        tqiReportCheckUnitDeviceMap.setAnalysisBatchCode(analysisBatchUnitDevice.getAnalysisBatchCode());
+                    }
+                    analysisTqiReportCheckUnitDeviceMapService.saveBatch(tqiReportCheckUnitDeviceMapList);
+                }
+
+
             }
             analysisBatchUnitDeviceTqiScoreService.saveBatch(tqiScoreList);
             analysisBatchUnitDeviceService.saveBatch(analysisBatchUnitDevices);
@@ -509,6 +600,7 @@ public class AnalysisAlgorithm {
 
             List<MovementAdditiveInfo> currentUnitDeviceAdditiveList = new ArrayList<>();
             List<AnalysisBatchUnitDeviceTransfinite> addInstrumentTransfiniteList = new ArrayList<>();
+            List<AnalysisAdditiveCheckUnitDeviceMap> additiveCheckUnitDeviceMapList = new ArrayList<>();
 
             Iterator<MovementAdditiveInfo> iterator = additiveInfos.iterator();
             while (iterator.hasNext()) {
@@ -518,26 +610,29 @@ public class AnalysisAlgorithm {
 
                 if (startMileage.compareTo(pointMileage) <= 0 && endMileage.compareTo(pointMileage) > 0) {
                     // 记录映射关系
-                    MovementAdditiveInfoUnitDeviceMap additiveInfoUnitMap = new MovementAdditiveInfoUnitDeviceMap();
-                    additiveInfoUnitMap.setId(UUIDGenerator.generate());
-                    additiveInfoUnitMap.setMovementMasterId(checkDataMap.getEkId());
-                    additiveInfoUnitMap.setUnitId(Convert.toStr(unitDevice.get("id")));
-                    additiveInfoUnitMap.setUnitCode(Convert.toStr(unitDevice.get("unitCode")));
-                    additiveInfoUnitMap.setUnitDeviceCode(Convert.toStr(unitDevice.get("deviceCode")));
-                    additiveInfoUnitMap.setUnitType(Convert.toInt(unitDevice.get("type")));
-                    additiveInfoUnitMap.setUnitTypeName(Convert.toStr(unitDevice.get("typeName")));
-                    additiveInfoUnitMap.setUnitStartMileage(Convert.toBigDecimal(unitDevice.get("startMileage")));
-                    additiveInfoUnitMap.setUnitCenterMileage(Convert.toBigDecimal(unitDevice.get("centerMileage")));
-                    additiveInfoUnitMap.setUnitEndMileage(Convert.toBigDecimal(unitDevice.get("endMileage")));
-                    additiveInfoUnitMap.setPointMileage(pointMileage);
-                    additiveInfoUnitMap.setZontalSpeed(additiveInfo.getZontalSpeed());
-                    additiveInfoUnitMap.setZontalSpeedLevel(additiveInfo.getZontalSpeedLevel());
-                    additiveInfoUnitMap.setVerticalSpeed(additiveInfo.getVerticalSpeed());
-                    additiveInfoUnitMap.setVerticalSpeedLevel(additiveInfo.getVerticalSpeedLevel());
-                    additiveInfoUnitMap.setSpeed(additiveInfo.getSpeed());
-                    additiveInfoUnitMap.setMark(additiveInfo.getMark());
-                    additiveInfoUnitMaps.add(additiveInfoUnitMap);
-
+//                    MovementAdditiveInfoUnitDeviceMap additiveInfoUnitMap = new MovementAdditiveInfoUnitDeviceMap();
+//                    additiveInfoUnitMap.setId(UUIDGenerator.generate());
+//                    additiveInfoUnitMap.setMovementMasterId(checkDataMap.getEkId());
+//                    additiveInfoUnitMap.setUnitId(Convert.toStr(unitDevice.get("id")));
+//                    additiveInfoUnitMap.setUnitCode(Convert.toStr(unitDevice.get("unitCode")));
+//                    additiveInfoUnitMap.setUnitDeviceCode(Convert.toStr(unitDevice.get("deviceCode")));
+//                    additiveInfoUnitMap.setUnitType(Convert.toInt(unitDevice.get("type")));
+//                    additiveInfoUnitMap.setUnitTypeName(Convert.toStr(unitDevice.get("typeName")));
+//                    additiveInfoUnitMap.setUnitStartMileage(Convert.toBigDecimal(unitDevice.get("startMileage")));
+//                    additiveInfoUnitMap.setUnitCenterMileage(Convert.toBigDecimal(unitDevice.get("centerMileage")));
+//                    additiveInfoUnitMap.setUnitEndMileage(Convert.toBigDecimal(unitDevice.get("endMileage")));
+//                    additiveInfoUnitMap.setPointMileage(pointMileage);
+//                    additiveInfoUnitMap.setZontalSpeed(additiveInfo.getZontalSpeed());
+//                    additiveInfoUnitMap.setZontalSpeedLevel(additiveInfo.getZontalSpeedLevel());
+//                    additiveInfoUnitMap.setVerticalSpeed(additiveInfo.getVerticalSpeed());
+//                    additiveInfoUnitMap.setVerticalSpeedLevel(additiveInfo.getVerticalSpeedLevel());
+//                    additiveInfoUnitMap.setSpeed(additiveInfo.getSpeed());
+//                    additiveInfoUnitMap.setMark(additiveInfo.getMark());
+//                    additiveInfoUnitMaps.add(additiveInfoUnitMap);
+
+
+                    AnalysisAdditiveCheckUnitDeviceMap additiveCheckUnitDeviceMap = this.additiveCheckUnitDeviceMapSave(checkDataMap, unitDevice, additiveInfo);
+                    additiveCheckUnitDeviceMapList.add(additiveCheckUnitDeviceMap);
 
                     // 水平超限
                     if (additiveInfo.getZontalSpeedLevel() != null) {
@@ -604,7 +699,10 @@ public class AnalysisAlgorithm {
                     iterator.remove();
                 }
             }
+
             unitDevice.put("addInstrumentTransfiniteList", addInstrumentTransfiniteList);
+            unitDevice.put("additiveCheckUnitDeviceMapList", additiveCheckUnitDeviceMapList);
+
 
             // 计算得分
             BigDecimal sumUnitScore = null;
@@ -701,6 +799,28 @@ public class AnalysisAlgorithm {
         }
     }
 
+    private AnalysisAdditiveCheckUnitDeviceMap additiveCheckUnitDeviceMapSave(AnalysisBatchCheckDataMap checkDataMap, Map<String, Object> unitDevice, MovementAdditiveInfo additiveInfo) {
+        AnalysisAdditiveCheckUnitDeviceMap additiveInfoUnitMap = new AnalysisAdditiveCheckUnitDeviceMap();
+        additiveInfoUnitMap.setId(UUIDGenerator.generate());
+        additiveInfoUnitMap.setMovementMasterId(checkDataMap.getEkId());
+        additiveInfoUnitMap.setUnitId(Convert.toStr(unitDevice.get("id")));
+        additiveInfoUnitMap.setUnitCode(Convert.toStr(unitDevice.get("unitCode")));
+        additiveInfoUnitMap.setUnitDeviceCode(Convert.toStr(unitDevice.get("deviceCode")));
+        additiveInfoUnitMap.setUnitType(Convert.toInt(unitDevice.get("type")));
+        additiveInfoUnitMap.setUnitTypeName(Convert.toStr(unitDevice.get("typeName")));
+        additiveInfoUnitMap.setUnitStartMileage(Convert.toBigDecimal(unitDevice.get("startMileage")));
+        additiveInfoUnitMap.setUnitCenterMileage(Convert.toBigDecimal(unitDevice.get("centerMileage")));
+        additiveInfoUnitMap.setUnitEndMileage(Convert.toBigDecimal(unitDevice.get("endMileage")));
+        additiveInfoUnitMap.setPointMileage(additiveInfo.getPointMileage().multiply(new BigDecimal("1000")));
+        additiveInfoUnitMap.setZontalSpeed(additiveInfo.getZontalSpeed());
+        additiveInfoUnitMap.setZontalSpeedLevel(additiveInfo.getZontalSpeedLevel());
+        additiveInfoUnitMap.setVerticalSpeed(additiveInfo.getVerticalSpeed());
+        additiveInfoUnitMap.setVerticalSpeedLevel(additiveInfo.getVerticalSpeedLevel());
+        additiveInfoUnitMap.setSpeed(additiveInfo.getSpeed());
+        additiveInfoUnitMap.setMark(additiveInfo.getMark());
+        return additiveInfoUnitMap;
+    }
+
 
     /**
      * 轨检车检查数据解析
@@ -740,6 +860,7 @@ public class AnalysisAlgorithm {
         // 2.根据分析批次的里程查询出映射单元
         List<MovementOverReportUnitDeviceMap> overReportUnitDeviceMaps = new ArrayList<>();
         List<MovementTqiReportUnitDeviceMap> movementTqiReportUnitDeviceMaps = new ArrayList<>();
+
         List<String> unitDeviceIds = new ArrayList<>();
         for (Map<String, Object> unitDevice : unitDeviceList) {
             // 添加所有单元ID
@@ -756,6 +877,8 @@ public class AnalysisAlgorithm {
 
 
             List<MovementOverReport> currentUnitDeviceOverReportList = new ArrayList<>();
+            List<AnalysisOverReportCheckUnitDeviceMap> overReportCheckUnitDeviceMapList = new ArrayList<>();
+
             // 2.1 缺陷记录报告表里程落在单元设备【开始-结束】这个设备上面，视为这个区间的超限记录
             List<AnalysisBatchUnitDeviceTransfinite> railVehicleTransfiniteList = new ArrayList<>();
             for (MovementOverReport movementOverReport : movementOverReports) {
@@ -791,8 +914,11 @@ public class AnalysisAlgorithm {
                     overReportUnitDeviceMap.setStandard(movementOverReport.getStandard());
                     overReportUnitDeviceMap.setSpend(movementOverReport.getSpend());
                     overReportUnitDeviceMaps.add(overReportUnitDeviceMap);
-
                     currentUnitDeviceOverReportList.add(movementOverReport);
+
+
+                    AnalysisOverReportCheckUnitDeviceMap overReportCheckUnitDeviceMap = this.analysisOverReportCheckUnitDeviceMapSave(unitDevice, checkDataMap, movementOverReport);
+                    overReportCheckUnitDeviceMapList.add(overReportCheckUnitDeviceMap);
                 }
             }
 
@@ -914,6 +1040,7 @@ public class AnalysisAlgorithm {
             BigDecimal tqiComeUponTqi = tqiJsonObject.getBigDecimal("tqi");
 
             // 2.3.2 单元设备中心里程落在tqi【开始-结束】这个区间视为这个区间的单元设备
+            List<AnalysisTqiReportCheckUnitDeviceMap> tqiReportCheckUnitDeviceMapList = new ArrayList<>();
             for (MovementTqiReport tqiReport : tqiReports) {
                 // 如果命中处理测点映射关系
                 if (tqiReport.getStartMileage().compareTo(centerMileage) <= 0 && tqiReport.getEndMileage().compareTo(centerMileage) > 0) {
@@ -947,6 +1074,8 @@ public class AnalysisAlgorithm {
                     movementTqiReportUnitDeviceMap.setSpend(tqiReport.getSpend());
                     movementTqiReportUnitDeviceMaps.add(movementTqiReportUnitDeviceMap);
 
+                    AnalysisTqiReportCheckUnitDeviceMap tqiReportCheckUnitDeviceMap = this.tqiReportCheckUnitDeviceMapSave(checkDataMap, unitDevice, tqiReport);
+                    tqiReportCheckUnitDeviceMapList.add(tqiReportCheckUnitDeviceMap);
 
                     // 计算分数
                     // 计算高低得分
@@ -1057,22 +1186,80 @@ public class AnalysisAlgorithm {
             unitDevice.put("railVehicleTransfiniteList", railVehicleTransfiniteList);
             unitDevice.put("railVehicleCheckScore", sumUnitScore);
             unitDevice.put("railVehicleCheckScoreList", scoreList);
+            unitDevice.put("overReportCheckUnitDeviceMapList", overReportCheckUnitDeviceMapList);
+            unitDevice.put("tqiReportCheckUnitDeviceMapList", tqiReportCheckUnitDeviceMapList);
         }
 
 
         // 3.先删除旧的关联关系,在新增
 
-        movementOverReportUnitDeviceMapService.lambdaUpdate()
-                .in(MovementOverReportUnitDeviceMap::getUnitId, unitDeviceIds)
-                .remove();
-        movementOverReportUnitDeviceMapService.saveBatch(overReportUnitDeviceMaps);
+//        movementOverReportUnitDeviceMapService.lambdaUpdate()
+//                .in(MovementOverReportUnitDeviceMap::getUnitId, unitDeviceIds)
+//                .remove();
+//        movementOverReportUnitDeviceMapService.saveBatch(overReportUnitDeviceMaps);
 
+//
+//        movementTqiReportUnitDeviceMapService.lambdaUpdate()
+//                .in(MovementTqiReportUnitDeviceMap::getUnitId, unitDeviceIds)
+//                .remove();
+//        movementTqiReportUnitDeviceMapService.saveBatch(movementTqiReportUnitDeviceMaps);
 
-        movementTqiReportUnitDeviceMapService.lambdaUpdate()
-                .in(MovementTqiReportUnitDeviceMap::getUnitId, unitDeviceIds)
-                .remove();
-        movementTqiReportUnitDeviceMapService.saveBatch(movementTqiReportUnitDeviceMaps);
+    }
 
+    private AnalysisTqiReportCheckUnitDeviceMap tqiReportCheckUnitDeviceMapSave(AnalysisBatchCheckDataMap checkDataMap, Map<String, Object> unitDevice, MovementTqiReport tqiReport) {
+        AnalysisTqiReportCheckUnitDeviceMap record = new AnalysisTqiReportCheckUnitDeviceMap();
+        record.setId(UUIDGenerator.generate());
+        record.setCheckId(checkDataMap.getEkId());
+        record.setCheckType(checkDataMap.getEkType());
+        record.setUnitId(Convert.toStr(unitDevice.get("id")));
+        record.setUnitCode(Convert.toStr(unitDevice.get("unitCode")));
+        record.setUnitType(Convert.toInt(unitDevice.get("type")));
+        record.setUnitTypeName(Convert.toStr(unitDevice.get("typeName")));
+        record.setUnitStartingMileage(Convert.toBigDecimal(unitDevice.get("startMileage")));
+        record.setUnitCenterMileage(Convert.toBigDecimal(unitDevice.get("centerMileage")));
+        record.setUnitEndMileage(Convert.toBigDecimal(unitDevice.get("endMileage")));
+        record.setTqiReportId(tqiReport.getId());
+        record.setStartMileage(tqiReport.getStartMileage());
+        record.setEndMileage(tqiReport.getEndMileage());
+        record.setSectionName(tqiReport.getSectionName());
+        record.setHighLowLeft(tqiReport.getHighLowLeft());
+        record.setHighLowRight(tqiReport.getHighLowRight());
+        record.setTrackLeft(tqiReport.getTrackLeft());
+        record.setTrackRight(tqiReport.getTrackRight());
+        record.setLevel(tqiReport.getLevel());
+        record.setTrackGauge(tqiReport.getTrackGauge());
+        record.setTriangularPit(tqiReport.getTriangularPit());
+        record.setTqiComeUpon(tqiReport.getTqiComeUpon());
+        record.setTqiAboveStandard(tqiReport.getTqiAboveStandard());
+        record.setDeduct(tqiReport.getDeduct());
+        record.setStandard(tqiReport.getStandard());
+        record.setSpend(tqiReport.getSpend());
+        return record;
+    }
+
+    private AnalysisOverReportCheckUnitDeviceMap analysisOverReportCheckUnitDeviceMapSave(Map<String, Object> unitDevice, AnalysisBatchCheckDataMap checkDataMap, MovementOverReport movementOverReport) {
+        AnalysisOverReportCheckUnitDeviceMap record = new AnalysisOverReportCheckUnitDeviceMap();
+        record.setId(UUIDGenerator.generate());
+        record.setUnitId(Convert.toStr(unitDevice.get("id")));
+        record.setUnitCode(Convert.toStr(unitDevice.get("unitCode")));
+        record.setUnitType(Convert.toInt(unitDevice.get("type")));
+        record.setUnitTypeName(Convert.toStr(unitDevice.get("typeName")));
+        record.setUnitStartingMileage(Convert.toBigDecimal(unitDevice.get("startMileage")));
+        record.setUnitCenterMileage(Convert.toBigDecimal(unitDevice.get("centerMileage")));
+        record.setUnitEndMileage(Convert.toBigDecimal(unitDevice.get("endMileage")));
+        record.setCheckId(checkDataMap.getEkId());
+        record.setCheckType(checkDataMap.getEkType());
+        record.setOverReportId(movementOverReport.getId());
+        record.setOverReportMileage(movementOverReport.getMileage());
+        record.setOverLevel(Convert.toInt(movementOverReport.getOverrunLevel()));
+        record.setOverType(movementOverReport.getOverrunType());
+        record.setLongitude(movementOverReport.getLongitude());
+        record.setPeakValue(movementOverReport.getPeakValue());
+        record.setDataDifference(movementOverReport.getDataDifference());
+        record.setXianxing(movementOverReport.getXianxing());
+        record.setStandard(movementOverReport.getStandard());
+        record.setSpend(movementOverReport.getSpend());
+        return record;
     }
 
     /**
@@ -1276,31 +1463,41 @@ public class AnalysisAlgorithm {
                         if (currentStartMileage.compareTo(centerMileage) <= 0 && currentEndEndMileage.compareTo(centerMileage) > 0) {
                             // 轨检仪检查数据
                             List<RailInspectionEquipmentItemDetail> railDeviceCheckList = trackCodeMap.get(trackCode);
-                            unitDevice.put("railDeviceCheck", railDeviceCheckList);
-                            AnalysisBatchUnitDeviceTransfinite transfinite = null;
+                            List<AnalysisBatchUnitDeviceTransfinite> transfiniteList = new ArrayList<>();
+                            List<AnalysisRailDeviceCheckDataUnitDeviceMap> railDeviceCheckDataUnitDeviceMapList = new ArrayList<>();
 
                             // 循环处理测点数据
                             for (RailInspectionEquipmentItemDetail movementCourseInfo : railDeviceCheckList) {
+                                // 计算超限:如果为null则计算,否则和单元绑定
+                                movementCourseInfo.setCurrentStartMileage(currentStartMileage);
+                                movementCourseInfo.setCurrentEndEndMileage(currentEndEndMileage);
+
                                 // 保存检查数据-单元关联关系
-                                MovementCheckDataUnitDeviceMap map = this.railDeviceCheckDeviceMapSave(movementCourseInfo, unitDevice, checkItem);
-                                map.setCheckDetailStartingMileage(currentStartMileage);
-                                map.setCheckDetailEndMileage(currentEndEndMileage);
-                                movementCheckDataUnitDeviceMaps.add(map);
+//                                MovementCheckDataUnitDeviceMap map = this.railDeviceCheckDeviceMapSave(movementCourseInfo, unitDevice, checkItem);
+//                                map.setCheckDetailStartingMileage(currentStartMileage);
+//                                map.setCheckDetailEndMileage(currentEndEndMileage);
+//                                movementCheckDataUnitDeviceMaps.add(map);
 
+                                // 静态检查数据和分析批次关联
+                                AnalysisRailDeviceCheckDataUnitDeviceMap railDeviceCheckDataUnitDeviceMap = this.railDeviceCheckDataUnitDeviceMapSave(movementCourseInfo, unitDevice, checkItem);
+                                railDeviceCheckDataUnitDeviceMapList.add(railDeviceCheckDataUnitDeviceMap);
 
-                                // 计算超限:如果为null则计算,否则和单元绑定
-                                if (null == transfinite) {
-                                    movementCourseInfo.setCurrentStartMileage(currentStartMileage);
-                                    movementCourseInfo.setCurrentEndEndMileage(currentEndEndMileage);
-                                    transfinite = this.railDeviceCheckTransfinite(analysisBatch, movementCourseInfo);
-                                    if (transfinite != null) {
-                                        unitDevice.put("railDeviceTransfinite", transfinite);
-                                    }
+
+                                AnalysisBatchUnitDeviceTransfinite transfinite = this.railDeviceCheckTransfinite(analysisBatch, movementCourseInfo);
+                                if (transfinite != null) {
+                                    transfiniteList.add(transfinite);
                                 }
                             }
 
                             // 计算得分
                             this.railDeviceCheckScore(analysisBatch, railDeviceCheckList, unitDevice);
+
+                            // 超限数据
+                            unitDevice.put("railDeviceTransfinite", transfiniteList);
+                            // 检查list
+                            unitDevice.put("railDeviceCheck", railDeviceCheckList);
+                            // 检查list
+                            unitDevice.put("railDeviceCheckDataUnitDeviceMapList", railDeviceCheckDataUnitDeviceMapList);
                         }
                         currentStartMileage = currentEndEndMileage;
                         currentEndEndMileage = currentEndEndMileage.add(averageDec);
@@ -1311,9 +1508,36 @@ public class AnalysisAlgorithm {
             }
         }
 
+//
+//        movementCheckDataUnitDeviceMapService.lambdaUpdate().eq(MovementCheckDataUnitDeviceMap::getCheckId, checkDataMap.getEkId()).remove();
+//        movementCheckDataUnitDeviceMapService.saveBatch(movementCheckDataUnitDeviceMaps);
+    }
 
-        movementCheckDataUnitDeviceMapService.lambdaUpdate().eq(MovementCheckDataUnitDeviceMap::getCheckId, checkDataMap.getEkId()).remove();
-        movementCheckDataUnitDeviceMapService.saveBatch(movementCheckDataUnitDeviceMaps);
+    private AnalysisRailDeviceCheckDataUnitDeviceMap railDeviceCheckDataUnitDeviceMapSave(RailInspectionEquipmentItemDetail movementCourseInfo, Map<String, Object> unitDevice, RailInspectionEquipmentItem checkItem) {
+        AnalysisRailDeviceCheckDataUnitDeviceMap record = new AnalysisRailDeviceCheckDataUnitDeviceMap();
+        record.setId(UUIDGenerator.generate());
+        record.setUnitId(Convert.toStr(unitDevice.get("id")));
+        record.setUnitCode(Convert.toStr(unitDevice.get("unitCode")));
+        record.setUnitType(Convert.toInt(unitDevice.get("type")));
+        record.setUnitTypeName(Convert.toStr(unitDevice.get("typeName")));
+        record.setUnitStartingMileage(Convert.toBigDecimal(unitDevice.get("startMileage")));
+        record.setUnitCenterMileage(Convert.toBigDecimal(unitDevice.get("centerMileage")));
+        record.setUnitEndMileage(Convert.toBigDecimal(unitDevice.get("endMileage")));
+        record.setCheckId(checkItem.getRailInspectionEquipmentId());
+        record.setCheckItemId(checkItem.getRailInspectionEquipmentId());
+        record.setCheckItemStartingMileage(checkItem.getCourseStartingMileage());
+        record.setCheckItemEndMileage(checkItem.getCourseEndMileage());
+        record.setCheckItemText(movementCourseInfo.getCheckItem());
+        record.setCheckDetailId(movementCourseInfo.getId());
+        record.setCheckDetailStartingMileage(movementCourseInfo.getCurrentStartMileage());
+        record.setCheckDetailEndMileage(movementCourseInfo.getCurrentEndEndMileage());
+        record.setTrackGauge(movementCourseInfo.getTrackGauge());
+        record.setLevel(movementCourseInfo.getLevel());
+        record.setTriangularPit(movementCourseInfo.getTriangularPit());
+        record.setMeasurePoint(movementCourseInfo.getMeasurePoint());
+        record.setCheckDetailStartingMileage(movementCourseInfo.getCurrentStartMileage());
+        record.setCheckDetailEndMileage(movementCourseInfo.getCurrentEndEndMileage());
+        return record;
     }
 
     /**
@@ -1651,7 +1875,7 @@ public class AnalysisAlgorithm {
         Map<String, List<MovementCourseInfo>> checkItemItemDetailMap = checkItemItemDetailList.stream().collect(Collectors.groupingBy(MovementCourseInfo::getMovementCourseId));
 
 
-        // 2.循环遍历单元设备中心里程落在检查项目【开始-结束】这个区间视为这个区间的单元设备
+        // 2.循环遍历单元设备中心里程落在检查项目【开始-结束】这个区间视为这个区间的单元设备数
         for (Map<String, Object> unitDevice : unitDeviceList) {
             BigDecimal centerMileage = Convert.toBigDecimal(unitDevice.get("centerMileage"));
 
@@ -1680,32 +1904,39 @@ public class AnalysisAlgorithm {
                     for (String trackCode : trackCodes) {
                         if (currentStartMileage.compareTo(centerMileage) <= 0 && currentEndEndMileage.compareTo(centerMileage) > 0) {
                             List<MovementCourseInfo> labourCheckList = trackCodeMap.get(trackCode);
-                            unitDevice.put("labourCheck", labourCheckList);
-                            AnalysisBatchUnitDeviceTransfinite transfinite = null;
+                            List<AnalysisBatchUnitDeviceTransfinite> transfiniteList = new ArrayList<>();
+                            List<AnalysisLabourCheckDataUnitDeviceMap> labourCheckDataUnitDeviceMapList = new ArrayList<>();
 
                             // 循环处理测点数据
                             for (MovementCourseInfo movementCourseInfo : labourCheckList) {
                                 // 保存数据
                                 movementCourseInfo.setCurrentStartMileage(currentStartMileage);
                                 movementCourseInfo.setCurrentEndEndMileage(currentEndEndMileage);
-                                MovementCheckDataUnitDeviceMap map = this.labourCheckDeviceMapSave(movementCourseInfo, unitDevice, checkItem);
-                                map.setCheckDetailStartingMileage(currentStartMileage);
-                                map.setCheckDetailEndMileage(currentEndEndMileage);
-                                movementCheckDataUnitDeviceMaps.add(map);
 
-                                // 计算超限:如果为null则计算,否则和单元绑定
-                                if (null == transfinite) {
-                                    transfinite = this.labourCheckTransfinite(analysisBatch, movementCourseInfo);
+//                                MovementCheckDataUnitDeviceMap map = this.labourCheckDeviceMapSave(movementCourseInfo, unitDevice, checkItem);
+//                                map.setCheckDetailStartingMileage(currentStartMileage);
+//                                map.setCheckDetailEndMileage(currentEndEndMileage);
+//                                movementCheckDataUnitDeviceMaps.add(map);
+
+                                AnalysisLabourCheckDataUnitDeviceMap labourCheckDataUnitDeviceMap = this.labourCheckDataUnitDeviceMapSave(movementCourseInfo, unitDevice, checkItem);
+                                labourCheckDataUnitDeviceMapList.add(labourCheckDataUnitDeviceMap);
 
-                                    // 如果超限不为空则添加进去
-                                    if (null != transfinite) {
-                                        unitDevice.put("labourCheckTransfinite", transfinite);
-                                    }
+
+                                // 计算超限:如果为null则计算,否则和单元绑定
+                                AnalysisBatchUnitDeviceTransfinite transfinite = this.labourCheckTransfinite(analysisBatch, movementCourseInfo);
+                                // 如果超限不为空则添加进去
+                                if (null != transfinite) {
+                                    transfiniteList.add(transfinite);
                                 }
                             }
-
                             // 计算得分
                             this.labourCheckScore(analysisBatch, labourCheckList, unitDevice);
+                            // 添加超限
+                            unitDevice.put("labourCheckTransfinite", transfiniteList);
+                            // 添加人工检查分数
+                            unitDevice.put("labourCheck", labourCheckList);
+                            // 添加人工检查数据分析批次映射
+                            unitDevice.put("labourCheckDataUnitDeviceMapList", labourCheckDataUnitDeviceMapList);
                         }
                         currentStartMileage = currentEndEndMileage;
                         currentEndEndMileage = currentEndEndMileage.add(averageDec);
@@ -1716,11 +1947,41 @@ public class AnalysisAlgorithm {
             }
         }
 
+//        if (ObjectUtil.isNotEmpty(movementCheckDataUnitDeviceMaps)) {
+//            movementCheckDataUnitDeviceMapService.lambdaUpdate().eq(MovementCheckDataUnitDeviceMap::getCheckId, checkDataMap.getEkId()).remove();
+//            movementCheckDataUnitDeviceMapService.saveBatch(movementCheckDataUnitDeviceMaps);
+//        }
+    }
 
-        if (ObjectUtil.isNotEmpty(movementCheckDataUnitDeviceMaps)) {
-            movementCheckDataUnitDeviceMapService.lambdaUpdate().eq(MovementCheckDataUnitDeviceMap::getCheckId, checkDataMap.getEkId()).remove();
-            movementCheckDataUnitDeviceMapService.saveBatch(movementCheckDataUnitDeviceMaps);
-        }
+    private AnalysisLabourCheckDataUnitDeviceMap labourCheckDataUnitDeviceMapSave(MovementCourseInfo movementCourseInfo, Map<String, Object> unitDevice, MovementCourse checkItem) {
+        AnalysisLabourCheckDataUnitDeviceMap record = new AnalysisLabourCheckDataUnitDeviceMap();
+        record.setId(UUIDGenerator.generate());
+        record.setUnitId(Convert.toStr(unitDevice.get("id")));
+        record.setUnitCode(Convert.toStr(unitDevice.get("unitCode")));
+        record.setUnitType(Convert.toInt(unitDevice.get("type")));
+        record.setUnitTypeName(Convert.toStr(unitDevice.get("typeName")));
+        record.setUnitStartingMileage(Convert.toBigDecimal(unitDevice.get("startMileage")));
+        record.setUnitCenterMileage(Convert.toBigDecimal(unitDevice.get("centerMileage")));
+        record.setUnitEndMileage(Convert.toBigDecimal(unitDevice.get("endMileage")));
+        record.setCheckId(checkItem.getMovementMasterId());
+        record.setCheckItemId(checkItem.getId());
+        record.setCheckItemStartingMileage(checkItem.getCourseStartingMileage());
+        record.setCheckItemEndMileage(checkItem.getCourseEndMileage());
+        record.setCheckItemText(movementCourseInfo.getTrackCode());
+        record.setCheckDetailId(movementCourseInfo.getId());
+        record.setCheckDetailStartingMileage(movementCourseInfo.getCurrentStartMileage());
+        record.setCheckDetailEndMileage(movementCourseInfo.getCurrentEndEndMileage());
+        record.setTrackGauge(movementCourseInfo.getTrackGauge());
+        record.setLevel(movementCourseInfo.getLevel());
+        record.setTriangularPit(movementCourseInfo.getTriangularPit());
+        record.setMeasurePoint(movementCourseInfo.getMeasurePoint());
+        record.setDirection(movementCourseInfo.getDirection());
+        record.setHeight(movementCourseInfo.getHeight());
+        record.setStructure(movementCourseInfo.getStructure());
+        record.setRectification(movementCourseInfo.getRectification());
+        record.setCheckDetailEndMileage(movementCourseInfo.getCurrentEndEndMileage());
+        record.setCheckDetailEndMileage(movementCourseInfo.getCurrentEndEndMileage());
+        return record;
     }
 
     /**
@@ -2184,4 +2445,4 @@ public class AnalysisAlgorithm {
     }
 
 
-}
\ No newline at end of file
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisAdditiveCheckUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_additive_check_unit_device_map")
+@ApiModel(value = "AnalysisAdditiveCheckUnitDeviceMap对象", description = "动静态几何尺寸对应的添乘仪详情表")
+public class AnalysisAdditiveCheckUnitDeviceMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次code")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_master_id")
+    private String movementMasterId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_device_code")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备单元起始里程")
+    @TableField("unit_start_mileage")
+    private BigDecimal unitStartMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("测点里程")
+    @TableField("point_mileage")
+    private BigDecimal pointMileage;
+
+    @ApiModelProperty("水平加速度")
+    @TableField("zontal_speed")
+    private BigDecimal zontalSpeed;
+
+    @ApiModelProperty("水平加速度等级")
+    @TableField("zontal_speed_level")
+    private Integer zontalSpeedLevel;
+
+    @ApiModelProperty("垂直加速度")
+    @TableField("vertical_speed")
+    private BigDecimal verticalSpeed;
+
+    @ApiModelProperty("垂直加速度等级")
+    @TableField("vertical_speed_level")
+    private Integer verticalSpeedLevel;
+
+    @ApiModelProperty("速度")
+    @TableField("speed")
+    private BigDecimal speed;
+
+    @ApiModelProperty("手动标记")
+    @TableField("mark")
+    private String mark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+    @ApiModelProperty("排序字段")
+    @TableField("info_sort")
+    private Integer infoSort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisLabourCheckDataUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态分析-人工检查数据分析批次映射
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_labour_check_data_unit_device_map")
+@ApiModel(value = "AnalysisLabourCheckDataUnitDeviceMap对象", description = "动静态分析-人工检查数据分析批次映射")
+public class AnalysisLabourCheckDataUnitDeviceMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次code")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备单元起始里程")
+    @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查项目id")
+    @TableField("check_item_id")
+    private String checkItemId;
+
+    @ApiModelProperty("检查项目开始里程")
+    @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+    @ApiModelProperty("检查项目结束里程")
+    @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+    @ApiModelProperty("检查项目文本")
+    @TableField("check_item_text")
+    private String checkItemText;
+
+    @ApiModelProperty("检查详情id")
+    @TableField("check_detail_id")
+    private String checkDetailId;
+
+    @ApiModelProperty("检查详情开始里程")
+    @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+    @ApiModelProperty("检查详情结束里程")
+    @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+    @ApiModelProperty("测点")
+    @TableField("measure_point")
+    private Integer measurePoint;
+
+    @ApiModelProperty("轨距")
+    @TableField("track_gauge")
+    private String trackGauge;
+
+    @ApiModelProperty("水平")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("三角坑")
+    @TableField("triangular_pit")
+    private String triangularPit;
+
+    @ApiModelProperty("方向")
+    @TableField("direction")
+    private String direction;
+
+    @ApiModelProperty("高低")
+    @TableField("height")
+    private String height;
+
+    @ApiModelProperty("结构")
+    @TableField("structure")
+    private String structure;
+
+    @ApiModelProperty("整改")
+    @TableField("rectification")
+    private String rectification;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisOverReportCheckUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 分析批次-动静态几何尺寸-轨检车单元设备映射
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_over_report_check_unit_device_map")
+@ApiModel(value = "AnalysisOverReportCheckUnitDeviceMap对象", description = "分析批次-动静态几何尺寸-轨检车单元设备映射")
+public class AnalysisOverReportCheckUnitDeviceMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备单元起始里程")
+    @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    @TableField("check_type")
+    private Integer checkType;
+
+    @ApiModelProperty("轨检车超限表id")
+    @TableField("over_report_id")
+    private String overReportId;
+
+    @ApiModelProperty("超限里程")
+    @TableField("over_report_mileage")
+    private BigDecimal overReportMileage;
+
+    @ApiModelProperty("超限类型")
+    @TableField("over_type")
+    private String overType;
+
+    @ApiModelProperty("超限等级")
+    @TableField("over_level")
+    private Integer overLevel;
+
+    @ApiModelProperty("长度")
+    @TableField("longitude")
+    private String longitude;
+
+    @ApiModelProperty("峰值（mm或g）")
+    @TableField("peak_value")
+    private String peakValue;
+
+    @ApiModelProperty("管理数据差")
+    @TableField("data_difference")
+    private String dataDifference;
+
+    @ApiModelProperty("线性")
+    @TableField("xianxing")
+    private String xianxing;
+
+    @ApiModelProperty("检查标准")
+    @TableField("standard")
+    private String standard;
+
+    @ApiModelProperty("速度（km/h）")
+    @TableField("spend")
+    private String spend;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisRailDeviceCheckDataUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态分析-轨检仪静态检查数据分析批次映射
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_rail_device_check_data_unit_device_map")
+@ApiModel(value = "AnalysisRailDeviceCheckDataUnitDeviceMap对象", description = "动静态分析-轨检仪静态检查数据分析批次映射")
+public class AnalysisRailDeviceCheckDataUnitDeviceMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次code")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备单元起始里程")
+    @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查项目id")
+    @TableField("check_item_id")
+    private String checkItemId;
+
+    @ApiModelProperty("检查项目开始里程")
+    @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+    @ApiModelProperty("检查项目结束里程")
+    @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+    @ApiModelProperty("检查项目文本")
+    @TableField("check_item_text")
+    private String checkItemText;
+
+    @ApiModelProperty("检查详情id")
+    @TableField("check_detail_id")
+    private String checkDetailId;
+
+    @ApiModelProperty("检查详情开始里程")
+    @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+    @ApiModelProperty("检查详情结束里程")
+    @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+    @ApiModelProperty("测点")
+    @TableField("measure_point")
+    private Integer measurePoint;
+
+    @ApiModelProperty("轨距")
+    @TableField("track_gauge")
+    private String trackGauge;
+
+    @ApiModelProperty("水平")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("三角坑")
+    @TableField("triangular_pit")
+    private String triangularPit;
+
+    @ApiModelProperty("方向")
+    @TableField("direction")
+    private String direction;
+
+    @ApiModelProperty("高低")
+    @TableField("height")
+    private String height;
+
+    @ApiModelProperty("结构")
+    @TableField("structure")
+    private String structure;
+
+    @ApiModelProperty("整改")
+    @TableField("rectification")
+    private String rectification;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisTqiReportCheckUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_tqi_report_check_unit_device_map")
+@ApiModel(value = "AnalysisTqiReportCheckUnitDeviceMap对象", description = "动静态分析-轨检车-tqi单元总结报告和单元映射关联关系")
+public class AnalysisTqiReportCheckUnitDeviceMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    @TableField("check_type")
+    private Integer checkType;
+
+    @ApiModelProperty("单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("单元code")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备单元开始里程")
+    @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元结束里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("tqi报告id")
+    @TableField("tqi_report_id")
+    private String tqiReportId;
+
+    @ApiModelProperty("开始里程(m)")
+    @TableField("start_mileage")
+    private BigDecimal startMileage;
+
+    @ApiModelProperty("终点里程(m)")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("区间名称")
+    @TableField("section_name")
+    private String sectionName;
+
+    @ApiModelProperty("高低左")
+    @TableField("high_low_left")
+    private String highLowLeft;
+
+    @ApiModelProperty("高低右")
+    @TableField("high_low_right")
+    private String highLowRight;
+
+    @ApiModelProperty("轨向左")
+    @TableField("track_left")
+    private String trackLeft;
+
+    @ApiModelProperty("轨向右")
+    @TableField("track_right")
+    private String trackRight;
+
+    @ApiModelProperty("水平（mm）")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("轨距（mm）")
+    @TableField("track_gauge")
+    private String trackGauge;
+
+    @ApiModelProperty("三角坑（mm）")
+    @TableField("triangular_pit")
+    private String triangularPit;
+
+    @ApiModelProperty("TQI数值")
+    @TableField("tqi_come_upon")
+    private String tqiComeUpon;
+
+    @ApiModelProperty("TQI超标")
+    @TableField("tqi_above_standard")
+    private String tqiAboveStandard;
+
+    @ApiModelProperty("扣分")
+    @TableField("deduct")
+    private String deduct;
+
+    @ApiModelProperty("检测标准")
+    @TableField("standard")
+    private String standard;
+
+    @ApiModelProperty("速度（km/h）")
+    @TableField("spend")
+    private String spend;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/face/impl/AnalysisBatchUnitDeviceFaceImpl.java

@@ -20,17 +20,21 @@ public class AnalysisBatchUnitDeviceFaceImpl implements AnalysisBatchUnitDeviceF
     public CaseReportCheckDataDetailVO checkData(String id) {
         CaseReportCheckDataDetailVO vo = new CaseReportCheckDataDetailVO();
         // 静态数据
-        List<StaticCheckVO> staticCheckVOS = analysisBatchUnitDeviceService.getUnitDeviceStaticData(id);
-        List<StaticCheckVO> labourCheckVOList = new ArrayList<>();
-        List<StaticCheckVO> railDeviceCheckVOList = new ArrayList<>();
-        for (StaticCheckVO staticCheckVO : staticCheckVOS) {
-            if (staticCheckVO.getCheckType() == 1) {
-                labourCheckVOList.add(staticCheckVO);
-            } else {
-                railDeviceCheckVOList.add(staticCheckVO);
-            }
-        }
+//        List<StaticCheckVO> staticCheckVOS = analysisBatchUnitDeviceService.getUnitDeviceStaticData(id);
+//        for (StaticCheckVO staticCheckVO : staticCheckVOS) {
+//            if (staticCheckVO.getCheckType() == 1) {
+//                labourCheckVOList.add(staticCheckVO);
+//            } else {
+//                railDeviceCheckVOList.add(staticCheckVO);
+//            }
+//        }
+
+        // 人工检查
+        List<StaticCheckVO> labourCheckVOList = analysisBatchUnitDeviceService.getLabourCheck(id);
         vo.setLabourCheckVOList(labourCheckVOList);
+
+        // 轨检仪
+        List<StaticCheckVO> railDeviceCheckVOList = analysisBatchUnitDeviceService.getRailDeviceCheck(id);
         vo.setRailDeviceCheckVOList(railDeviceCheckVOList);
 
 

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisAdditiveCheckUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisAdditiveCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisAdditiveCheckUnitDeviceMapMapper extends BaseMapper<AnalysisAdditiveCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisBatchUnitDeviceMapper.java

@@ -35,4 +35,8 @@ public interface AnalysisBatchUnitDeviceMapper extends BaseMapper<AnalysisBatchU
     List<RailVehicleTqiVO> getUnitDeviceTqi(String id);
 
     List<RailAddInstrumentCheckVO> getUnitDeviceAdditiveInfo(String id);
+
+    List<StaticCheckVO> getLabourCheck(String id);
+
+    List<StaticCheckVO> getRailDeviceCheck(String id);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisLabourCheckDataUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisLabourCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-人工检查数据分析批次映射 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisLabourCheckDataUnitDeviceMapMapper extends BaseMapper<AnalysisLabourCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisOverReportCheckUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisOverReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 分析批次-动静态几何尺寸-轨检车单元设备映射 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisOverReportCheckUnitDeviceMapMapper extends BaseMapper<AnalysisOverReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisRailDeviceCheckDataUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisRailDeviceCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-轨检仪静态检查数据分析批次映射 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisRailDeviceCheckDataUnitDeviceMapMapper extends BaseMapper<AnalysisRailDeviceCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisTqiReportCheckUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisTqiReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisTqiReportCheckUnitDeviceMapMapper extends BaseMapper<AnalysisTqiReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisAdditiveCheckUnitDeviceMapMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisAdditiveCheckUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisBatchUnitDeviceMapper.xml

@@ -49,6 +49,7 @@
         </if>
         <if test="dto.isTransfinite != null">
             AND analysis.is_transfinite = #{dto.isTransfinite}
+            AND analysis.is_work = 1
         </if>
         <if test="dto.unitStartingMileage != null">
             AND analysis.unit_starting_mileage >= #{dto.unitStartingMileage }
@@ -110,7 +111,7 @@
         ORDER BY
             t3.ek_code ASC
     </select>
-    <select id="getUnitDeviceOverReport" resultType="org.jeecg.modules.unitDevice.vo.RailVehicleCheckVO">
+ <!--   <select id="getUnitDeviceOverReport" resultType="org.jeecg.modules.unitDevice.vo.RailVehicleCheckVO">
         SELECT t2.id,
                t2.unit_id,
                t2.unit_code,
@@ -140,79 +141,81 @@
           AND t1.ek_type = 3
         GROUP BY t2.id
         ORDER BY t3.ek_code ASC
-    </select>
-    <select id="getUnitDeviceTqi" resultType="org.jeecg.modules.unitDevice.vo.RailVehicleTqiVO">
-        SELECT t2.id,
-               t2.create_by,
-               t2.create_time,
-               t2.update_by,
-               t2.update_time,
-               t2.check_id,
-               t2.check_type,
-               t2.unit_id,
-               t2.unit_code,
-               t2.unit_type,
-               t2.unit_type_name,
-               t2.unit_starting_mileage,
-               t2.unit_center_mileage,
-               t2.unit_end_mileage,
-               t2.tqi_report_id,
-               t2.start_mileage,
-               t2.end_mileage,
-               t2.section_name,
-               t2.high_low_left,
-               t2.high_low_right,
-               t2.track_left,
-               t2.track_right,
-               t2.level,
-               t2.track_gauge,
-               t2.triangular_pit,
-               t2.tqi_come_upon,
-               t2.tqi_above_standard,
-               t2.deduct,
-               t2.standard,
-               t2.spend
-        FROM t_dsa_analysis_batch_unit_device_transfinite t1
-        LEFT JOIN t_djt_movement_tqi_report_unit_device_map t2 ON t1.unit_id = t2.unit_id AND t1.unit_type = t2.unit_type AND t1.ek_id = t2.check_id
-        LEFT JOIN t_djt_movement_records_master t3 ON t2.check_id = t3.id
-        WHERE t1.analysis_batch_unit_device_id = #{id}
-          AND t1.ek_type = 3
-        GROUP BY t2.id
-        ORDER BY t3.ek_code ASC
-    </select>
-    <select id="getUnitDeviceAdditiveInfo"
-            resultType="org.jeecg.modules.unitDevice.vo.RailAddInstrumentCheckVO">
-        SELECT t2.id,
-               t2.movement_master_id checkId,
-               t3.ek_code            checkCode,
-               t2.unit_id,
-               t2.unit_code,
-               t2.unit_device_code,
-               t2.unit_type,
-               t2.unit_type_name,
-               t2.unit_start_mileage,
-               t2.unit_center_mileage,
-               t2.unit_end_mileage,
-               t2.point_mileage,
-               t2.zontal_speed,
-               t2.zontal_speed_level,
-               t2.vertical_speed,
-               t2.vertical_speed_level,
-               t2.speed,
-               t2.mark,
-               t2.del_flag,
-               t2.info_sort
-        FROM t_dsa_analysis_batch_unit_device_transfinite t1
-                 LEFT JOIN t_djt_movement_additive_info_unit_device_map t2 ON t1.unit_id = t2.unit_id
-            AND t1.unit_type = t2.unit_type
-            AND t1.ek_id = t2.movement_master_id
-                 LEFT JOIN t_djt_movement_records_master t3 ON t2.movement_master_id = t3.id
-        WHERE t1.analysis_batch_unit_device_id = #{id}
-          AND t1.ek_type = 4
-        GROUP BY t2.id
-        ORDER BY t3.ek_code ASC
+    </select>-->
 
-    </select>
+
+<!--    <select id="getUnitDeviceTqi" resultType="org.jeecg.modules.unitDevice.vo.RailVehicleTqiVO">-->
+<!--        SELECT t2.id,-->
+<!--               t2.create_by,-->
+<!--               t2.create_time,-->
+<!--               t2.update_by,-->
+<!--               t2.update_time,-->
+<!--               t2.check_id,-->
+<!--               t2.check_type,-->
+<!--               t2.unit_id,-->
+<!--               t2.unit_code,-->
+<!--               t2.unit_type,-->
+<!--               t2.unit_type_name,-->
+<!--               t2.unit_starting_mileage,-->
+<!--               t2.unit_center_mileage,-->
+<!--               t2.unit_end_mileage,-->
+<!--               t2.tqi_report_id,-->
+<!--               t2.start_mileage,-->
+<!--               t2.end_mileage,-->
+<!--               t2.section_name,-->
+<!--               t2.high_low_left,-->
+<!--               t2.high_low_right,-->
+<!--               t2.track_left,-->
+<!--               t2.track_right,-->
+<!--               t2.level,-->
+<!--               t2.track_gauge,-->
+<!--               t2.triangular_pit,-->
+<!--               t2.tqi_come_upon,-->
+<!--               t2.tqi_above_standard,-->
+<!--               t2.deduct,-->
+<!--               t2.standard,-->
+<!--               t2.spend-->
+<!--        FROM t_dsa_analysis_batch_unit_device_transfinite t1-->
+<!--        LEFT JOIN t_djt_movement_tqi_report_unit_device_map t2 ON t1.unit_id = t2.unit_id AND t1.unit_type = t2.unit_type AND t1.ek_id = t2.check_id-->
+<!--        LEFT JOIN t_djt_movement_records_master t3 ON t2.check_id = t3.id-->
+<!--        WHERE t1.analysis_batch_unit_device_id = #{id}-->
+<!--          AND t1.ek_type = 3-->
+<!--        GROUP BY t2.id-->
+<!--        ORDER BY t3.ek_code ASC-->
+<!--    </select>-->
+<!--    <select id="getUnitDeviceAdditiveInfo"-->
+<!--            resultType="org.jeecg.modules.unitDevice.vo.RailAddInstrumentCheckVO">-->
+<!--        SELECT t2.id,-->
+<!--               t2.movement_master_id checkId,-->
+<!--               t3.ek_code            checkCode,-->
+<!--               t2.unit_id,-->
+<!--               t2.unit_code,-->
+<!--               t2.unit_device_code,-->
+<!--               t2.unit_type,-->
+<!--               t2.unit_type_name,-->
+<!--               t2.unit_start_mileage,-->
+<!--               t2.unit_center_mileage,-->
+<!--               t2.unit_end_mileage,-->
+<!--               t2.point_mileage,-->
+<!--               t2.zontal_speed,-->
+<!--               t2.zontal_speed_level,-->
+<!--               t2.vertical_speed,-->
+<!--               t2.vertical_speed_level,-->
+<!--               t2.speed,-->
+<!--               t2.mark,-->
+<!--               t2.del_flag,-->
+<!--               t2.info_sort-->
+<!--        FROM t_dsa_analysis_batch_unit_device_transfinite t1-->
+<!--                 LEFT JOIN t_djt_movement_additive_info_unit_device_map t2 ON t1.unit_id = t2.unit_id-->
+<!--            AND t1.unit_type = t2.unit_type-->
+<!--            AND t1.ek_id = t2.movement_master_id-->
+<!--                 LEFT JOIN t_djt_movement_records_master t3 ON t2.movement_master_id = t3.id-->
+<!--        WHERE t1.analysis_batch_unit_device_id = #{id}-->
+<!--          AND t1.ek_type = 4-->
+<!--        GROUP BY t2.id-->
+<!--        ORDER BY t3.ek_code ASC-->
+
+<!--    </select>-->
     <select id="listRecord" resultType="org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceVO">
         SELECT * FROM
         (
@@ -281,4 +284,185 @@
         </if>
         order by unit_starting_mileage
     </select>
+    <select id="getLabourCheck" resultType="org.jeecg.modules.unitDevice.vo.StaticCheckVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.analysis_batch_id,
+            t1.analysis_batch_code,
+            t1.analysis_batch_unit_device_id,
+            t1.unit_id,
+            t1.unit_code,
+            t1.unit_type,
+            t1.unit_type_name,
+            t1.unit_starting_mileage,
+            t1.unit_center_mileage,
+            t1.unit_end_mileage,
+            t1.check_id checkId,
+            t1.check_item_id,
+            t1.check_item_starting_mileage,
+            t1.check_item_end_mileage,
+            t1.check_item_text,
+            t1.check_detail_id,
+            t1.check_detail_starting_mileage,
+            t1.check_detail_end_mileage,
+            t1.measure_point,
+            t1.track_gauge,
+            t1.`level`,
+            t1.triangular_pit,
+            t1.direction,
+            t1.height,
+            t1.structure,
+            t1.rectification,
+            t1.remark
+        FROM
+            t_dsa_analysis_labour_check_data_unit_device_map t1
+        WHERE t1.analysis_batch_unit_device_id = #{id}
+    </select>
+    <select id="getRailDeviceCheck" resultType="org.jeecg.modules.unitDevice.vo.StaticCheckVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.analysis_batch_id,
+            t1.analysis_batch_code,
+            t1.analysis_batch_unit_device_id,
+            t1.unit_id,
+            t1.unit_code,
+            t1.unit_type,
+            t1.unit_type_name,
+            t1.unit_starting_mileage,
+            t1.unit_center_mileage,
+            t1.unit_end_mileage,
+            t1.check_id checkId,
+            t1.check_item_id,
+            t1.check_item_starting_mileage,
+            t1.check_item_end_mileage,
+            t1.check_item_text,
+            t1.check_detail_id,
+            t1.check_detail_starting_mileage,
+            t1.check_detail_end_mileage,
+            t1.measure_point,
+            t1.track_gauge,
+            t1.`level`,
+            t1.triangular_pit,
+            t1.direction,
+            t1.height,
+            t1.structure,
+            t1.rectification,
+            t1.remark
+        FROM
+            t_dsa_analysis_rail_device_check_data_unit_device_map t1
+        WHERE t1.analysis_batch_unit_device_id = #{id}
+    </select>
+    <select id="getUnitDeviceOverReport" resultType="org.jeecg.modules.unitDevice.vo.RailVehicleCheckVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.analysis_batch_unit_device_id,
+            t1.analysis_batch_code,
+            t1.analysis_batch_id,
+            t1.unit_id,
+            t1.unit_code,
+            t1.unit_type,
+            t1.unit_type_name,
+            t1.unit_starting_mileage,
+            t1.unit_center_mileage,
+            t1.unit_end_mileage,
+            t1.check_id checkId,
+            t1.check_type,
+            t1.over_report_id,
+            t1.over_report_mileage,
+            t1.over_type,
+            t1.over_level,
+            t1.longitude,
+            t1.peak_value,
+            t1.data_difference,
+            t1.xianxing,
+            t1.standard,
+            t1.spend,
+            t1.remark
+        FROM
+            t_dsa_analysis_over_report_check_unit_device_map t1
+        WHERE
+            t1.analysis_batch_unit_device_id = #{id}
+    </select>
+    <select id="getUnitDeviceTqi" resultType="org.jeecg.modules.unitDevice.vo.RailVehicleTqiVO">
+        SELECT
+            t1.id,
+            t1.analysis_batch_unit_device_id,
+            t1.analysis_batch_code,
+            t1.analysis_batch_id,
+            t1.check_id,
+            t1.check_type,
+            t1.unit_id,
+            t1.unit_code,
+            t1.unit_type,
+            t1.unit_type_name,
+            t1.unit_starting_mileage,
+            t1.unit_center_mileage,
+            t1.unit_end_mileage,
+            t1.tqi_report_id,
+            t1.start_mileage,
+            t1.end_mileage,
+            t1.section_name,
+            t1.high_low_left,
+            t1.high_low_right,
+            t1.track_left,
+            t1.track_right,
+            t1.`level`,
+            t1.track_gauge,
+            t1.triangular_pit,
+            t1.tqi_come_upon,
+            t1.tqi_above_standard,
+            t1.deduct,
+            t1.standard,
+            t1.spend
+        FROM
+            t_dsa_analysis_tqi_report_check_unit_device_map t1
+        WHERE
+            t1.analysis_batch_unit_device_id = #{id}
+    </select>
+    <select id="getUnitDeviceAdditiveInfo"
+            resultType="org.jeecg.modules.unitDevice.vo.RailAddInstrumentCheckVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.analysis_batch_id,
+            t1.analysis_batch_code,
+            t1.analysis_batch_unit_device_id,
+            t1.movement_master_id checkId,
+            t1.unit_id,
+            t1.unit_code,
+            t1.unit_device_code,
+            t1.unit_type,
+            t1.unit_type_name,
+            t1.unit_start_mileage,
+            t1.unit_center_mileage,
+            t1.unit_end_mileage,
+            t1.point_mileage,
+            t1.zontal_speed,
+            t1.zontal_speed_level,
+            t1.vertical_speed,
+            t1.vertical_speed_level,
+            t1.speed,
+            t1.mark,
+            t1.del_flag,
+            t1.info_sort
+        FROM
+            t_dsa_analysis_additive_check_unit_device_map t1
+        WHERE
+            t1.analysis_batch_unit_device_id = #{id}
+    </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisLabourCheckDataUnitDeviceMapMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisLabourCheckDataUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisOverReportCheckUnitDeviceMapMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisOverReportCheckUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisRailDeviceCheckDataUnitDeviceMapMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisRailDeviceCheckDataUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisTqiReportCheckUnitDeviceMapMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisTqiReportCheckUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisAdditiveCheckUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态几何尺寸对应的添乘仪详情表
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisAdditiveCheckUnitDeviceMap对象", description = "动静态几何尺寸对应的添乘仪详情表")
+
+public class AnalysisAdditiveCheckUnitDeviceMapDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+    private String id;
+
+            @ApiModelProperty("创建人")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("分析批次code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitDeviceCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("测点里程")
+    private BigDecimal pointMileage;
+
+            @ApiModelProperty("水平加速度")
+    private BigDecimal zontalSpeed;
+
+            @ApiModelProperty("水平加速度等级")
+    private Integer zontalSpeedLevel;
+
+            @ApiModelProperty("垂直加速度")
+    private BigDecimal verticalSpeed;
+
+            @ApiModelProperty("垂直加速度等级")
+    private Integer verticalSpeedLevel;
+
+            @ApiModelProperty("速度")
+    private BigDecimal speed;
+
+            @ApiModelProperty("手动标记")
+    private String mark;
+
+            @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+            @ApiModelProperty("排序字段")
+    private Integer infoSort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisAdditiveCheckUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态几何尺寸对应的添乘仪详情表
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisAdditiveCheckUnitDeviceMap对象", description = "动静态几何尺寸对应的添乘仪详情表")
+
+public class AnalysisAdditiveCheckUnitDeviceMapVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+            @TableId("id")
+    private String id;
+
+            @ApiModelProperty("创建人")
+        @TableField("create_by")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+        @TableField("create_time")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+        @TableField("update_by")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+        @TableField("update_time")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("分析批次code")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+        @TableField("movement_master_id")
+    private String movementMasterId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @TableField("unit_code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元编码")
+        @TableField("unit_device_code")
+    private String unitDeviceCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+        @TableField("unit_type")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+        @TableField("unit_type_name")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+        @TableField("unit_start_mileage")
+    private BigDecimal unitStartMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("测点里程")
+        @TableField("point_mileage")
+    private BigDecimal pointMileage;
+
+            @ApiModelProperty("水平加速度")
+        @TableField("zontal_speed")
+    private BigDecimal zontalSpeed;
+
+            @ApiModelProperty("水平加速度等级")
+        @TableField("zontal_speed_level")
+    private Integer zontalSpeedLevel;
+
+            @ApiModelProperty("垂直加速度")
+        @TableField("vertical_speed")
+    private BigDecimal verticalSpeed;
+
+            @ApiModelProperty("垂直加速度等级")
+        @TableField("vertical_speed_level")
+    private Integer verticalSpeedLevel;
+
+            @ApiModelProperty("速度")
+        @TableField("speed")
+    private BigDecimal speed;
+
+            @ApiModelProperty("手动标记")
+        @TableField("mark")
+    private String mark;
+
+            @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+        @TableField("del_flag")
+    private String delFlag;
+
+            @ApiModelProperty("排序字段")
+        @TableField("info_sort")
+    private Integer infoSort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisLabourCheckDataUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-人工检查数据分析批次映射
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisLabourCheckDataUnitDeviceMap对象", description = "动静态分析-人工检查数据分析批次映射")
+
+public class AnalysisLabourCheckDataUnitDeviceMapDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+    private String id;
+
+            @ApiModelProperty("创建人")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("分析批次code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+    private String direction;
+
+            @ApiModelProperty("高低")
+    private String height;
+
+            @ApiModelProperty("结构")
+    private String structure;
+
+            @ApiModelProperty("整改")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisLabourCheckDataUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-人工检查数据分析批次映射
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisLabourCheckDataUnitDeviceMap对象", description = "动静态分析-人工检查数据分析批次映射")
+
+public class AnalysisLabourCheckDataUnitDeviceMapVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+            @TableId("id")
+    private String id;
+
+            @ApiModelProperty("创建人")
+        @TableField("create_by")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+        @TableField("create_time")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+        @TableField("update_by")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+        @TableField("update_time")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("分析批次code")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @TableField("unit_code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+        @TableField("unit_type")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+        @TableField("unit_type_name")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+        @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+        @TableField("check_item_id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+        @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+        @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+        @TableField("check_item_text")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+        @TableField("check_detail_id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+        @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+        @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+        @TableField("measure_point")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+        @TableField("track_gauge")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+        @TableField("level")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+        @TableField("triangular_pit")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+        @TableField("direction")
+    private String direction;
+
+            @ApiModelProperty("高低")
+        @TableField("height")
+    private String height;
+
+            @ApiModelProperty("结构")
+        @TableField("structure")
+    private String structure;
+
+            @ApiModelProperty("整改")
+        @TableField("rectification")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+        @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisOverReportCheckUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 分析批次-动静态几何尺寸-轨检车单元设备映射
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisOverReportCheckUnitDeviceMap对象", description = "分析批次-动静态几何尺寸-轨检车单元设备映射")
+
+public class AnalysisOverReportCheckUnitDeviceMapDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+    private String id;
+
+            @ApiModelProperty("创建人")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    private Integer checkType;
+
+            @ApiModelProperty("轨检车超限表id")
+    private String overReportId;
+
+            @ApiModelProperty("超限里程")
+    private BigDecimal overReportMileage;
+
+            @ApiModelProperty("超限类型")
+    private String overType;
+
+            @ApiModelProperty("超限等级")
+    private Integer overLevel;
+
+            @ApiModelProperty("长度")
+    private String longitude;
+
+            @ApiModelProperty("峰值（mm或g）")
+    private String peakValue;
+
+            @ApiModelProperty("管理数据差")
+    private String dataDifference;
+
+            @ApiModelProperty("线性")
+    private String xianxing;
+
+            @ApiModelProperty("检查标准")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+    private String spend;
+
+            @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisOverReportCheckUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 分析批次-动静态几何尺寸-轨检车单元设备映射
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisOverReportCheckUnitDeviceMap对象", description = "分析批次-动静态几何尺寸-轨检车单元设备映射")
+
+public class AnalysisOverReportCheckUnitDeviceMapVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+            @TableId("id")
+    private String id;
+
+            @ApiModelProperty("创建人")
+        @TableField("create_by")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+        @TableField("create_time")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+        @TableField("update_by")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+        @TableField("update_time")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @TableField("unit_code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+        @TableField("unit_type")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+        @TableField("unit_type_name")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+        @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+        @TableField("check_type")
+    private Integer checkType;
+
+            @ApiModelProperty("轨检车超限表id")
+        @TableField("over_report_id")
+    private String overReportId;
+
+            @ApiModelProperty("超限里程")
+        @TableField("over_report_mileage")
+    private BigDecimal overReportMileage;
+
+            @ApiModelProperty("超限类型")
+        @TableField("over_type")
+    private String overType;
+
+            @ApiModelProperty("超限等级")
+        @TableField("over_level")
+    private Integer overLevel;
+
+            @ApiModelProperty("长度")
+        @TableField("longitude")
+    private String longitude;
+
+            @ApiModelProperty("峰值（mm或g）")
+        @TableField("peak_value")
+    private String peakValue;
+
+            @ApiModelProperty("管理数据差")
+        @TableField("data_difference")
+    private String dataDifference;
+
+            @ApiModelProperty("线性")
+        @TableField("xianxing")
+    private String xianxing;
+
+            @ApiModelProperty("检查标准")
+        @TableField("standard")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+        @TableField("spend")
+    private String spend;
+
+            @ApiModelProperty("备注")
+        @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisRailDeviceCheckDataUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-轨检仪静态检查数据分析批次映射
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisRailDeviceCheckDataUnitDeviceMap对象", description = "动静态分析-轨检仪静态检查数据分析批次映射")
+
+public class AnalysisRailDeviceCheckDataUnitDeviceMapDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+    private String id;
+
+            @ApiModelProperty("创建人")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("分析批次code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+    private String direction;
+
+            @ApiModelProperty("高低")
+    private String height;
+
+            @ApiModelProperty("结构")
+    private String structure;
+
+            @ApiModelProperty("整改")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisRailDeviceCheckDataUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-轨检仪静态检查数据分析批次映射
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisRailDeviceCheckDataUnitDeviceMap对象", description = "动静态分析-轨检仪静态检查数据分析批次映射")
+
+public class AnalysisRailDeviceCheckDataUnitDeviceMapVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+            @TableId("id")
+    private String id;
+
+            @ApiModelProperty("创建人")
+        @TableField("create_by")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+        @TableField("create_time")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+        @TableField("update_by")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+        @TableField("update_time")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("分析批次code")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @TableField("unit_code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+        @TableField("unit_type")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+        @TableField("unit_type_name")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+        @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+        @TableField("check_item_id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+        @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+        @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+        @TableField("check_item_text")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+        @TableField("check_detail_id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+        @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+        @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+        @TableField("measure_point")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+        @TableField("track_gauge")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+        @TableField("level")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+        @TableField("triangular_pit")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+        @TableField("direction")
+    private String direction;
+
+            @ApiModelProperty("高低")
+        @TableField("height")
+    private String height;
+
+            @ApiModelProperty("结构")
+        @TableField("structure")
+    private String structure;
+
+            @ApiModelProperty("整改")
+        @TableField("rectification")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+        @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisTqiReportCheckUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisTqiReportCheckUnitDeviceMap对象", description = "动静态分析-轨检车-tqi单元总结报告和单元映射关联关系")
+
+public class AnalysisTqiReportCheckUnitDeviceMapDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+    private String id;
+
+            @ApiModelProperty("创建人")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    private Integer checkType;
+
+            @ApiModelProperty("单元id")
+    private String unitId;
+
+            @ApiModelProperty("单元code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元开始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元结束里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("tqi报告id")
+    private String tqiReportId;
+
+            @ApiModelProperty("开始里程(m)")
+    private BigDecimal startMileage;
+
+            @ApiModelProperty("终点里程(m)")
+    private BigDecimal endMileage;
+
+            @ApiModelProperty("区间名称")
+    private String sectionName;
+
+            @ApiModelProperty("高低左")
+    private String highLowLeft;
+
+            @ApiModelProperty("高低右")
+    private String highLowRight;
+
+            @ApiModelProperty("轨向左")
+    private String trackLeft;
+
+            @ApiModelProperty("轨向右")
+    private String trackRight;
+
+            @ApiModelProperty("水平（mm）")
+    private String level;
+
+            @ApiModelProperty("轨距（mm）")
+    private String trackGauge;
+
+            @ApiModelProperty("三角坑（mm）")
+    private String triangularPit;
+
+            @ApiModelProperty("TQI数值")
+    private String tqiComeUpon;
+
+            @ApiModelProperty("TQI超标")
+    private String tqiAboveStandard;
+
+            @ApiModelProperty("扣分")
+    private String deduct;
+
+            @ApiModelProperty("检测标准")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+    private String spend;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisTqiReportCheckUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.math.BigDecimal;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisTqiReportCheckUnitDeviceMap对象", description = "动静态分析-轨检车-tqi单元总结报告和单元映射关联关系")
+
+public class AnalysisTqiReportCheckUnitDeviceMapVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+            @TableId("id")
+    private String id;
+
+            @ApiModelProperty("创建人")
+        @TableField("create_by")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+        @TableField("create_time")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+        @TableField("update_by")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+        @TableField("update_time")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+        @TableField("check_type")
+    private Integer checkType;
+
+            @ApiModelProperty("单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("单元code")
+        @TableField("unit_code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+        @TableField("unit_type")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元名称")
+        @TableField("unit_type_name")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元开始里程")
+        @TableField("unit_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元结束里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("tqi报告id")
+        @TableField("tqi_report_id")
+    private String tqiReportId;
+
+            @ApiModelProperty("开始里程(m)")
+        @TableField("start_mileage")
+    private BigDecimal startMileage;
+
+            @ApiModelProperty("终点里程(m)")
+        @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+            @ApiModelProperty("区间名称")
+        @TableField("section_name")
+    private String sectionName;
+
+            @ApiModelProperty("高低左")
+        @TableField("high_low_left")
+    private String highLowLeft;
+
+            @ApiModelProperty("高低右")
+        @TableField("high_low_right")
+    private String highLowRight;
+
+            @ApiModelProperty("轨向左")
+        @TableField("track_left")
+    private String trackLeft;
+
+            @ApiModelProperty("轨向右")
+        @TableField("track_right")
+    private String trackRight;
+
+            @ApiModelProperty("水平（mm）")
+        @TableField("level")
+    private String level;
+
+            @ApiModelProperty("轨距（mm）")
+        @TableField("track_gauge")
+    private String trackGauge;
+
+            @ApiModelProperty("三角坑（mm）")
+        @TableField("triangular_pit")
+    private String triangularPit;
+
+            @ApiModelProperty("TQI数值")
+        @TableField("tqi_come_upon")
+    private String tqiComeUpon;
+
+            @ApiModelProperty("TQI超标")
+        @TableField("tqi_above_standard")
+    private String tqiAboveStandard;
+
+            @ApiModelProperty("扣分")
+        @TableField("deduct")
+    private String deduct;
+
+            @ApiModelProperty("检测标准")
+        @TableField("standard")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+        @TableField("spend")
+    private String spend;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisAdditiveCheckUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisAdditiveCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisAdditiveCheckUnitDeviceMapService extends IService<AnalysisAdditiveCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisBatchUnitDeviceService.java

@@ -31,4 +31,8 @@ public interface IAnalysisBatchUnitDeviceService extends IService<AnalysisBatchU
     List<RailVehicleTqiVO> getUnitDeviceTqi(String id);
 
     List<RailAddInstrumentCheckVO> getUnitDeviceAdditiveInfo(String id);
+
+    List<StaticCheckVO> getLabourCheck(String id);
+
+    List<StaticCheckVO> getRailDeviceCheck(String id);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisLabourCheckDataUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisLabourCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-人工检查数据分析批次映射 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisLabourCheckDataUnitDeviceMapService extends IService<AnalysisLabourCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisOverReportCheckUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisOverReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 分析批次-动静态几何尺寸-轨检车单元设备映射 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisOverReportCheckUnitDeviceMapService extends IService<AnalysisOverReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisRailDeviceCheckDataUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisRailDeviceCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-轨检仪静态检查数据分析批次映射 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisRailDeviceCheckDataUnitDeviceMapService extends IService<AnalysisRailDeviceCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisTqiReportCheckUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisTqiReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisTqiReportCheckUnitDeviceMapService extends IService<AnalysisTqiReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisAdditiveCheckUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisAdditiveCheckUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisAdditiveCheckUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisAdditiveCheckUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisAdditiveCheckUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisAdditiveCheckUnitDeviceMapMapper, AnalysisAdditiveCheckUnitDeviceMap> implements IAnalysisAdditiveCheckUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchUnitDeviceServiceImpl.java

@@ -78,4 +78,14 @@ public class AnalysisBatchUnitDeviceServiceImpl extends ServiceImpl<AnalysisBatc
     public List<RailAddInstrumentCheckVO> getUnitDeviceAdditiveInfo(String id) {
         return this.baseMapper.getUnitDeviceAdditiveInfo(id);
     }
+
+    @Override
+    public List<StaticCheckVO> getLabourCheck(String id) {
+        return this.baseMapper.getLabourCheck(id);
+    }
+
+    @Override
+    public List<StaticCheckVO> getRailDeviceCheck(String id) {
+        return this.baseMapper.getRailDeviceCheck(id);
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisLabourCheckDataUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisLabourCheckDataUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisLabourCheckDataUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisLabourCheckDataUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-人工检查数据分析批次映射 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisLabourCheckDataUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisLabourCheckDataUnitDeviceMapMapper, AnalysisLabourCheckDataUnitDeviceMap> implements IAnalysisLabourCheckDataUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisOverReportCheckUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisOverReportCheckUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisOverReportCheckUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisOverReportCheckUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 分析批次-动静态几何尺寸-轨检车单元设备映射 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisOverReportCheckUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisOverReportCheckUnitDeviceMapMapper, AnalysisOverReportCheckUnitDeviceMap> implements IAnalysisOverReportCheckUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisRailDeviceCheckDataUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisRailDeviceCheckDataUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisRailDeviceCheckDataUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisRailDeviceCheckDataUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-轨检仪静态检查数据分析批次映射 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisRailDeviceCheckDataUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisRailDeviceCheckDataUnitDeviceMapMapper, AnalysisRailDeviceCheckDataUnitDeviceMap> implements IAnalysisRailDeviceCheckDataUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisTqiReportCheckUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisTqiReportCheckUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisTqiReportCheckUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisTqiReportCheckUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisTqiReportCheckUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisTqiReportCheckUnitDeviceMapMapper, AnalysisTqiReportCheckUnitDeviceMap> implements IAnalysisTqiReportCheckUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/ping/PingController.java

+package org.jeecg.modules.ping;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 
+ * @Description: 健康检查
+ */
+@RestController
+public class PingController {
+    @Value("${spring.application.name:'server name'}")
+    private String serverName;
+
+    /**
+     * 
+     * @Title: success
+     * @date 2021年8月30日
+     * @author 孙菁
+     * @Description: 定期扫描此接口确保服务的连通性
+     * @return
+     */
+    @GetMapping("/ping")
+    public String success() {
+        return serverName + " pong";
+    }
+}

jeecg-module-system/src/main/resources/application.yml

 spring:
   application:
-    name: jeecg-system
+    name: hzgw
   profiles:
     active: @package.environment@