feat:1.道岔使用情况检查业务

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/UseTurnoutRecordCheckController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.checkData.equipmentCheckData.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.jeecg.common.api.vo.Result;
@@ -12,6 +13,7 @@ import org.jeecg.modules.checkData.equipmentCheckData.entity.UseTurnoutRecordChe
 import org.jeecg.modules.checkData.equipmentCheckData.service.IUseTurnoutRecordCheckService;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
+import org.jeecg.modules.utils.BeanCopyUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -31,6 +33,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/checkData/equipmentCheckData/useTurnoutRecordCheck")
+@Api(tags = "检查数据设备-检查记录数据")
 public class UseTurnoutRecordCheckController extends JeecgController<UseTurnoutRecordCheck, IUseTurnoutRecordCheckService> {
 
     @AutoLog(value = "检查数据设备-检查记录数据-分页列表查询")
@@ -66,8 +69,8 @@ public class UseTurnoutRecordCheckController extends JeecgController<UseTurnoutR
     @AutoLog(value = "检查数据设备-检查记录数据-道岔检查详情页")
     @ApiOperation(value = "检查数据设备-检查记录数据-道岔检查详情页", notes = "检查数据设备-检查记录数据-道岔检查详情页")
     @GetMapping(value = "/getDetail")
-    public Result<UseTurnoutRecordCheckDetailVO> getDetail(@ApiParam("设备检查记录主表id") String id) {
-        UseTurnoutRecordCheckDetailVO data = new UseTurnoutRecordCheckDetailVO();
+    public Result<UseTurnoutRecordCheckDetailVO> getDetail(@ApiParam("设备检查记录表id") String useTurnoutRecordId) {
+        UseTurnoutRecordCheckDetailVO data = this.service.getDetail(useTurnoutRecordId);
         return Result.OK(data);
     }
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/UseTurnoutRecordCheck.java

@@ -59,7 +59,7 @@ public class UseTurnoutRecordCheck implements Serializable {
     private String switchManagementId;
 
     @ApiModelProperty("车站id")
-    @TableField("train_station_id")
+    @TableField("station_id")
     private String trainStationId;
 
     @ApiModelProperty("检查日期")
@@ -72,11 +72,11 @@ public class UseTurnoutRecordCheck implements Serializable {
 
     @ApiModelProperty("几何尺寸")
     @TableField(value = "geometric_dimensions", typeHandler = FastjsonTypeHandler.class)
-    private JSONObject geometricDimensions;
+    private String geometricDimensions;
 
     @ApiModelProperty("转辙器")
     @TableField(value = "switch_part", typeHandler = FastjsonTypeHandler.class)
-    private JSONObject switchPart;
+    private String switchPart;
 
     @ApiModelProperty("钢轨及其连接零件")
     @TableField(value = "rail_and_conn_part", typeHandler = FastjsonTypeHandler.class)

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/UseTurnoutRecordCheckMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.UseTurnoutRecordCheckDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.UseTurnoutRecordCheck;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
 
 /**
@@ -17,4 +18,6 @@ import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO
 public interface UseTurnoutRecordCheckMapper extends BaseMapper<UseTurnoutRecordCheck> {
 
     Page<UseTurnoutRecordCheckVO> queryPageList(Page<UseTurnoutRecordCheckVO> pageData, UseTurnoutRecordCheckDTO dto);
+
+    UseTurnoutRecordCheckDetailVO getDetail(String useTurnoutRecordId);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/UseTurnoutRecordCheckMapper.xml

@@ -34,4 +34,19 @@
         </if>
         GROUP BY t1.gauge_code
     </select>
+    <select id="getDetail"
+            resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO">
+        SELECT
+            t1.*,
+            t2.byroad_pre_mileage,
+            t2.byroad_center_mileage,
+            t2.byroad_end_mileage,
+            t2.open_to,
+            t2.line_alias_id,
+            (SELECT line_alias_name FROM t_sn_line_alias WHERE id =	t2.line_alias_id  limit 1) line_alias_name
+        FROM
+            t_ek_use_turnout_record_check t1
+            LEFT JOIN t_da_switch_management t2 ON t1.switch_management_id = t2.id
+        WHERE t1.id =#{useTurnoutRecordId}
+    </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IUseTurnoutRecordCheckService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.UseTurnoutRecordCheckDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.UseTurnoutRecordCheck;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
 
 /**
@@ -17,4 +18,6 @@ import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO
 public interface IUseTurnoutRecordCheckService extends IService<UseTurnoutRecordCheck> {
 
     Page<UseTurnoutRecordCheckVO> queryPageList(Page<UseTurnoutRecordCheckVO> pageData, UseTurnoutRecordCheckDTO dto);
+
+    UseTurnoutRecordCheckDetailVO getDetail(String useTurnoutRecordId);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/UseTurnoutRecordCheckServiceImpl.java

@@ -6,6 +6,7 @@ import org.jeecg.modules.checkData.equipmentCheckData.entity.UseTurnoutRecordChe
 import org.jeecg.modules.checkData.equipmentCheckData.mapper.UseTurnoutRecordCheckMapper;
 import org.jeecg.modules.checkData.equipmentCheckData.service.IUseTurnoutRecordCheckService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
 import org.springframework.stereotype.Service;
 
@@ -24,4 +25,9 @@ public class UseTurnoutRecordCheckServiceImpl extends ServiceImpl<UseTurnoutReco
     public Page<UseTurnoutRecordCheckVO> queryPageList(Page<UseTurnoutRecordCheckVO> pageData, UseTurnoutRecordCheckDTO dto) {
         return this.baseMapper.queryPageList(pageData,dto);
     }
+
+    @Override
+    public UseTurnoutRecordCheckDetailVO getDetail(String useTurnoutRecordId) {
+        return this.baseMapper.getDetail(useTurnoutRecordId);
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/UseTurnoutRecordCheckDetailVO.java

 package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -25,63 +28,36 @@ public class UseTurnoutRecordCheckDetailVO {
     @ApiModelProperty("主键")
     private String id;
 
-    @Excel(name = "检查批次编号", width = 15, orderNum = "1")
-    private String ekCode;
-
-    @ApiModelProperty("工单编号")
-    private String workCode;
-
-    @ApiModelProperty("轨距水平尺编号")
-    private String gaugeCode;
+    @ApiModelProperty("检查日期")
+    private Date checkTime;
 
-    @ApiModelProperty("检查区间id")
-    private String subwaySectionId;
+    @ApiModelProperty("道岔编码")
+    private String turnoutCode;
 
-    @ApiModelProperty("检查区间名称")
-    private String subwaySectionName;
+    @ApiModelProperty("几何尺寸")
+    private String geometricDimensions;
 
-    @ApiModelProperty("所属线路id")
-    private String lightRailId;
+    @ApiModelProperty("转辙器")
+    private String switchPart;
 
-    @ApiModelProperty("所属线路名称")
-    private String lightRailName;
+    @ApiModelProperty("钢轨及其连接零件")
+    private String railAndConnPart;
 
-    @ApiModelProperty("所属线别id")
+    @ApiModelProperty(value = "线别Id")
     private String lineAliasId;
 
-    @ApiModelProperty("所属线别名称")
+    @ApiModelProperty(value = "线别名称")
     private String lineAliasName;
 
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建日期")
-    private Date createTime;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
+    @ApiModelProperty(value = "开向")
+    private String openTo;
 
-    @ApiModelProperty("设备检查记录主表id")
-    private String recordsMasterCheckId;
+    @ApiModelProperty(value = "岔前/岔前里程")
+    private BigDecimal byroadPreMileage;
 
-    @ApiModelProperty("道岔id")
-    private String switchManagementId;
+    @ApiModelProperty(value = "岔心里程")
+    private BigDecimal byroadCenterMileage;
 
-    @ApiModelProperty("检查日期")
-    private Date checkTime;
-
-    @ApiModelProperty("道岔编码")
-    private String turnoutCode;
-
-    @ApiModelProperty("几何尺寸")
-    private JSONObject geometricDimensions;
-
-    @ApiModelProperty("转辙器")
-    private JSONObject switchPart;
-
-    @ApiModelProperty("钢轨及其连接零件")
-    private JSONObject railAndConnPart;
+    @ApiModelProperty(value = "岔前/岔后里程")
+    private BigDecimal byroadEndMileage;
 }