fix: save driver scheduling

guzijian
1 parent e086a990
Showing 12 changed files with 347 additions and 193 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/controller/EquipmentExceptionController.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ResponseScheduling.java
ruoyi-admin/src/main/java/com/ruoyi/redispre/GlobalRedisPreName.java
ruoyi-admin/src/main/resources/application-druid-uat.yml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -3,6 +3,7 @@ package com.ruoyi.driver.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.pojo.response.ResponseScheduling;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,26 +28,33 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 驾驶员信息Controller
- * 
+ *
  * @author 古自健
  * @date 2023-07-04
  */
 @RestController
 @RequestMapping("/driver/driver")
 @Api(tags = "驾驶员管理接口")
-public class DriverController extends BaseController
-{
+public class DriverController extends BaseController {
     @Autowired
     private IDriverService driverService;
     /**
+     * 获取驾驶员排班信息
+     */
+    @GetMapping("/{date}/{jobCode}")
+    @ApiOperation("获取驾驶员排班信息")
+    public AjaxResult getDriverSchedulingInfo(@PathVariable("date") String date, @PathVariable("jobCode") String jobCode) {
+        return driverService.getDriverSchedulingInfo(date,jobCode);
+    }
+
+    /**
      * 查询驾驶员信息列表
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:list')")
     @GetMapping("/list")
-    @ApiOperation(value = "查询驾驶员信息列表",notes = "查询驾驶员信息列表")
-    public TableDataInfo list(Driver driver)
-    {
+    @ApiOperation(value = "查询驾驶员信息列表", notes = "查询驾驶员信息列表")
+    public TableDataInfo list(Driver driver) {
         startPage();
         List<Driver> list = driverService.selectDriverList(driver);
         return getDataTable(list);
@@ -59,8 +67,7 @@ public class DriverController extends BaseController
     @Log(title = "驾驶员信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation("导出驾驶员信息列表")
-    public void export(HttpServletResponse response, Driver driver)
-    {
+    public void export(HttpServletResponse response, Driver driver) {
         List<Driver> list = driverService.selectDriverList(driver);
         ExcelUtil<Driver> util = new ExcelUtil<Driver>(Driver.class);
         util.exportExcel(response, list, "驾驶员信息数据");
@@ -72,8 +79,7 @@ public class DriverController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('driver:driver:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾驶员信息详细信息")
-    public AjaxResult getInfo(@ApiParam(value = "id",required = true) @PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@ApiParam(value = "id", required = true) @PathVariable("id") Long id) {
         return success(driverService.selectDriverById(id));
     }
@@ -84,8 +90,7 @@ public class DriverController extends BaseController
     @Log(title = "驾驶员信息", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增驾驶员信息")
-    public AjaxResult add(@ApiParam("driver") @RequestBody Driver driver)
-    {
+    public AjaxResult add(@ApiParam("driver") @RequestBody Driver driver) {
         return toAjax(driverService.insertDriver(driver));
     }
@@ -96,8 +101,7 @@ public class DriverController extends BaseController
     @Log(title = "驾驶员信息", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改驾驶员信息")
-    public AjaxResult edit(@ApiParam("driver") @RequestBody Driver driver)
-    {
+    public AjaxResult edit(@ApiParam("driver") @RequestBody Driver driver) {
         return toAjax(driverService.updateDriver(driver));
     }
@@ -106,10 +110,9 @@ public class DriverController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:remove')")
     @Log(title = "驾驶员信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     @ApiOperation("删除驾驶员信息")
-    public AjaxResult remove(@ApiParam @PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@ApiParam @PathVariable Long[] ids) {
         return toAjax(driverService.deleteDriverByIds(ids));
     }
 }
@@ -2,6 +2,7 @@ package com.ruoyi.driver.mapper;
 import java.util.List;
 import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.pojo.response.ResponseScheduling;
 import org.apache.ibatis.annotations.Param;
 /**
@@ -65,4 +66,6 @@ public interface DriverMapper
      * @param driverList
      */
     void saveDrivers(@Param("drivers") List<Driver> driverList);
+
+    void saveDriverScheduling(@Param("responseSchedulings") List<ResponseScheduling> responseSchedulings);
 }
 package com.ruoyi.driver.service;
 import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.pojo.response.ResponseScheduling;
 /**
  * 驾驶员信息Service接口
@@ -64,4 +68,8 @@ public interface IDriverService
      * @param driverList
      */
     void insertDrivers(List<Driver> driverList);
+
+    AjaxResult getDriverSchedulingInfo(String date,String jobCode);
+
+    void saveDriverScheduling(Map<String, List<ResponseScheduling>> driverSchedulingMap);
 }
 package com.ruoyi.driver.service.impl;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.pojo.response.ResponseScheduling;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
+import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
+
 /**
  * 驾驶员信息Service业务层处理
- * 
+ *
  * @author 古自健
  * @date 2023-07-04
  */
 @Service
-public class DriverServiceImpl implements IDriverService 
-{
+public class DriverServiceImpl implements IDriverService {
     @Autowired
     private DriverMapper driverMapper;
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询驾驶员信息
-     * 
+     *
      * @param id 驾驶员信息主键
      * @return 驾驶员信息
      */
     @Override
-    public Driver selectDriverById(Long id)
-    {
+    public Driver selectDriverById(Long id) {
         return driverMapper.selectDriverById(id);
     }
     /**
      * 查询驾驶员信息列表
-     * 
+     *
      * @param driver 驾驶员信息
      * @return 驾驶员信息
      */
     @Override
-    public List<Driver> selectDriverList(Driver driver)
-    {
+    public List<Driver> selectDriverList(Driver driver) {
         return driverMapper.selectDriverList(driver);
     }
     /**
      * 新增驾驶员信息
-     * 
+     *
      * @param driver 驾驶员信息
      * @return 结果
      */
     @Override
-    public int insertDriver(Driver driver)
-    {
+    public int insertDriver(Driver driver) {
         return driverMapper.insertDriver(driver);
     }
     /**
      * 修改驾驶员信息
-     * 
+     *
      * @param driver 驾驶员信息
      * @return 结果
      */
     @Override
-    public int updateDriver(Driver driver)
-    {
+    public int updateDriver(Driver driver) {
         return driverMapper.updateDriver(driver);
     }
     /**
      * 批量删除驾驶员信息
-     * 
+     *
      * @param ids 需要删除的驾驶员信息主键
      * @return 结果
      */
     @Override
-    public int deleteDriverByIds(Long[] ids)
-    {
+    public int deleteDriverByIds(Long[] ids) {
         return driverMapper.deleteDriverByIds(ids);
     }
     /**
      * 删除驾驶员信息信息
-     * 
+     *
      * @param id 驾驶员信息主键
      * @return 结果
      */
     @Override
-    public int deleteDriverById(Long id)
-    {
+    public int deleteDriverById(Long id) {
         return driverMapper.deleteDriverById(id);
     }
@@ -96,4 +101,20 @@ public class DriverServiceImpl implements IDriverService
     public void insertDrivers(List<Driver> driverList) {
         driverMapper.saveDrivers(driverList);
     }
+
+    @Override
+    public AjaxResult getDriverSchedulingInfo(String date, String jobCode) {
+        List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + date, jobCode);
+        Boolean aBoolean = redisCache.redisTemplate.opsForHash().hasKey(DRIVER_SCHEDULING_PRE + date, jobCode);
+        return AjaxResult.success(redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + date, jobCode));
+    }
+
+    @Override
+    public void saveDriverScheduling(Map<String, List<ResponseScheduling>> driverSchedulingMap) {
+        Collection<List<ResponseScheduling>> listCollection = driverSchedulingMap.values();
+        for (List<ResponseScheduling> responseSchedulings : listCollection) {
+            driverMapper.saveDriverScheduling(responseSchedulings);
+        }
+
+    }
 }
@@ -2,6 +2,9 @@ package com.ruoyi.eexception.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,6 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/eexception/eexception")
+@Api(tags = "设备异常接口")
 public class EquipmentExceptionController extends BaseController
 {
     @Autowired
@@ -39,6 +43,7 @@ public class EquipmentExceptionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('eexception:eexception:list')")
     @GetMapping("/list")
+    @ApiOperation("查询设备异常记录列表")
     public TableDataInfo list(EquipmentException equipmentException)
     {
         startPage();
@@ -52,6 +57,7 @@ public class EquipmentExceptionController extends BaseController
     @PreAuthorize("@ss.hasPermi('eexception:eexception:export')")
     @Log(title = "设备异常记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
+    @ApiOperation("导出设备异常记录列表")
     public void export(HttpServletResponse response, EquipmentException equipmentException)
     {
         List<EquipmentException> list = equipmentExceptionService.selectEquipmentExceptionList(equipmentException);
@@ -64,6 +70,7 @@ public class EquipmentExceptionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('eexception:eexception:query')")
     @GetMapping(value = "/{id}")
+    @ApiOperation("获取设备异常记录详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         return success(equipmentExceptionService.selectEquipmentExceptionById(id));
@@ -75,6 +82,7 @@ public class EquipmentExceptionController extends BaseController
     @PreAuthorize("@ss.hasPermi('eexception:eexception:add')")
     @Log(title = "设备异常记录", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增设备异常记录")
     public AjaxResult add(@RequestBody EquipmentException equipmentException)
     {
         return toAjax(equipmentExceptionService.insertEquipmentException(equipmentException));
@@ -86,6 +94,7 @@ public class EquipmentExceptionController extends BaseController
     @PreAuthorize("@ss.hasPermi('eexception:eexception:edit')")
     @Log(title = "设备异常记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改设备异常记录")
     public AjaxResult edit(@RequestBody EquipmentException equipmentException)
     {
         return toAjax(equipmentExceptionService.updateEquipmentException(equipmentException));
@@ -97,6 +106,7 @@ public class EquipmentExceptionController extends BaseController
     @PreAuthorize("@ss.hasPermi('eexception:eexception:remove')")
     @Log(title = "设备异常记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
+    @ApiOperation("删除设备异常记录")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(equipmentExceptionService.deleteEquipmentExceptionByIds(ids));
 package com.ruoyi.job;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
+import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.utils.ListUtils;
+import org.apache.commons.math3.distribution.RealDistribution;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,10 +17,10 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
 import java.security.MessageDigest;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 /**
  * 该定时任务用户获取驾驶员信息
@@ -27,6 +30,9 @@ import java.util.Map;
 @Component("driverJob")
 public class DriverJob implements InitializingBean {
+    @Autowired
+    private RedisCache redisCache;
+
     @Resource
     private RestTemplate restTemplate;
@@ -36,7 +42,7 @@ public class DriverJob implements InitializingBean {
     @Value("${api.url.getDriverInfo}")
     private String getDriverInfoUrl;
-    @Value("api.url.getSchedulingInfo")
+    @Value("${api.url.getSchedulingInfo}")
     private String getSchedulingInfoUrl;
     @Value("${api.config.password}")
@@ -46,6 +52,7 @@ public class DriverJob implements InitializingBean {
     private String nonce;
     private static IDriverService DRIVER_SERVICE;
+    private static RedisCache REDIS_CACHE;
     private static RestTemplate RESTTEMPLATE;
@@ -62,14 +69,12 @@ public class DriverJob implements InitializingBean {
         try {
             String getDriverInfoUrl = String.format(GET_DRIVER_INFO_URL, params);
             long timestamp = System.currentTimeMillis();
-
             // 获取驾驶员信息
             List<Driver> drivers = getDrivers(getDriverInfoUrl, String.valueOf(timestamp));
-
-            // http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-//            String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", DateUtils.getDate("yyyyMMdd"), String.valueOf(timestamp), NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            // 格式化请求
+            String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", DateUtils.getDate("yyyyMMdd"), timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
             // 获取排班信息并存入redis
-//            saveSchedulingToRedis(getSchedulingInfoUrl,drivers);
+            saveSchedulingToRedis(getSchedulingInfoUrl, drivers);
             // 分片插入
             List<List<Driver>> splitList = ListUtils.splitList(drivers, 1000);
             System.out.println("开始更新数据-----");
@@ -83,15 +88,33 @@ public class DriverJob implements InitializingBean {
         System.out.println("执行结束");
     }
-    private void saveSchedulingToRedis(String getSchedulingInfoUrl, List<Driver> drivers) {
-//        ESTTEMPLATE.exchange(
-//                url,
-//                HttpMethod.GET,
-//                null,
-//                new ParameterizedTypeReference<List<Driver>>() {
-//                }).getBody();
-//        Object forObject = restTemplate.getForObject(getSchedulingInfoUrl, Object.class);
+    private static void saveSchedulingToRedis(String getSchedulingInfoUrl, List<Driver> drivers) {
+        List<ResponseScheduling> originSchedulingList = RESTTEMPLATE.exchange(
+                getSchedulingInfoUrl,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<ResponseScheduling>>() {
+                }).getBody();
+        Map<String, List<ResponseScheduling>> driverSchedulingMap = new HashMap<>();
+        // 按照员工工号来获取排班信息
+        originSchedulingList.stream().forEach(item -> {
+            // 员工号为key
+            String jobCode = item.getJsy().split("/")[0];
+            item.setJobCode(jobCode);
+            if (Objects.isNull(driverSchedulingMap.get(jobCode))) {
+                List<ResponseScheduling> oneDriverSchedulings = new ArrayList<>();
+                oneDriverSchedulings.add(item);
+                driverSchedulingMap.put(jobCode, oneDriverSchedulings);
+            } else {
+                driverSchedulingMap.get(jobCode).add(item);
+            }
+        });
+        originSchedulingList.clear();
+        // 存入数据库
+        DRIVER_SERVICE.saveDriverScheduling(driverSchedulingMap);
+        // 存入redis
+        REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + DateUtils.getDate("yyyyMMdd"), driverSchedulingMap, 1, TimeUnit.DAYS);
     }
     private static List<Driver> getDrivers(String format, String timestamp) throws Exception {
@@ -160,25 +183,25 @@ public class DriverJob implements InitializingBean {
     }
-    public static void main(String[] args) throws Exception {
-        RestTemplate restTemplate1 = new RestTemplate();
-//        String url = "http://101.95.136.206:9089/webservice/rest/person/company/%s";
-        String url = "http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
-
-        long timestamp = System.currentTimeMillis();
-        Map<String, String> configMap = new HashMap<>(5);
-        configMap.put("timestamp", String.valueOf(timestamp));
-        configMap.put("nonce", "NONCE");
-        configMap.put("password", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464");
-        String format = String.format(url, "99", DateUtils.getDate("yyyyMMdd"), timestamp, "NONCE", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464", getSHA1(configMap));
-//        String sign = getSHA1(configMap);
-//        String httpUrl = format
-//                + "?timestamp=" + timestamp
-//                + "&nonce=" + "NONCE"
-//                + "&password=" + "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464"
-//                + "&sign=" + sign;
-        Object forObject = restTemplate1.getForObject(format, Object.class);
-    }
+//    public static void main(String[] args) throws Exception {
+//        RestTemplate restTemplate1 = new RestTemplate();
+////        String url = "http://101.95.136.206:9089/webservice/rest/person/company/%s";
+//        String url = "http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
+//
+//        long timestamp = System.currentTimeMillis();
+//        Map<String, String> configMap = new HashMap<>(5);
+//        configMap.put("timestamp", String.valueOf(timestamp));
+//        configMap.put("nonce", "NONCE");
+//        configMap.put("password", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464");
+//        String format = String.format(url, "99", DateUtils.getDate("yyyyMMdd"), timestamp, "NONCE", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464", getSHA1(configMap));
+////        String sign = getSHA1(configMap);
+////        String httpUrl = format
+////                + "?timestamp=" + timestamp
+////                + "&nonce=" + "NONCE"
+////                + "&password=" + "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464"
+////                + "&sign=" + sign;
+//        Object forObject = restTemplate1.getForObject(format, Object.class);
+//    }
     @Override
     public void afterPropertiesSet() throws Exception {
@@ -187,6 +210,8 @@ public class DriverJob implements InitializingBean {
         PASSWORD = password;
         RESTTEMPLATE = restTemplate;
         DRIVER_SERVICE = driverService;
+        REDIS_CACHE = redisCache;
         GET_SCHEDULING_INFO_URL = getSchedulingInfoUrl;
+
     }
 }
@@ -14,10 +14,11 @@ import java.util.List;
 @Data
 public class ResponseScheduling {
-    private long id;
+    private Long id;
     private Date scheduleDate;
     private String lineName;
     private String lineCode;
+    private String jobCode;
     private String lpName;
     private String nbbm;
     private String jsy;
@@ -27,18 +28,18 @@ public class ResponseScheduling {
     private String qdzName;
     private String zdzCode;
     private String zdzName;
-    private long fcsjT;
-    private long dfsjT;
-    private long zdsjT;
-    private long fcsjActualTime;
-    private long zdsjActualTime;
-    private double jhlc;
-    private double jhlcOrig;
-    private int bcsj;
+    private Long fcsjT;
+    private Long dfsjT;
+    private Long zdsjT;
+    private Long fcsjActualTime;
+    private Long zdsjActualTime;
+    private Double jhlc;
+    private Double jhlcOrig;
+    private Integer bcsj;
     private String bcType;
-    private int status;
+    private Integer status;
     private String adjustExps;
-    private boolean sflj;
+    private Boolean sflj;
     private String remarks;
-    private List<CTasks> cTasks;
+//    private List<CTasks> cTasks;
 }
 \ No newline at end of file
+package com.ruoyi.redispre;
+
+/**
+ * @author 20412
+ */
+public interface GlobalRedisPreName {
+    String DRIVER_SCHEDULING_PRE = "driver:scheduling:";
+}
@@ -75,7 +75,8 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: 1.14.107.94
+#      host: 1.14.107.94
+      host: 121.41.83.61
       database: 0
       password: "guzijian"
       port: 6379
@@ -150,6 +151,7 @@ api:
     # 获取排班信息
     getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
   config:
+    # 固定密码
     password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
     # 随机字符串
     nonce: adfsad
 \ No newline at end of file
@@ -146,5 +146,4 @@ api:
   config:
     password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
     # 随机字符串
-    nonce: adfsad
-
+    nonce: adfsad
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.driver.mapper.DriverMapper">
-    
+
     <resultMap type="Driver" id="DriverResult">
-        <result property="id"    column="id"    />
-        <result property="jobCode"    column="job_code"    />
-        <result property="companyCode"    column="company_code"    />
-        <result property="brancheCompanyCode"    column="branche_company_code"    />
-        <result property="personnelName"    column="personnel_name"    />
-        <result property="papersCode"    column="papers_code"    />
-        <result property="icCardCode"    column="ic_card_code"    />
-        <result property="personnelType"    column="personnel_type"    />
-        <result property="posts"    column="posts"    />
-        <result property="card"    column="card"    />
-        <result property="telphone"    column="telphone"    />
-        <result property="icRfid"    column="ic_rfid"    />
-        <result property="idRfid"    column="id_rfid"    />
-        <result property="tagRfid"    column="tag_rfid"    />
-        <result property="remark"    column="remark"    />
-        <result property="lineName"    column="line_name"    />
-        <result property="lineCode"    column="line_code"    />
+        <result property="id" column="id"/>
+        <result property="jobCode" column="job_code"/>
+        <result property="companyCode" column="company_code"/>
+        <result property="brancheCompanyCode" column="branche_company_code"/>
+        <result property="personnelName" column="personnel_name"/>
+        <result property="papersCode" column="papers_code"/>
+        <result property="icCardCode" column="ic_card_code"/>
+        <result property="personnelType" column="personnel_type"/>
+        <result property="posts" column="posts"/>
+        <result property="card" column="card"/>
+        <result property="telphone" column="telphone"/>
+        <result property="icRfid" column="ic_rfid"/>
+        <result property="idRfid" column="id_rfid"/>
+        <result property="tagRfid" column="tag_rfid"/>
+        <result property="remark" column="remark"/>
+        <result property="lineName" column="line_name"/>
+        <result property="lineCode" column="line_code"/>
     </resultMap>
     <sql id="selectDriverVo">
-        select id, job_code, company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code from driver
+        select id,
+               job_code,
+               company_code,
+               branche_company_code,
+               personnel_name,
+               papers_code,
+               ic_card_code,
+               personnel_type,
+               posts,
+               card,
+               telphone,
+               ic_rfid,
+               id_rfid,
+               tag_rfid,
+               remark,
+               line_name,
+               line_code
+        from driver
     </sql>
     <sql id="insertDriverVo">
-        job_code, company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code
+        job_code
+        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code
     </sql>
     <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
         <include refid="selectDriverVo"/>
-        <where>  
-            <if test="jobCode != null  and jobCode != ''"> and job_code = #{jobCode}</if>
-            <if test="companyCode != null  and companyCode != ''"> and company_code = #{companyCode}</if>
-            <if test="brancheCompanyCode != null  and brancheCompanyCode != ''"> and branche_company_code = #{brancheCompanyCode}</if>
-            <if test="personnelName != null  and personnelName != ''"> and personnel_name like concat('%', #{personnelName}, '%')</if>
-            <if test="papersCode != null  and papersCode != ''"> and papers_code = #{papersCode}</if>
-            <if test="icCardCode != null  and icCardCode != ''"> and ic_card_code = #{icCardCode}</if>
-            <if test="personnelType != null  and personnelType != ''"> and personnel_type = #{personnelType}</if>
-            <if test="posts != null  and posts != ''"> and posts = #{posts}</if>
-            <if test="card != null  and card != ''"> and card = #{card}</if>
-            <if test="telphone != null  and telphone != ''"> and telphone = #{telphone}</if>
-            <if test="icRfid != null  and icRfid != ''"> and ic_rfid = #{icRfid}</if>
-            <if test="idRfid != null  and idRfid != ''"> and id_rfid = #{idRfid}</if>
-            <if test="tagRfid != null  and tagRfid != ''"> and tag_rfid = #{tagRfid}</if>
-            <if test="lineName != null  and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
-            <if test="lineCode != null  and lineCode != ''"> and line_code = #{lineCode}</if>
+        <where>
+            <if test="jobCode != null  and jobCode != ''">and job_code = #{jobCode}</if>
+            <if test="companyCode != null  and companyCode != ''">and company_code = #{companyCode}</if>
+            <if test="brancheCompanyCode != null  and brancheCompanyCode != ''">and branche_company_code =
+                #{brancheCompanyCode}
+            </if>
+            <if test="personnelName != null  and personnelName != ''">and personnel_name like concat('%',
+                #{personnelName}, '%')
+            </if>
+            <if test="papersCode != null  and papersCode != ''">and papers_code = #{papersCode}</if>
+            <if test="icCardCode != null  and icCardCode != ''">and ic_card_code = #{icCardCode}</if>
+            <if test="personnelType != null  and personnelType != ''">and personnel_type = #{personnelType}</if>
+            <if test="posts != null  and posts != ''">and posts = #{posts}</if>
+            <if test="card != null  and card != ''">and card = #{card}</if>
+            <if test="telphone != null  and telphone != ''">and telphone = #{telphone}</if>
+            <if test="icRfid != null  and icRfid != ''">and ic_rfid = #{icRfid}</if>
+            <if test="idRfid != null  and idRfid != ''">and id_rfid = #{idRfid}</if>
+            <if test="tagRfid != null  and tagRfid != ''">and tag_rfid = #{tagRfid}</if>
+            <if test="lineName != null  and lineName != ''">and line_name like concat('%', #{lineName}, '%')</if>
+            <if test="lineCode != null  and lineCode != ''">and line_code = #{lineCode}</if>
         </where>
     </select>
-    
+
     <select id="selectDriverById" parameterType="Long" resultMap="DriverResult">
         <include refid="selectDriverVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -76,7 +98,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="remark != null">remark,</if>
             <if test="lineName != null">line_name,</if>
             <if test="lineCode != null">line_code,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
             <if test="companyCode != null and companyCode != ''">#{companyCode},</if>
@@ -94,7 +116,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="remark != null">#{remark},</if>
             <if test="lineName != null">#{lineName},</if>
             <if test="lineCode != null">#{lineCode},</if>
-         </trim>
+        </trim>
     </insert>
     <update id="updateDriver" parameterType="Driver">
@@ -119,13 +141,58 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </trim>
         where id = #{id}
     </update>
+    <insert id="saveDriverScheduling">
+        INSERT INTO driver_scheduling (
+        id, scheduleDate, lineName, lineCode, lpName,
+        nbbm, job_code,jsy, spy, upDown, qdzCode,
+        qdzName, zdzCode, zdzName, fcsjT, dfsjT,
+        zdsjT, fcsjActualTime, zdsjActualTime,
+        jhlc, jhlcOrig, bcsj, bcType, status, adjustExps,
+        sflj, remarks)
+        values
+        <foreach collection="responseSchedulings" item="item" index="index" separator=",">
+            (
+            #{item.id},
+            #{item.scheduleDate},
+            #{item.lineName,jdbcType=VARCHAR},
+            #{item.lineCode,jdbcType=VARCHAR},
+            #{item.lpName,jdbcType=VARCHAR},
+            #{item.nbbm,jdbcType=VARCHAR},
+            #{item.jobCode,jdbcType=VARCHAR},
+            #{item.jsy,jdbcType=VARCHAR},
+            #{item.spy,jdbcType=VARCHAR},
+            #{item.upDown,jdbcType=VARCHAR},
+            #{item.qdzCode,jdbcType=VARCHAR},
+            #{item.qdzName,jdbcType=VARCHAR},
+            #{item.zdzCode,jdbcType=VARCHAR},
+            #{item.zdzName,jdbcType=VARCHAR},
+            #{item.fcsjT},
+            #{item.dfsjT},
+            #{item.zdsjT},
+            #{item.fcsjActualTime},
+            #{item.zdsjActualTime},
+            #{item.jhlc,jdbcType=VARCHAR},
+            #{item.jhlcOrig,jdbcType=VARCHAR},
+            #{item.bcsj,jdbcType=VARCHAR},
+            #{item.bcType,jdbcType=VARCHAR},
+            #{item.status,jdbcType=VARCHAR},
+            #{item.adjustExps,jdbcType=VARCHAR},
+            #{item.sflj,jdbcType=VARCHAR},
+            #{item.remarks,jdbcType=VARCHAR}
+            )
+        </foreach>
+        on duplicate key update
+        job_code = values(job_code)
+    </insert>
     <delete id="deleteDriverById" parameterType="Long">
-        delete from driver where id = #{id}
+        delete
+        from driver
+        where id = #{id}
     </delete>
     <delete id="deleteDriverByIds" parameterType="String">
-        delete from driver where id in 
+        delete from driver where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
@@ -18,59 +19,54 @@ import org.springframework.stereotype.Component;
  *
  * @author ruoyi
  **/
-@SuppressWarnings(value = { "unchecked", "rawtypes" })
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
 @Component
-public class RedisCache
-{
+public class RedisCache {
     @Autowired
     public RedisTemplate redisTemplate;
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
+     * @param key   缓存的键值
      * @param value 缓存的值
      */
-    public <T> void setCacheObject(final String key, final T value)
-    {
+    public <T> void setCacheObject(final String key, final T value) {
         redisTemplate.opsForValue().set(key, value);
     }
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
-     * @param value 缓存的值
-     * @param timeout 时间
+     * @param key      缓存的键值
+     * @param value    缓存的值
+     * @param timeout  时间
      * @param timeUnit 时间颗粒度
      */
-    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
-    {
+    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout)
-    {
+    public boolean expire(final String key, final long timeout) {
         return expire(key, timeout, TimeUnit.SECONDS);
     }
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
-     * @param unit 时间单位
+     * @param unit    时间单位
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit)
-    {
+    public boolean expire(final String key, final long timeout, final TimeUnit unit) {
         return redisTemplate.expire(key, timeout, unit);
     }
@@ -80,8 +76,7 @@ public class RedisCache
      * @param key Redis键
      * @return 有效时间
      */
-    public long getExpire(final String key)
-    {
+    public long getExpire(final String key) {
         return redisTemplate.getExpire(key);
     }
@@ -91,8 +86,7 @@ public class RedisCache
      * @param key 键
      * @return true 存在 false不存在
      */
-    public Boolean hasKey(String key)
-    {
+    public Boolean hasKey(String key) {
         return redisTemplate.hasKey(key);
     }
@@ -102,8 +96,7 @@ public class RedisCache
      * @param key 缓存键值
      * @return 缓存键值对应的数据
      */
-    public <T> T getCacheObject(final String key)
-    {
+    public <T> T getCacheObject(final String key) {
         ValueOperations<String, T> operation = redisTemplate.opsForValue();
         return operation.get(key);
     }
@@ -113,8 +106,7 @@ public class RedisCache
      *
      * @param key
      */
-    public boolean deleteObject(final String key)
-    {
+    public boolean deleteObject(final String key) {
         return redisTemplate.delete(key);
     }
@@ -124,20 +116,18 @@ public class RedisCache
      * @param collection 多个对象
      * @return
      */
-    public boolean deleteObject(final Collection collection)
-    {
+    public boolean deleteObject(final Collection collection) {
         return redisTemplate.delete(collection) > 0;
     }
     /**
      * 缓存List数据
      *
-     * @param key 缓存的键值
+     * @param key      缓存的键值
      * @param dataList 待缓存的List数据
      * @return 缓存的对象
      */
-    public <T> long setCacheList(final String key, final List<T> dataList)
-    {
+    public <T> long setCacheList(final String key, final List<T> dataList) {
         Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
         return count == null ? 0 : count;
     }
@@ -148,24 +138,21 @@ public class RedisCache
      * @param key 缓存的键值
      * @return 缓存键值对应的数据
      */
-    public <T> List<T> getCacheList(final String key)
-    {
+    public <T> List<T> getCacheList(final String key) {
         return redisTemplate.opsForList().range(key, 0, -1);
     }
     /**
      * 缓存Set
      *
-     * @param key 缓存键值
+     * @param key     缓存键值
      * @param dataSet 缓存的数据
      * @return 缓存数据的对象
      */
-    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
-    {
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
         BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
         Iterator<T> it = dataSet.iterator();
-        while (it.hasNext())
-        {
+        while (it.hasNext()) {
             setOperation.add(it.next());
         }
         return setOperation;
@@ -177,8 +164,7 @@ public class RedisCache
      * @param key
      * @return
      */
-    public <T> Set<T> getCacheSet(final String key)
-    {
+    public <T> Set<T> getCacheSet(final String key) {
         return redisTemplate.opsForSet().members(key);
     }
@@ -188,10 +174,25 @@ public class RedisCache
      * @param key
      * @param dataMap
      */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
-    {
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
+        if (dataMap != null) {
+            redisTemplate.opsForHash().putAll(key, dataMap);
+        }
+    }
+
+    /**
+     * 缓存map并设置key
+     *
+     * @param key
+     * @param dataMap
+     * @param timeOut
+     * @param timeUnit
+     * @param <T>
+     */
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap, long timeOut, TimeUnit timeUnit) {
         if (dataMap != null) {
             redisTemplate.opsForHash().putAll(key, dataMap);
+            redisTemplate.expire(key, timeOut, timeUnit);
         }
     }
@@ -201,32 +202,41 @@ public class RedisCache
      * @param key
      * @return
      */
-    public <T> Map<String, T> getCacheMap(final String key)
-    {
+    public <T> Map<String, T> getCacheMap(final String key) {
         return redisTemplate.opsForHash().entries(key);
     }
     /**
      * 往Hash中存入数据
      *
-     * @param key Redis键
-     * @param hKey Hash键
+     * @param key   Redis键
+     * @param hKey  Hash键
      * @param value 值
      */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
-    {
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
         redisTemplate.opsForHash().put(key, hKey, value);
     }
     /**
+     * 往Hash中存入数据 并设置过期时间
+     *
+     * @param key   Redis键
+     * @param hKey  Hash键
+     * @param value 值
+     */
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value, long timeOut, TimeUnit timeUnit) {
+        redisTemplate.opsForHash().put(key, hKey, value);
+        redisTemplate.expire(key,timeOut,timeUnit);
+    }
+
+    /**
      * 获取Hash中的数据
      *
-     * @param key Redis键
+     * @param key  Redis键
      * @param hKey Hash键
      * @return Hash中的对象
      */
-    public <T> T getCacheMapValue(final String key, final String hKey)
-    {
+    public <T> T getCacheMapValue(final String key, final String hKey) {
         HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
         return opsForHash.get(key, hKey);
     }
@@ -234,24 +244,22 @@ public class RedisCache
     /**
      * 获取多个Hash中的数据
      *
-     * @param key Redis键
+     * @param key   Redis键
      * @param hKeys Hash键集合
      * @return Hash对象集合
      */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
-    {
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
         return redisTemplate.opsForHash().multiGet(key, hKeys);
     }
     /**
      * 删除Hash中的某条数据
      *
-     * @param key Redis键
+     * @param key  Redis键
      * @param hKey Hash键
      * @return 是否成功
      */
-    public boolean deleteCacheMapValue(final String key, final String hKey)
-    {
+    public boolean deleteCacheMapValue(final String key, final String hKey) {
         return redisTemplate.opsForHash().delete(key, hKey) > 0;
     }
@@ -261,8 +269,7 @@ public class RedisCache
      * @param pattern 字符串前缀
      * @return 对象列表
      */
-    public Collection<String> keys(final String pattern)
-    {
+    public Collection<String> keys(final String pattern) {
         return redisTemplate.keys(pattern);
     }
 }