feat:1.曲线管理bug修改

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/controller/RailInspectionEquipmentItemController.java

@@ -3,23 +3,21 @@ package org.jeecg.modules.checkData.dynamicStaticGeometricData.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetailVO;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 /**
@@ -34,8 +32,8 @@ import java.util.List;
 @RequestMapping("/checkData/dynamicStaticGeometricData/railInspectionEquipmentItem")
 public class RailInspectionEquipmentItemController extends JeecgController<RailInspectionEquipmentItem, IRailInspectionEquipmentItemService> {
 
-    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
-    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-项目列表查询")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-项目列表查询", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-项目列表查询")
     @GetMapping(value = "/list")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "railInspectionEquipmentId", value = "轨检仪静态检查数据id")
@@ -45,6 +43,30 @@ public class RailInspectionEquipmentItemController extends JeecgController<RailI
         return Result.OK(record);
     }
 
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-项目明细列表")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-项目明细列表", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-项目明细列表")
+    @GetMapping(value = "/detailList")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "railInspectionEquipmentItemId", value = "轨检仪静态检查项目id")
+    })
+    public Result<List<RailInspectionEquipmentItemDetailVO>> detailList(String railInspectionEquipmentItemId) {
+        List<RailInspectionEquipmentItemDetailVO> record = this.service.detailList(railInspectionEquipmentItemId);
+        return Result.OK(record);
+    }
+
+
+    @PostMapping(value = "/upload")
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-导入")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-导入", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-导入")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "railInspectionEquipmentId", value = "轨检仪静态检查数据id"),
+            @ApiImplicitParam(name = "file", value = "文件"),
+    })
+    public Result<String> uploadFile(String railInspectionEquipmentId, MultipartFile file) {
+
+        this.service.uploadFile(railInspectionEquipmentId, file);
+
+        return Result.ok("操作成功");
+    }
 
-    
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/IRailInspectionEquipmentItemService.java

@@ -2,7 +2,9 @@ package org.jeecg.modules.checkData.dynamicStaticGeometricData.service;
 
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetailVO;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -17,4 +19,8 @@ import java.util.List;
 public interface IRailInspectionEquipmentItemService extends IService<RailInspectionEquipmentItem> {
 
     List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId);
+
+    void uploadFile(String railInspectionEquipmentId, MultipartFile file);
+
+    List<RailInspectionEquipmentItemDetailVO> detailList(String railInspectionEquipmentItemId);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/impl/RailInspectionEquipmentItemServiceImpl.java

 package org.jeecg.modules.checkData.dynamicStaticGeometricData.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetail;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetailVO;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemDetailMapper;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemMapper;
 import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -20,8 +26,27 @@ import java.util.List;
 @Service
 public class RailInspectionEquipmentItemServiceImpl extends ServiceImpl<RailInspectionEquipmentItemMapper, RailInspectionEquipmentItem> implements IRailInspectionEquipmentItemService {
 
+    @Resource
+    private RailInspectionEquipmentItemDetailMapper railInspectionEquipmentItemDetailMapper;
+
     @Override
     public List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId) {
         return this.baseMapper.queryList(railInspectionEquipmentId);
     }
+
+    @Override
+    public void uploadFile(String railInspectionEquipmentId, MultipartFile file) {
+        throw new NullPointerException();
+    }
+
+    @Override
+    public List<RailInspectionEquipmentItemDetailVO> detailList(String railInspectionEquipmentItemId) {
+        LambdaQueryWrapper<RailInspectionEquipmentItemDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(RailInspectionEquipmentItemDetail::getRailInspectionEquipmentItemId,railInspectionEquipmentItemId);
+
+
+        List<RailInspectionEquipmentItemDetail> itemDetails = railInspectionEquipmentItemDetailMapper.selectList(lambdaQueryWrapper);
+
+        return null;
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/entity/CurveManagement.java

@@ -57,10 +57,10 @@ public class CurveManagement implements Serializable {
     private String curveDeflectionAngle;
 
     @ApiModelProperty(value = "曲线半径R(m)")
-    private BigDecimal curveAdius;
+    private BigDecimal curveRadius;
 
     @ApiModelProperty(value = "缓和曲线长I(m)")
-    private BigDecimal transitionCurveLen;
+    private String transitionCurveLen;
 
     @ApiModelProperty(value = "切线长T(m)")
     private BigDecimal tangentLen;

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/vo/CurveManagementQueryVO.java

@@ -42,11 +42,11 @@ public class CurveManagementQueryVO implements Serializable {
     @ApiModelProperty("曲线偏角a(°′″)")
     private String curveDeflectionAngle;
 
-    @ApiModelProperty("曲线半径R(m)")
-    private BigDecimal curveAdius;
+    @ApiModelProperty(value = "曲线半径R(m)")
+    private BigDecimal curveRadius;
 
-    @ApiModelProperty("缓和曲线长I(m)")
-    private BigDecimal transitionCurveLen;
+    @ApiModelProperty(value = "缓和曲线长I(m)")
+    private String transitionCurveLen;
 
     @ApiModelProperty("切线长T(m)")
     private BigDecimal tangentLen;