Merge remote-tracking branch 'origin/dev' into dev-hkl

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

@@ -18,6 +18,7 @@ import org.apache.shiro.SecurityUtils;
 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.MovementAdditiveInfoDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementAdditiveInfo;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourse;
@@ -533,23 +534,23 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
 
     /**
      * 查询添乘仪详情
-     *
-     * @param id
+     * @param pageNo
+     * @param pageSize
+     * @param dto
      * @return
      */
     @AutoLog(value = "查询添乘仪详情")
     @ApiOperation(value = "查询添乘仪详情", notes = "查询添乘仪详情")
     @GetMapping(value = "/getMovementAdditiveInfo")
-    public Result<List<MovementAdditiveInfoVO>> getMovementAdditiveInfo(@ApiParam(name = "动态几何尺寸主键id", required = true) String id) {
-        List<MovementAdditiveInfoVO> resultList = new ArrayList<>();
-        LambdaQueryWrapper<MovementAdditiveInfo> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(MovementAdditiveInfo::getMovementMasterId, id);
-        lambdaQuery.orderByAsc(MovementAdditiveInfo::getInfoSort);
-        List<MovementAdditiveInfo> list = movementAdditiveInfoService.list(lambdaQuery);
-        if (list != null && list.size() > 0) {
-            resultList = BeanCopyUtil.copyListProperties(list, MovementAdditiveInfoVO::new);
+    public Result<IPage<MovementAdditiveInfoVO>> getMovementAdditiveInfo(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                       MovementAdditiveInfoDTO dto) {
+        if(ObjectUtil.isEmpty(dto.getMovementMasterId())){
+            return Result.error("参数不完整");
         }
-        return Result.OK(resultList);
+        Page<MovementAdditiveInfoVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageAdditiveInfoList(pageData, dto);
+        return Result.OK(pageData);
     }
 
     @AutoLog(value = "添乘仪导入")
@@ -588,7 +589,7 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
             int sort = 0;
             //初始化存储结果
             List<MovementAdditiveInfo> result = new ArrayList<>();
-            for (int m = 1; m < rowRecords.size() - 1; m++) {
+            for (int m = 1; m < rowRecords.size(); m++) {
                 MovementAdditiveInfo movementAdditiveInfo = new MovementAdditiveInfo();
                 sort++;
                 for (int i = 0; i < 7; i++) {

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

 package org.jeecg.modules.checkData.equipmentCheckData.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementAdditiveInfoDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMaster;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementAdditiveInfoVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
 
 import java.math.BigDecimal;
@@ -71,4 +73,12 @@ public interface MovementRecordsMasterMapper extends BaseMapper<MovementRecordsM
      * @return
      */
     Integer getSwitchNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+    /**
+     * 查询添乘仪详情
+     *
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<MovementAdditiveInfoVO> queryPageAdditiveInfoList(Page<MovementAdditiveInfoVO> pageData, MovementAdditiveInfoDTO dto);
 }

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

@@ -113,4 +113,18 @@
             </if>
         </where>
     </select>
+    <!--查询添乘仪详情-->
+    <select id="queryPageAdditiveInfoList"
+            resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.MovementAdditiveInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_djt_movement_additive_info t1
+        <where>
+            1=1
+            AND t1.movement_master_id = #{dto.movementMasterId}
+            AND t1.del_flag = '0'
+            order by t1.info_sort asc
+        </where>
+    </select>
 </mapper>

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

 package org.jeecg.modules.checkData.equipmentCheckData.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementAdditiveInfoDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMaster;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementAdditiveInfoVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
 
 import java.math.BigDecimal;
@@ -70,4 +72,13 @@ public interface IMovementRecordsMasterService extends IService<MovementRecordsM
      * @return
      */
     Integer getSwitchNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+    /**
+     * 查询添乘仪详情
+     *
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<MovementAdditiveInfoVO> queryPageAdditiveInfoList(Page<MovementAdditiveInfoVO> pageData, MovementAdditiveInfoDTO dto);
+
 }

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

 package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementAdditiveInfoDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMaster;
 import org.jeecg.modules.checkData.equipmentCheckData.mapper.MovementRecordsMasterMapper;
 import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementRecordsMasterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementAdditiveInfoVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
 import org.springframework.stereotype.Service;
 
@@ -84,4 +86,15 @@ public class MovementRecordsMasterServiceImpl extends ServiceImpl<MovementRecord
     public Integer getSwitchNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage) {
         return this.baseMapper.getSwitchNum(sectionId, lightRailId,lineAliasId,startingMileage,endMileage);
     }
+    /**
+     * 查询添乘仪详情
+     *
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<MovementAdditiveInfoVO> queryPageAdditiveInfoList(Page<MovementAdditiveInfoVO> pageData, MovementAdditiveInfoDTO dto) {
+        return this.baseMapper.queryPageAdditiveInfoList(pageData,dto);
+    }
 }

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

@@ -25,67 +25,52 @@ public class MovementAdditiveInfoVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
-    @TableId("id")
     private String id;
 
     @ApiModelProperty("创建人")
-    @TableField("create_by")
     private String createBy;
 
     @ApiModelProperty("创建日期")
-    @TableField("create_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
-    @TableField("update_by")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @TableField("update_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
-    @TableField("movement_master_id")
     private String movementMasterId;
 
     @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;