Merge branch 'dev-szl' into 'dev'

道岔使用情况检查数据类除导入外接口 -shizhilong

See merge request !46

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

@@ -3,7 +3,9 @@ package org.jeecg.modules.checkData.equipmentCheckData.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,13 +15,14 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.RecordsMasterCheckDTO;
-import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCheck;
-import org.jeecg.modules.checkData.equipmentCheckData.entity.TrackBedManagementCheck;
-import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordsMasterCheckService;
-import org.jeecg.modules.checkData.equipmentCheckData.service.ITrackBedManagementCheckService;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.*;
+import org.jeecg.modules.checkData.equipmentCheckData.service.*;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementCourseVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordsMasterCheckVO;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordsMasterTurnoutInfoVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.TrackBedManagementCheckVO;
 import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
+import org.jeecg.modules.deviceAsset.service.ICurveManagementService;
 import org.jeecg.modules.deviceAsset.service.ITrackBedManagementService;
 import org.jeecg.modules.utils.BeanCopyUtil;
 import org.jeecg.modules.utils.ExcelUtils;
@@ -27,17 +30,15 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
-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.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -56,6 +57,13 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
     private ITrackBedManagementService trackBedManagementService;
     @Autowired
     private ITrackBedManagementCheckService trackBedManagementCheckService;
+    @Autowired
+    private IRecordsMasterTurnoutInfoService recordsMasterTurnoutInfoService;
+    @Autowired
+    private IRailWearRecordService railWearRecordService;
+    @Autowired
+    private ICurveWearRecordService curveWearRecordService;
+    //********************************设备检查记录相关接口*************************************************************
     /**
      * 设备检查记录-分页列表查询
      *
@@ -77,6 +85,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
 
     /**
      * 根据区间id和线别id查询道床列表
+     *
      * @param sectionId
      * @param lineAliasId
      * @return
@@ -85,7 +94,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
     @ApiOperation(value = "根据区间id查询道床列表", notes = "根据区间id和线别id查询道床列表")
     @GetMapping(value = "/getTrackBedBySubwayIdAndLineId")
     public Result<List<TrackBedManagement>> getTrackBedBySubwayIdAndLineId(@ApiParam(name = "区间id") String sectionId,
-                                                      @ApiParam(name = "线别id") String lineAliasId) {
+                                                                           @ApiParam(name = "线别id") String lineAliasId) {
         List<TrackBedManagement> listResult = trackBedManagementService.lambdaQuery()
                 .eq(ObjectUtil.isNotEmpty(sectionId), TrackBedManagement::getSectionId, sectionId)
                 .eq(ObjectUtil.isNotEmpty(lineAliasId), TrackBedManagement::getLineAliasId, lineAliasId)
@@ -93,68 +102,139 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
                 .list();
         return Result.OK(listResult);
     }
+
     /**
      * 根据道床使用情况记录数据表的道床id查询对应的实用情况
+     *
      * @param managementId 道床id
      * @return
      */
     @AutoLog(value = "根据道床使用情况记录数据表的道床id和检查记录主表的id查询对应的实用情况")
     @ApiOperation(value = "根据道床使用情况记录数据表的道床id和检查记录主表的id查询对应的实用情况", notes = "根据道床使用情况记录数据表的道床id和检查记录主表的id查询对应的实用情况")
     @GetMapping(value = "/getTrackBedByManagementIdAndRecordId")
-    public Result<List<TrackBedManagementCheckVO>> getTrackBedByManagementId(@ApiParam(name = "道床id") String managementId,@ApiParam(name = "检查记录表主键id") String recordId) {
+    public Result<List<TrackBedManagementCheckVO>> getTrackBedByManagementId(@ApiParam(name = "道床id") String managementId, @ApiParam(name = "检查记录表主键id") String recordId) {
         List<TrackBedManagementCheck> listResult = trackBedManagementCheckService.lambdaQuery()
                 .eq(ObjectUtil.isNotEmpty(managementId), TrackBedManagementCheck::getTrakBedManagementId, managementId)
                 .eq(ObjectUtil.isNotEmpty(recordId), TrackBedManagementCheck::getRecordsMasterCheckId, recordId)
-                .eq(TrackBedManagementCheck::getDelFlag,"0")
+                .eq(TrackBedManagementCheck::getDelFlag, "0")
                 .orderByAsc(TrackBedManagementCheck::getCreateTime)
                 .list();
-        if(listResult!=null){
+        if (listResult != null) {
             List<TrackBedManagementCheckVO> resultList = BeanCopyUtil.copyListProperties(listResult, TrackBedManagementCheckVO::new);
             return Result.OK(resultList);
         }
         return Result.OK(new ArrayList<>());
     }
 
+    @AutoLog(value = "设备检查记录主数据新增或者编辑")
+    @ApiOperation(value = "设备检查记录主数据新增或者编辑", notes = "设备检查记录主数据新增或者编辑")
+    @PostMapping(value = "/saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody RecordsMasterCheck recordsMasterCheck) {
+        if (ObjectUtil.isEmpty(recordsMasterCheck.getType())) {
+            return Result.error("传递参数不完整");
+        }
+        recordsMasterCheck.setUpdateTime(new Date());
+        recordsMasterCheck.setDelFlag("0");
+        if (ObjectUtil.isEmpty(recordsMasterCheck.getId())) {
+            this.service.save(recordsMasterCheck);
+        } else {
+            this.service.updateById(recordsMasterCheck);
+        }
+        return Result.OK("操作成功!");
+    }
+
+    /**
+     * 删除设备检查记录主数据及相关联的数据
+     *
+     * @param id
+     * @param type
+     * @return
+     */
+    @AutoLog(value = "删除设备检查记录主数据及相关联的数据")
+    @ApiOperation(value = "删除设备检查记录主数据及相关联的数据", notes = "删除设备检查记录主数据及相关联的数据")
+    @GetMapping(value = "/delete")
+    public Result<String> delete(@ApiParam(name = "动静态几何尺寸数据id", required = true) String id, @ApiParam(name = "动静态几何尺寸数据类型", required = true) String type) {
+        if ("1".equals(type)) {
+            //删除道岔使用情况检查数据
+            recordsMasterTurnoutInfoService.lambdaUpdate().eq(RecordsMasterTurnoutInfo::getRecordsMasterId, id).remove();
+        } else if ("2".equals(type)) {
+            //钢轨伤损情况检查表
+            railWearRecordService.lambdaUpdate().eq(RailWearRecord::getRecordsMasterCheckId, id).remove();
+        } else if("3".equals(type)){
+            //曲线磨损情况检查数据
+            curveWearRecordService.lambdaUpdate().eq(CurveWearRecord::getRecordsMasterCheckId, id).remove();
+        } else if("5".equals(type)){
+            //道床使用情况检查数据
+            trackBedManagementCheckService.lambdaUpdate().eq(TrackBedManagementCheck::getRecordsMasterCheckId, id).remove();
+        }
+        //删除设备检查记录主数据
+        this.service.lambdaUpdate().eq(RecordsMasterCheck::getId, id).remove();
+        return Result.OK("删除成功!");
+    }
+//****************************道岔使用情况检查数据相关接口**************************************************************************************************************
+    /**
+     * 根据设备检查记录主键查询道岔使用情况检查数据
+     *
+     * @param id 设备检查记录主键
+     * @return
+     */
+    @AutoLog(value = "根据设备检查记录主键查询道岔使用情况检查数据")
+    @ApiOperation(value = "根据设备检查记录主键查询道岔使用情况检查数据", notes = "根据设备检查记录主键查询道岔使用情况检查数据")
+    @GetMapping(value = "/getTurnoutInfoList")
+    public Result<List<RecordsMasterTurnoutInfoVO>> getTurnoutInfoList(@ApiParam(name = "设备检查记录主键id") String id) {
+        List<RecordsMasterTurnoutInfo> listResult = recordsMasterTurnoutInfoService.lambdaQuery()
+                .eq(ObjectUtil.isNotEmpty(id), RecordsMasterTurnoutInfo::getRecordsMasterId, id)
+                .eq(RecordsMasterTurnoutInfo::getDelFlag, "0")
+                .list();
+        List<RecordsMasterTurnoutInfoVO> resultList = new ArrayList<>();
+        if (listResult != null) {
+            resultList = BeanCopyUtil.copyListProperties(listResult, RecordsMasterTurnoutInfoVO::new);
+        }
+        return Result.OK(resultList);
+    }
+
     /**
      * 设备检查记录导出excel
      * @param request
      * @param recordsMasterCheck
      * @return
      */
-    @AutoLog(value = "设备检查记录导出excel")
-    @ApiOperation(value = "设备检查记录导出excel", notes = "设备检查记录导出excel")
-    @GetMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request,RecordsMasterCheck recordsMasterCheck) {
-        return super.exportXls(request, recordsMasterCheck, RecordsMasterCheck.class, "道床使用情况检查");
-    }
+//    @AutoLog(value = "设备检查记录导出excel")
+//    @ApiOperation(value = "设备检查记录导出excel", notes = "设备检查记录导出excel")
+//    @GetMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request,RecordsMasterCheck recordsMasterCheck) {
+//        return super.exportXls(request, recordsMasterCheck, RecordsMasterCheck.class, "道床使用情况检查");
+//    }
 
     /**
      * 导出excel
      *
      * @param request
      */
-    @AutoLog(value = "设备检查记录-导出")
-    @ApiOperation(value = "设备检查记录-导出", notes = "设备检查记录-导出")
-    @GetMapping(value = "/exportXl")
-    public ModelAndView exportXl(RecordsMasterCheck recordsMasterCheck, HttpServletRequest request) {
-        // Step.1 组装查询条件
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<RecordsMasterCheck> resultList = this.service.list(new LambdaQueryWrapper<RecordsMasterCheck>()
-                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getEkCode()), RecordsMasterCheck::getEkCode, recordsMasterCheck.getEkCode())
-                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionId()), RecordsMasterCheck::getSubwaySectionId, recordsMasterCheck.getSubwaySectionId())
-                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailId()), RecordsMasterCheck::getLightRailId, recordsMasterCheck.getLightRailId())
-                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getLineAliasId, recordsMasterCheck.getLineAliasId())
-                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getType, recordsMasterCheck.getType())
-                .orderByAsc(RecordsMasterCheck::getCreateTime));
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "道床使用情况检查");
-        mv.addObject(NormalExcelConstants.CLASS, RecordsMasterCheck.class);
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("道床使用情况检查列表数据", "导出人:", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, resultList);
-        return mv;
-    }
+//    @AutoLog(value = "设备检查记录-导出")
+//    @ApiOperation(value = "设备检查记录-导出", notes = "设备检查记录-导出")
+//    @GetMapping(value = "/exportXl")
+//    public ModelAndView exportXl(RecordsMasterCheck recordsMasterCheck, HttpServletRequest request) {
+//        // Step.1 组装查询条件
+//        //Step.2 AutoPoi 导出Excel
+//        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+//        List<RecordsMasterCheck> resultList = this.service.list(new LambdaQueryWrapper<RecordsMasterCheck>()
+//                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getEkCode()), RecordsMasterCheck::getEkCode, recordsMasterCheck.getEkCode())
+//                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionId()), RecordsMasterCheck::getSubwaySectionId, recordsMasterCheck.getSubwaySectionId())
+//                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailId()), RecordsMasterCheck::getLightRailId, recordsMasterCheck.getLightRailId())
+//                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getLineAliasId, recordsMasterCheck.getLineAliasId())
+//                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getType, recordsMasterCheck.getType())
+//                .orderByAsc(RecordsMasterCheck::getCreateTime));
+//        //导出文件名称
+//        mv.addObject(NormalExcelConstants.FILE_NAME, "道床使用情况检查");
+//        mv.addObject(NormalExcelConstants.CLASS, RecordsMasterCheck.class);
+//        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("道床使用情况检查列表数据", "导出人:", "导出信息"));
+//        mv.addObject(NormalExcelConstants.DATA_LIST, resultList);
+//        return mv;
+//    }
+
     /**
      * 设备检查记录-导出
      *

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterTurnoutInfoDTO.java

 package org.jeecg.modules.checkData.equipmentCheckData.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -43,6 +44,9 @@ public class RecordsMasterTurnoutInfoDTO {
     @ApiModelProperty("设备检查记录主表id")
     private String recordsMasterId;
 
+    @ApiModelProperty("道岔编号")
+    private String switchCode;
+
     @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
     private String type;
 

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

@@ -57,10 +57,15 @@ public class RecordsMasterTurnoutInfo implements Serializable {
     @TableField("records_master_id")
     private String recordsMasterId;
 
+    @ApiModelProperty("道岔编号")
+    @TableField("switch_code")
+    private String switchCode;
+
     @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
     @TableField("type")
     private String type;
 
+
     @ApiModelProperty("值1")
     @TableField("num_one")
     private String numOne;

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

@@ -11,6 +11,12 @@
             <if test="dto.ekCode != null and dto.ekCode != ''">
                 AND t1.ek_code like concat('%',#{dto.ekCode},'%')
             </if>
+            <if test="dto.workCode != null and dto.workCode != ''">
+                AND t1.work_code like concat('%',#{dto.workCode},'%')
+            </if>
+            <if test="dto.gaugeCode != null and dto.gaugeCode != ''">
+                AND t1.gauge_code like concat('%',#{dto.gaugeCode},'%')
+            </if>
             <if test="dto.subwaySectionId != null and dto.subwaySectionId != ''">
                 AND t1.subway_section_id = #{dto.subwaySectionId}
             </if>

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

@@ -43,6 +43,9 @@ public class RecordsMasterTurnoutInfoVO {
     @ApiModelProperty("设备检查记录主表id")
     private String recordsMasterId;
 
+    @ApiModelProperty("道岔编号")
+    private String switchCode;
+
     @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
     private String type;