zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
@@ -9,11 +9,13 @@ import com.zy.acs.manager.common.domain.BaseParam; import com.zy.acs.manager.common.domain.KeyValVo; import com.zy.acs.manager.common.domain.PageParam; import com.zy.acs.manager.common.domain.PageResult; import com.zy.acs.manager.common.utils.BusinessSortService; import com.zy.acs.manager.common.utils.ExcelUtil; import com.zy.acs.manager.manager.entity.Task; import com.zy.acs.manager.manager.service.TaskService; import com.zy.acs.manager.system.controller.BaseController; import com.zy.acs.manager.system.entity.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -35,11 +37,8 @@ public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class); QueryWrapper<Task> wrapper = pageParam.buildWrapper(false, "io_time"); if (hasCreateTimeDesc(pageParam.getOrders())) { // wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts")); } return R.ok().add(taskService.page(pageParam, wrapper)); PageResult<Task> pageResult = taskService.pageRel(pageParam); return R.ok().add(pageResult); } @PreAuthorize("hasAuthority('manager:task:list')") zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/TaskMapper.java
@@ -1,13 +1,18 @@ package com.zy.acs.manager.manager.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zy.acs.manager.manager.entity.Task; import com.zy.acs.manager.system.entity.User; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; public interface TaskMapper extends BaseMapper<Task> { List<Task> selectPageRel(@Param("page") IPage<Task> page, @Param("param") Map<String, Object> param); List<Map<String, Object>> selectStatByLastSevenDays(); } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
@@ -1,15 +1,21 @@ package com.zy.acs.manager.manager.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zy.acs.manager.common.domain.BaseParam; import com.zy.acs.manager.common.domain.PageParam; import com.zy.acs.manager.common.domain.PageResult; import com.zy.acs.manager.core.domain.Lane; import com.zy.acs.manager.manager.entity.Task; import com.zy.acs.manager.manager.enums.TaskStsType; import com.zy.acs.manager.system.entity.User; import java.util.List; import java.util.Map; public interface TaskService extends IService<Task> { PageResult<Task> pageRel(PageParam<Task, BaseParam> pageParam); String generateSeqNum(); Task pick(TaskStsType taskStsType); zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -6,6 +6,9 @@ import com.zy.acs.framework.common.Cools; import com.zy.acs.framework.common.SnowflakeIdWorker; import com.zy.acs.framework.exception.CoolException; import com.zy.acs.manager.common.domain.BaseParam; import com.zy.acs.manager.common.domain.PageParam; import com.zy.acs.manager.common.domain.PageResult; import com.zy.acs.manager.common.exception.BusinessException; import com.zy.acs.manager.core.domain.Lane; import com.zy.acs.manager.core.service.LaneService; @@ -40,6 +43,11 @@ private LaneService laneService; @Override public PageResult<Task> pageRel(PageParam<Task, BaseParam> pageParam) { return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal()); } @Override public synchronized String generateSeqNum() { return String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19); } zy-acs-manager/src/main/resources/mapper/manager/TaskMapper.xml
@@ -2,14 +2,20 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zy.acs.manager.manager.mapper.TaskMapper"> <!-- 关联查询sql --> <sql id="selectSql"> <!-- 分页查询 --> <select id="selectPageRel" resultType="com.zy.acs.manager.manager.entity.Task"> SELECT a.* FROM man_task a <where> AND a.deleted = 0 <if test="param.id != null"> AND a.id = #{param.id} </if> <if test="param.busId != null"> AND a.bus_id = #{param.busId} </if> <if test="param.seqNum != null"> AND a.seq_num like concat('%',#{param.seqNum},'%') </if> <if test="param.taskType != null"> AND a.task_type = #{param.taskType} @@ -20,22 +26,38 @@ <if test="param.agvId != null"> AND a.agv_id = #{param.agvId} </if> <if test="param.oriSta != null"> AND a.ori_sta = #{param.oriSta} </if> <if test="param.oriLoc != null"> AND a.ori_loc = #{param.oriLoc} </if> <if test="param.destSta != null"> AND a.dest_sta = #{param.destSta} </if> <if test="param.destLoc != null"> AND a.dest_loc = #{param.destLoc} </if> <if test="param.destCode != null"> AND a.dest_code = #{param.destCode} </if> <if test="param.status != null"> AND a.status = #{param.status} </if> <if test="param.timeStart != null"> and a.create_time >= #{param.timeStart} </if> <if test="param.timeEnd != null"> and a.create_time < #{param.timeEnd} </if> <if test="param.keywords != null"> AND ( a.memo LIKE CONCAT('%', #{param.keywords}, '%') OR a.memo LIKE CONCAT('%', #{param.keywords}, '%') OR a.seq_num LIKE CONCAT('%', #{param.keywords}, '%') ) </if> </where> order by a.create_time desc </sql> <!-- 分页查询 --> <select id="selectPageRel" resultType="com.zy.acs.manager.manager.entity.Task"> <include refid="selectSql"/> ORDER BY FIELD(a.task_sts, 18, 17, 16, 15, 20, 19), io_time DESC </select> <select id="selectStatByLastSevenDays" resultType="java.util.Map">
