Commit f23b8ae60ccab3b56080c093897171a804804486
1 parent
b994af10
fix: 更新注册列表逻辑形式
Showing
2 changed files
with
4 additions
and
3 deletions
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
| @@ -165,10 +165,11 @@ public class DriverJob implements InitializingBean { | @@ -165,10 +165,11 @@ public class DriverJob implements InitializingBean { | ||
| 165 | */ | 165 | */ |
| 166 | public void getSchedulingInfo() { | 166 | public void getSchedulingInfo() { |
| 167 | long timestamp = System.currentTimeMillis(); | 167 | long timestamp = System.currentTimeMillis(); |
| 168 | - log.info("获取排班任务触发时间:{}",timestamp); | 168 | + String formatDate = ConstDateUtil.formatDate(timestamp); |
| 169 | + log.info("获取排班任务触发时间:{}",formatDate); | ||
| 169 | // 获取排班请求 | 170 | // 获取排班请求 |
| 170 | String getSchedulingInfoUrl = null; | 171 | String getSchedulingInfoUrl = null; |
| 171 | - String formatDate = ConstDateUtil.formatDate(timestamp); | 172 | + |
| 172 | log.info("开始获取{}的排班数据",formatDate); | 173 | log.info("开始获取{}的排班数据",formatDate); |
| 173 | try { | 174 | try { |
| 174 | getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp)))); | 175 | getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp)))); |
ruoyi-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
| @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 54 | </select> | 54 | </select> |
| 55 | <select id="querySignListByJobCode" resultType="com.ruoyi.pojo.domain.EquipmentDriverExpand"> | 55 | <select id="querySignListByJobCode" resultType="com.ruoyi.pojo.domain.EquipmentDriverExpand"> |
| 56 | select driver_face_device_id.* from driver_face_device_id,equipment | 56 | select driver_face_device_id.* from driver_face_device_id,equipment |
| 57 | - where driver_face_device_id.device_id = equipment.device_id and equipment.status = 1 | 57 | + where driver_face_device_id.device_id = equipment.device_id |
| 58 | <if test="drivers != null and drivers.size() > 0"> | 58 | <if test="drivers != null and drivers.size() > 0"> |
| 59 | and job_code in | 59 | and job_code in |
| 60 | <foreach collection="drivers" item="item" open="(" separator="," close=")"> | 60 | <foreach collection="drivers" item="item" open="(" separator="," close=")"> |