feat: add new ability

guzijian
1 parent 17185d55
Showing 27 changed files with 992 additions and 453 deletions
docker-compose.yml
ruoyi-admin/admin-dockerfile
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/config/RestTemplateConfig.java
ruoyi-admin/src/main/java/com/ruoyi/controller/FeiAoController.java
ruoyi-admin/src/main/java/com/ruoyi/system/controller/TestHhhController.java → ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/TestHhhMapper.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/system/service/impl/TestHhhServiceImpl.java → ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/system/domain/TestHhh.java
ruoyi-admin/src/main/java/com/ruoyi/system/service/ITestHhhService.java
ruoyi-admin/src/main/java/com/ruoyi/utils/ListUtils.java
ruoyi-admin/src/main/resources/application-druid-dev.yml
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/application-druid-uat.yml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/mapper/TestHhhMapper.xml
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -8,6 +8,7 @@ services:
         server_name: ruoyi-admin
         # 环境
         env_name: druid-uat
+        path: ./ruoyi-admin/triger/*.jar
       context: .
       dockerfile: ./ruoyi-admin/admin-dockerfile
     volumes:
@@ -5,8 +5,10 @@ MAINTAINER guzijian
 ARG server_name
 # 启动环境
 ARG env_name
+ARG path
 # 获取参数
 ENV jar_name=$server_name
+ENV path_url=$path
 # 获取环境
 ENV env_file=$env_name
 # 抽取常量
@@ -16,6 +18,6 @@ RUN mkdir -p ${jar_home}
 # 指定工作区
 WORKDIR ${jar_home}
 # 把jar包复制到容器内
-ADD target/*.jar ${jar_home}${jar_name}.jar
+ADD ${path_url} ${jar_home}${jar_name}.jar
 # 执行命令
 ENTRYPOINT java -jar ${jar_home}${jar_name}.jar --spring.profile.active=${env_file}
 \ No newline at end of file
@@ -55,6 +55,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-quartz</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <!-- 代码生成-->
         <dependency>
+package com.ruoyi.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author 20412
+ */
+@Configuration
+public class RestTemplateConfig {
+    @Bean
+    public RestTemplate getRestTemplate(){
+        return new RestTemplate();
+    }
+}
-package com.ruoyi.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author 20412
- */
-@RestController
-@RequestMapping("/api")
-public class FeiAoController {
-
-    @RequestMapping(value = "/test",method = RequestMethod.GET)
-    public String test(){
-        return "测试";
-    }
-}
-package com.ruoyi.system.controller;
+package com.ruoyi.driver.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -16,89 +16,89 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.TestHhh;
-import com.ruoyi.system.service.ITestHhhService;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 /**
- * ceshiController
+ * 驾驶员信息Controller
  * 
- * @author ruoyi
- * @date 2023-06-27
+ * @author 古自健
+ * @date 2023-07-02
  */
 @RestController
-@RequestMapping("/system/hhh")
-public class TestHhhController extends BaseController
+@RequestMapping("/driver/driver")
+public class DriverController extends BaseController
 {
     @Autowired
-    private ITestHhhService testHhhService;
+    private IDriverService driverService;
     /**
-     * 查询ceshi列表
+     * 查询驾驶员信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:hhh:list')")
+    @PreAuthorize("@ss.hasPermi('driver:driver:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TestHhh testHhh)
+    public TableDataInfo list(Driver driver)
     {
         startPage();
-        List<TestHhh> list = testHhhService.selectTestHhhList(testHhh);
+        List<Driver> list = driverService.selectDriverList(driver);
         return getDataTable(list);
     }
     /**
-     * 导出ceshi列表
+     * 导出驾驶员信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:hhh:export')")
-    @Log(title = "ceshi", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('driver:driver:export')")
+    @Log(title = "驾驶员信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TestHhh testHhh)
+    public void export(HttpServletResponse response, Driver driver)
     {
-        List<TestHhh> list = testHhhService.selectTestHhhList(testHhh);
-        ExcelUtil<TestHhh> util = new ExcelUtil<TestHhh>(TestHhh.class);
-        util.exportExcel(response, list, "ceshi数据");
+        List<Driver> list = driverService.selectDriverList(driver);
+        ExcelUtil<Driver> util = new ExcelUtil<Driver>(Driver.class);
+        util.exportExcel(response, list, "驾驶员信息数据");
     }
     /**
-     * 获取ceshi详细信息
+     * 获取驾驶员信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hhh:query')")
+    @PreAuthorize("@ss.hasPermi('driver:driver:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(testHhhService.selectTestHhhById(id));
+        return success(driverService.selectDriverById(id));
     }
     /**
-     * 新增ceshi
+     * 新增驾驶员信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hhh:add')")
-    @Log(title = "ceshi", businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('driver:driver:add')")
+    @Log(title = "驾驶员信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TestHhh testHhh)
+    public AjaxResult add(@RequestBody Driver driver)
     {
-        return toAjax(testHhhService.insertTestHhh(testHhh));
+        return toAjax(driverService.insertDriver(driver));
     }
     /**
-     * 修改ceshi
+     * 修改驾驶员信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hhh:edit')")
-    @Log(title = "ceshi", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('driver:driver:edit')")
+    @Log(title = "驾驶员信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TestHhh testHhh)
+    public AjaxResult edit(@RequestBody Driver driver)
     {
-        return toAjax(testHhhService.updateTestHhh(testHhh));
+        return toAjax(driverService.updateDriver(driver));
     }
     /**
-     * 删除ceshi
+     * 删除驾驶员信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hhh:remove')")
-    @Log(title = "ceshi", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('driver:driver:remove')")
+    @Log(title = "驾驶员信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(testHhhService.deleteTestHhhByIds(ids));
+        return toAjax(driverService.deleteDriverByIds(ids));
     }
 }
+package com.ruoyi.driver.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 驾驶员信息对象 driver
+ * 
+ * @author 古自健
+ * @date 2023-07-02
+ */
+public class Driver extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 工号 */
+    @Excel(name = "工号")
+    private String jobCode;
+
+    /** 公司编码 */
+    @Excel(name = "公司编码")
+    private String companyCode;
+
+    /** 分公司编码 */
+    @Excel(name = "分公司编码")
+    private String brancheCompanyCode;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String personnelName;
+
+    /** 运营服务证书号 */
+    @Excel(name = "运营服务证书号")
+    private String papersCode;
+
+    /** 一卡通工作卡号 */
+    @Excel(name = "一卡通工作卡号")
+    private String icCardCode;
+
+    /** 性别 */
+    @Excel(name = "性别")
+    private String personnelType;
+
+    /** 所属岗位/工种 */
+    @Excel(name = "所属岗位/工种")
+    private String posts;
+
+    /** 身份证 */
+    @Excel(name = "身份证")
+    private String card;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telphone;
+
+    /** RFID 人卡IC号 */
+    @Excel(name = "RFID 人卡IC号")
+    private String icRfid;
+
+    /** RFID 人卡ID号（10进制） */
+    @Excel(name = "RFID 人卡ID号", readConverterExp = "1=0进制")
+    private String idRfid;
+
+    /** RFID 标签号 */
+    @Excel(name = "RFID 标签号")
+    private String tagRfid;
+
+    /** 线路名称 */
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    /** 线路编码 */
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setJobCode(String jobCode) 
+    {
+        this.jobCode = jobCode;
+    }
+
+    public String getJobCode() 
+    {
+        return jobCode;
+    }
+    public void setCompanyCode(String companyCode) 
+    {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyCode() 
+    {
+        return companyCode;
+    }
+    public void setBrancheCompanyCode(String brancheCompanyCode) 
+    {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
+
+    public String getBrancheCompanyCode() 
+    {
+        return brancheCompanyCode;
+    }
+    public void setPersonnelName(String personnelName) 
+    {
+        this.personnelName = personnelName;
+    }
+
+    public String getPersonnelName() 
+    {
+        return personnelName;
+    }
+    public void setPapersCode(String papersCode) 
+    {
+        this.papersCode = papersCode;
+    }
+
+    public String getPapersCode() 
+    {
+        return papersCode;
+    }
+    public void setIcCardCode(String icCardCode) 
+    {
+        this.icCardCode = icCardCode;
+    }
+
+    public String getIcCardCode() 
+    {
+        return icCardCode;
+    }
+    public void setPersonnelType(String personnelType) 
+    {
+        this.personnelType = personnelType;
+    }
+
+    public String getPersonnelType() 
+    {
+        return personnelType;
+    }
+    public void setPosts(String posts) 
+    {
+        this.posts = posts;
+    }
+
+    public String getPosts() 
+    {
+        return posts;
+    }
+    public void setCard(String card) 
+    {
+        this.card = card;
+    }
+
+    public String getCard() 
+    {
+        return card;
+    }
+    public void setTelphone(String telphone) 
+    {
+        this.telphone = telphone;
+    }
+
+    public String getTelphone() 
+    {
+        return telphone;
+    }
+    public void setIcRfid(String icRfid) 
+    {
+        this.icRfid = icRfid;
+    }
+
+    public String getIcRfid() 
+    {
+        return icRfid;
+    }
+    public void setIdRfid(String idRfid) 
+    {
+        this.idRfid = idRfid;
+    }
+
+    public String getIdRfid() 
+    {
+        return idRfid;
+    }
+    public void setTagRfid(String tagRfid) 
+    {
+        this.tagRfid = tagRfid;
+    }
+
+    public String getTagRfid() 
+    {
+        return tagRfid;
+    }
+    public void setLineName(String lineName) 
+    {
+        this.lineName = lineName;
+    }
+
+    public String getLineName() 
+    {
+        return lineName;
+    }
+    public void setLineCode(String lineCode) 
+    {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineCode() 
+    {
+        return lineCode;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("jobCode", getJobCode())
+            .append("companyCode", getCompanyCode())
+            .append("brancheCompanyCode", getBrancheCompanyCode())
+            .append("personnelName", getPersonnelName())
+            .append("papersCode", getPapersCode())
+            .append("icCardCode", getIcCardCode())
+            .append("personnelType", getPersonnelType())
+            .append("posts", getPosts())
+            .append("card", getCard())
+            .append("telphone", getTelphone())
+            .append("icRfid", getIcRfid())
+            .append("idRfid", getIdRfid())
+            .append("tagRfid", getTagRfid())
+            .append("remark", getRemark())
+            .append("lineName", getLineName())
+            .append("lineCode", getLineCode())
+            .toString();
+    }
+}
-package com.ruoyi.system.mapper;
+package com.ruoyi.driver.mapper;
 import java.util.List;
-import com.ruoyi.system.domain.TestHhh;
+import com.ruoyi.driver.domain.Driver;
+import org.apache.ibatis.annotations.Param;
 /**
- * ceshiMapper接口
+ * 驾驶员信息Mapper接口
  * 
- * @author ruoyi
- * @date 2023-06-27
+ * @author 古自健
+ * @date 2023-07-02
  */
-public interface TestHhhMapper 
+public interface DriverMapper 
 {
     /**
-     * 查询ceshi
+     * 查询驾驶员信息
      * 
-     * @param id ceshi主键
-     * @return ceshi
+     * @param id 驾驶员信息主键
+     * @return 驾驶员信息
      */
-    public TestHhh selectTestHhhById(Long id);
+    public Driver selectDriverById(Long id);
     /**
-     * 查询ceshi列表
+     * 查询驾驶员信息列表
      * 
-     * @param testHhh ceshi
-     * @return ceshi集合
+     * @param driver 驾驶员信息
+     * @return 驾驶员信息集合
      */
-    public List<TestHhh> selectTestHhhList(TestHhh testHhh);
+    public List<Driver> selectDriverList(Driver driver);
     /**
-     * 新增ceshi
+     * 新增驾驶员信息
      * 
-     * @param testHhh ceshi
+     * @param driver 驾驶员信息
      * @return 结果
      */
-    public int insertTestHhh(TestHhh testHhh);
+    public int insertDriver(Driver driver);
     /**
-     * 修改ceshi
+     * 修改驾驶员信息
      * 
-     * @param testHhh ceshi
+     * @param driver 驾驶员信息
      * @return 结果
      */
-    public int updateTestHhh(TestHhh testHhh);
+    public int updateDriver(Driver driver);
     /**
-     * 删除ceshi
+     * 删除驾驶员信息
      * 
-     * @param id ceshi主键
+     * @param id 驾驶员信息主键
      * @return 结果
      */
-    public int deleteTestHhhById(Long id);
+    public int deleteDriverById(Long id);
     /**
-     * 批量删除ceshi
+     * 批量删除驾驶员信息
      * 
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteTestHhhByIds(Long[] ids);
+    public int deleteDriverByIds(Long[] ids);
+
+    /**
+     * 批量保存
+     * @param drivers
+     */
+    void saveDrivers(@Param("drivers") List<Driver> drivers);
 }
+package com.ruoyi.driver.service;
+
+import java.util.List;
+import com.ruoyi.driver.domain.Driver;
+
+/**
+ * 驾驶员信息Service接口
+ * 
+ * @author 古自健
+ * @date 2023-07-02
+ */
+public interface IDriverService
+{
+    /**
+     * 查询驾驶员信息
+     * 
+     * @param id 驾驶员信息主键
+     * @return 驾驶员信息
+     */
+    public Driver selectDriverById(Long id);
+
+    /**
+     * 查询驾驶员信息列表
+     * 
+     * @param driver 驾驶员信息
+     * @return 驾驶员信息集合
+     */
+    public List<Driver> selectDriverList(Driver driver);
+
+    /**
+     * 新增驾驶员信息
+     * 
+     * @param driver 驾驶员信息
+     * @return 结果
+     */
+    public int insertDriver(Driver driver);
+
+    /**
+     * 修改驾驶员信息
+     * 
+     * @param driver 驾驶员信息
+     * @return 结果
+     */
+    public int updateDriver(Driver driver);
+
+    /**
+     * 批量删除驾驶员信息
+     * 
+     * @param ids 需要删除的驾驶员信息主键集合
+     * @return 结果
+     */
+    public int deleteDriverByIds(Long[] ids);
+
+    /**
+     * 删除驾驶员信息信息
+     * 
+     * @param id 驾驶员信息主键
+     * @return 结果
+     */
+    public int deleteDriverById(Long id);
+
+    /**
+     * 批量加入数据
+     * @param drivers
+     */
+    void insertDrivers(List<Driver> drivers);
+}
-package com.ruoyi.system.service.impl;
+package com.ruoyi.driver.service.impl;
 import java.util.List;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.TestHhhMapper;
-import com.ruoyi.system.domain.TestHhh;
-import com.ruoyi.system.service.ITestHhhService;
+import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.service.IDriverService;
 /**
- * ceshiService业务层处理
+ * 驾驶员信息Service业务层处理
  * 
- * @author ruoyi
- * @date 2023-06-27
+ * @author 古自健
+ * @date 2023-07-02
  */
 @Service
-public class TestHhhServiceImpl implements ITestHhhService 
+public class DriverServiceImpl implements IDriverService
 {
     @Autowired
-    private TestHhhMapper testHhhMapper;
+    private DriverMapper driverMapper;
     /**
-     * 查询ceshi
+     * 查询驾驶员信息
      * 
-     * @param id ceshi主键
-     * @return ceshi
+     * @param id 驾驶员信息主键
+     * @return 驾驶员信息
      */
     @Override
-    public TestHhh selectTestHhhById(Long id)
+    public Driver selectDriverById(Long id)
     {
-        return testHhhMapper.selectTestHhhById(id);
+        return driverMapper.selectDriverById(id);
     }
     /**
-     * 查询ceshi列表
+     * 查询驾驶员信息列表
      * 
-     * @param testHhh ceshi
-     * @return ceshi
+     * @param driver 驾驶员信息
+     * @return 驾驶员信息
      */
     @Override
-    public List<TestHhh> selectTestHhhList(TestHhh testHhh)
+    public List<Driver> selectDriverList(Driver driver)
     {
-        return testHhhMapper.selectTestHhhList(testHhh);
+        return driverMapper.selectDriverList(driver);
     }
     /**
-     * 新增ceshi
+     * 新增驾驶员信息
      * 
-     * @param testHhh ceshi
+     * @param driver 驾驶员信息
      * @return 结果
      */
     @Override
-    public int insertTestHhh(TestHhh testHhh)
+    public int insertDriver(Driver driver)
     {
-        return testHhhMapper.insertTestHhh(testHhh);
+        return driverMapper.insertDriver(driver);
     }
     /**
-     * 修改ceshi
+     * 修改驾驶员信息
      * 
-     * @param testHhh ceshi
+     * @param driver 驾驶员信息
      * @return 结果
      */
     @Override
-    public int updateTestHhh(TestHhh testHhh)
+    public int updateDriver(Driver driver)
     {
-        return testHhhMapper.updateTestHhh(testHhh);
+        return driverMapper.updateDriver(driver);
     }
     /**
-     * 批量删除ceshi
+     * 批量删除驾驶员信息
      * 
-     * @param ids 需要删除的ceshi主键
+     * @param ids 需要删除的驾驶员信息主键
      * @return 结果
      */
     @Override
-    public int deleteTestHhhByIds(Long[] ids)
+    public int deleteDriverByIds(Long[] ids)
     {
-        return testHhhMapper.deleteTestHhhByIds(ids);
+        return driverMapper.deleteDriverByIds(ids);
     }
     /**
-     * 删除ceshi信息
+     * 删除驾驶员信息信息
      * 
-     * @param id ceshi主键
+     * @param id 驾驶员信息主键
      * @return 结果
      */
     @Override
-    public int deleteTestHhhById(Long id)
+    public int deleteDriverById(Long id)
     {
-        return testHhhMapper.deleteTestHhhById(id);
+        return driverMapper.deleteDriverById(id);
     }
+
+    @Override
+    public void insertDrivers(List<Driver> drivers) {
+        driverMapper.saveDrivers(drivers);
+    }
+
 }
+package com.ruoyi.job;
+
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.service.IDriverService;
+import com.ruoyi.utils.ListUtils;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Component;
+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;
+
+/**
+ * 该定时任务用户获取驾驶员信息
+ *
+ * @author 20412
+ */
+@Component("driverJob")
+public class DriverJob implements InitializingBean {
+
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private IDriverService driverService;
+
+    @Value("${api.url.getDriverInfo}")
+    private String getDriverInfoUrl;
+
+    @Value("${api.config.password}")
+    private String password;
+
+    @Value("${api.config.nonce}")
+    private String nonce;
+
+    private static IDriverService DRIVER_SERVICE;
+    private static RestTemplate RESTTEMPLATE;
+
+    private static String GET_DRIVER_INFO_URL;
+
+    private static String PASSWORD;
+
+    private static String NONCE;
+
+    /**
+     * 通过该定时任务获取驾驶员信息 并保存到数据库
+     */
+    public void getDriverInfo(String params) throws Exception {
+        try {
+            String format = String.format(GET_DRIVER_INFO_URL, params);
+            Map<String, String> configMap = new HashMap<>(5);
+            long timestamp = System.currentTimeMillis();
+            configMap.put("timestamp", String.valueOf(timestamp));
+            configMap.put("nonce", NONCE);
+            configMap.put("password", PASSWORD);
+            String sign = getSHA1(configMap);
+            String url = format
+                    + "?timestamp=" + timestamp
+                    + "&nonce=" + NONCE
+                    + "&password=" + PASSWORD
+                    + "&sign=" + sign;
+            //生成签名
+            List<Driver> drivers = RESTTEMPLATE.exchange(
+                    url,
+                    HttpMethod.GET,
+                    null,
+                    new ParameterizedTypeReference<List<Driver>>() {
+                    }).getBody();
+            List<List<Driver>> splitList = ListUtils.splitList(drivers, 1000);
+            System.out.println("开始更新数据-----");
+            for (List<Driver> driverList : splitList) {
+                DRIVER_SERVICE.insertDrivers(driverList);
+            }
+            System.out.println("数据更新完毕-----");
+        } catch (Exception e) {
+            System.out.println("执行失败：" + e.getMessage());
+        }
+        System.out.println("执行结束");
+    }
+
+
+    /**
+     * 获取签名
+     *
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    public static String getSHA1(Map<String, String> map) throws Exception {
+        try {
+            String[] array = new String[map.size()];
+            map.values().toArray(array);
+            StringBuffer sb = new StringBuffer();
+            // 字符串排序
+            Arrays.sort(array);
+            for (int i = 0; i < array.length; i++) {
+                sb.append(array[i]);
+            }
+            String str = sb.toString();
+            // SHA1签名生成
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            md.update(str.getBytes());
+            byte[] digest = md.digest();
+            StringBuffer hexstr = new StringBuffer();
+            String shaHex = "";
+            for (int i = 0; i < digest.length; i++) {
+                shaHex = Integer.toHexString(digest[i] & 0xFF);
+                if (shaHex.length() < 2) {
+                    hexstr.append(0);
+                }
+                hexstr.append(shaHex);
+            }
+            return hexstr.toString();
+        } catch (Exception e) {
+            throw e;
+        }
+
+
+    }
+
+//    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 format = String.format(url,"99");
+//        Map<String, String> configMap = new HashMap<>(5);
+//        long timestamp = System.currentTimeMillis();
+//        configMap.put("timestamp", String.valueOf(timestamp));
+//        configMap.put("nonce", "NONCE");
+//        configMap.put("password", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464");
+//        String sign = getSHA1(configMap);
+//        String httpUrl = format
+//                + "?timestamp=" + timestamp
+//                + "&nonce=" + "NONCE"
+//                + "&password=" + "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464"
+//                + "&sign=" + sign;
+//        Object forObject = restTemplate1.getForObject(httpUrl, Object.class);
+//    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        GET_DRIVER_INFO_URL = getDriverInfoUrl;
+        NONCE = nonce;
+        PASSWORD = password;
+        RESTTEMPLATE = restTemplate;
+        DRIVER_SERVICE = driverService;
+    }
+}
-package com.ruoyi.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * ceshi对象 test_hhh
- * 
- * @author ruoyi
- * @date 2023-06-27
- */
-public class TestHhh extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String name;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long age;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setAge(Long age) 
-    {
-        this.age = age;
-    }
-
-    public Long getAge() 
-    {
-        return age;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("age", getAge())
-            .toString();
-    }
-}
-package com.ruoyi.system.service;
-
-import java.util.List;
-import com.ruoyi.system.domain.TestHhh;
-
-/**
- * ceshiService接口
- * 
- * @author ruoyi
- * @date 2023-06-27
- */
-public interface ITestHhhService 
-{
-    /**
-     * 查询ceshi
-     * 
-     * @param id ceshi主键
-     * @return ceshi
-     */
-    public TestHhh selectTestHhhById(Long id);
-
-    /**
-     * 查询ceshi列表
-     * 
-     * @param testHhh ceshi
-     * @return ceshi集合
-     */
-    public List<TestHhh> selectTestHhhList(TestHhh testHhh);
-
-    /**
-     * 新增ceshi
-     * 
-     * @param testHhh ceshi
-     * @return 结果
-     */
-    public int insertTestHhh(TestHhh testHhh);
-
-    /**
-     * 修改ceshi
-     * 
-     * @param testHhh ceshi
-     * @return 结果
-     */
-    public int updateTestHhh(TestHhh testHhh);
-
-    /**
-     * 批量删除ceshi
-     * 
-     * @param ids 需要删除的ceshi主键集合
-     * @return 结果
-     */
-    public int deleteTestHhhByIds(Long[] ids);
-
-    /**
-     * 删除ceshi信息
-     * 
-     * @param id ceshi主键
-     * @return 结果
-     */
-    public int deleteTestHhhById(Long id);
-}
+package com.ruoyi.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 集合工具类
+ * @author 20412
+ */
+public class ListUtils<T>{
+    public static <T> List<List<T>> splitList(List<T> list, int batchSize) {
+        List<List<T>> batchList = new ArrayList<>();
+        for (int i = 0; i < list.size(); i += batchSize) {
+            int endIndex = Math.min(i + batchSize, list.size());
+            List<T> subList = list.subList(i, endIndex);
+            batchList.add(subList);
+        }
+        return batchList;
+    }
+}
@@ -111,8 +111,24 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /ruoyi/ruoyi/uploadPath
+    profile: D:/ruoyi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
-    captchaType: math
 \ No newline at end of file
+    captchaType: math
+mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+api:
+    url:
+        # all 为获取所有驾驶员信息
+        getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+        getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+    config:
+        password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+        # 随机字符串
+        nonce: adfsad
@@ -75,4 +75,20 @@ ruoyi:
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
-    captchaType: math
 \ No newline at end of file
+    captchaType: math
+mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+api:
+    url:
+        # all 为获取所有驾驶员信息
+        getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+        getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+    config:
+        password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+        # 随机字符串
+        nonce: adfsad
 \ No newline at end of file
@@ -115,4 +115,20 @@ ruoyi:
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
-  captchaType: math
 \ No newline at end of file
+  captchaType: math
+mybatis-plus:
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
+api:
+  url:
+    # all 为获取所有驾驶员信息
+    getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+    getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+  config:
+    password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+    # 随机字符串
+    nonce: adfsad
@@ -94,7 +94,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 1440
 # MyBatis配置
 mybatis:
@@ -127,3 +127,21 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+mybatis-plus:
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
+
+api:
+  url:
+    # all 为获取所有驾驶员信息
+    getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+    getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+  config:
+    password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+    # 随机字符串
+    nonce: adfsad
+
-<?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">
-<mapper namespace="com.ruoyi.system.mapper.TestHhhMapper">
-    
-    <resultMap type="TestHhh" id="TestHhhResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="age"    column="age"    />
-    </resultMap>
-
-    <sql id="selectTestHhhVo">
-        select id, name, age from test_hhh
-    </sql>
-
-    <select id="selectTestHhhList" parameterType="TestHhh" resultMap="TestHhhResult">
-        <include refid="selectTestHhhVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="age != null "> and age = #{age}</if>
-        </where>
-    </select>
-    
-    <select id="selectTestHhhById" parameterType="Long" resultMap="TestHhhResult">
-        <include refid="selectTestHhhVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTestHhh" parameterType="TestHhh" useGeneratedKeys="true" keyProperty="id">
-        insert into test_hhh
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="age != null">age,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="age != null">#{age},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTestHhh" parameterType="TestHhh">
-        update test_hhh
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="age != null">age = #{age},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTestHhhById" parameterType="Long">
-        delete from test_hhh where id = #{id}
-    </delete>
-
-    <delete id="deleteTestHhhByIds" parameterType="String">
-        delete from test_hhh where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
 \ 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">
+<mapper namespace="com.ruoyi.driver.mapper.DriverMapper">
+
+    <resultMap type="Driver" id="DriverResult">
+        <result property="id" column="id"/>
+        <result property="jobCode" column="jobCode"/>
+        <result property="companyCode" column="companyCode"/>
+        <result property="brancheCompanyCode" column="brancheCompanyCode"/>
+        <result property="personnelName" column="personnelName"/>
+        <result property="papersCode" column="papersCode"/>
+        <result property="icCardCode" column="icCardCode"/>
+        <result property="personnelType" column="personnelType"/>
+        <result property="posts" column="posts"/>
+        <result property="card" column="card"/>
+        <result property="telphone" column="telphone"/>
+        <result property="icRfid" column="icRfid"/>
+        <result property="idRfid" column="idRfid"/>
+        <result property="tagRfid" column="tagRfid"/>
+        <result property="remark" column="remark"/>
+        <result property="lineName" column="lineName"/>
+        <result property="lineCode" column="lineCode"/>
+    </resultMap>
+
+    <sql id="selectDriverVo">
+        select id,
+               jobCode,
+               companyCode,
+               brancheCompanyCode,
+               personnelName,
+               papersCode,
+               icCardCode,
+               personnelType,
+               posts,
+               card,
+               telphone,
+               icRfid,
+               idRfid,
+               tagRfid,
+               remark,
+               lineName,
+               lineCode
+        from driver
+    </sql>
+
+    <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
+        <include refid="selectDriverVo"/>
+        <where>
+            <if test="jobCode != null  and jobCode != ''">and jobCode = #{jobCode}</if>
+            <if test="companyCode != null  and companyCode != ''">and companyCode = #{companyCode}</if>
+            <if test="brancheCompanyCode != null  and brancheCompanyCode != ''">and brancheCompanyCode =
+                #{brancheCompanyCode}
+            </if>
+            <if test="personnelName != null  and personnelName != ''">and personnelName like concat('%',
+                #{personnelName}, '%')
+            </if>
+            <if test="papersCode != null  and papersCode != ''">and papersCode = #{papersCode}</if>
+            <if test="icCardCode != null  and icCardCode != ''">and icCardCode = #{icCardCode}</if>
+            <if test="personnelType != null  and personnelType != ''">and personnelType = #{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 icRfid = #{icRfid}</if>
+            <if test="idRfid != null  and idRfid != ''">and idRfid = #{idRfid}</if>
+            <if test="tagRfid != null  and tagRfid != ''">and tagRfid = #{tagRfid}</if>
+            <if test="lineName != null  and lineName != ''">and lineName like concat('%', #{lineName}, '%')</if>
+            <if test="lineCode != null  and lineCode != ''">and lineCode = #{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=",">
+            <if test="jobCode != null and jobCode != ''">jobCode,</if>
+            <if test="companyCode != null and companyCode != ''">companyCode,</if>
+            <if test="brancheCompanyCode != null">brancheCompanyCode,</if>
+            <if test="personnelName != null">personnelName,</if>
+            <if test="papersCode != null">papersCode,</if>
+            <if test="icCardCode != null">icCardCode,</if>
+            <if test="personnelType != null">personnelType,</if>
+            <if test="posts != null">posts,</if>
+            <if test="card != null">card,</if>
+            <if test="telphone != null">telphone,</if>
+            <if test="icRfid != null">icRfid,</if>
+            <if test="idRfid != null">idRfid,</if>
+            <if test="tagRfid != null">tagRfid,</if>
+            <if test="remark != null">remark,</if>
+            <if test="lineName != null">lineName,</if>
+            <if test="lineCode != null">lineCode,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
+            <if test="companyCode != null and companyCode != ''">#{companyCode},</if>
+            <if test="brancheCompanyCode != null">#{brancheCompanyCode},</if>
+            <if test="personnelName != null">#{personnelName},</if>
+            <if test="papersCode != null">#{papersCode},</if>
+            <if test="icCardCode != null">#{icCardCode},</if>
+            <if test="personnelType != null">#{personnelType},</if>
+            <if test="posts != null">#{posts},</if>
+            <if test="card != null">#{card},</if>
+            <if test="telphone != null">#{telphone},</if>
+            <if test="icRfid != null">#{icRfid},</if>
+            <if test="idRfid != null">#{idRfid},</if>
+            <if test="tagRfid != null">#{tagRfid},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="lineName != null">#{lineName},</if>
+            <if test="lineCode != null">#{lineCode},</if>
+        </trim>
+    </insert>
+    <insert id="saveDrivers">
+        INSERT INTO driver (
+        jobCode,
+        companyCode,
+        brancheCompanyCode,
+        personnelName,
+        papersCode,
+        icCardCode,
+        personnelType,
+        posts,
+        card,
+        telphone,
+        icRfid,
+        idRfid,
+        tagRfid,
+        remark,
+        lineName,
+        lineCode
+        )
+        VALUES
+        <foreach collection="drivers" item="item" index="index" separator=",">
+            (
+            #{item.jobCode,jdbcType=VARCHAR},
+            #{item.companyCode,jdbcType=VARCHAR},
+            #{item.brancheCompanyCode,jdbcType=VARCHAR},
+            #{item.personnelName,jdbcType=VARCHAR},
+            #{item.papersCode,jdbcType=VARCHAR},
+            #{item.icCardCode,jdbcType=VARCHAR},
+            #{item.personnelType,jdbcType=VARCHAR},
+            #{item.posts,jdbcType=VARCHAR},
+            #{item.card,jdbcType=VARCHAR},
+            #{item.telphone,jdbcType=VARCHAR},
+            #{item.icRfid,jdbcType=VARCHAR},
+            #{item.idRfid,jdbcType=VARCHAR},
+            #{item.tagRfid,jdbcType=VARCHAR},
+            #{item.remark,jdbcType=VARCHAR},
+            #{item.lineName,jdbcType=VARCHAR},
+            #{item.lineCode,jdbcType=VARCHAR}
+            )
+        </foreach>
+        on duplicate key update
+        personnelName = values(personnelName)
+    </insert>
+
+    <update id="updateDriver" parameterType="Driver">
+        update driver
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jobCode != null and jobCode != ''">jobCode = #{jobCode},</if>
+            <if test="companyCode != null and companyCode != ''">companyCode = #{companyCode},</if>
+            <if test="brancheCompanyCode != null">brancheCompanyCode = #{brancheCompanyCode},</if>
+            <if test="personnelName != null">personnelName = #{personnelName},</if>
+            <if test="papersCode != null">papersCode = #{papersCode},</if>
+            <if test="icCardCode != null">icCardCode = #{icCardCode},</if>
+            <if test="personnelType != null">personnelType = #{personnelType},</if>
+            <if test="posts != null">posts = #{posts},</if>
+            <if test="card != null">card = #{card},</if>
+            <if test="telphone != null">telphone = #{telphone},</if>
+            <if test="icRfid != null">icRfid = #{icRfid},</if>
+            <if test="idRfid != null">idRfid = #{idRfid},</if>
+            <if test="tagRfid != null">tagRfid = #{tagRfid},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="lineName != null">lineName = #{lineName},</if>
+            <if test="lineCode != null">lineCode = #{lineCode},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDriverById" parameterType="Long">
+        delete
+        from driver
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteDriverByIds" parameterType="String">
+        delete from driver where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
 \ No newline at end of file
@@ -23,6 +23,11 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.1</version>
+        </dependency>
         <!-- SpringBoot 拦截器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-package com.ruoyi.framework.config;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import javax.sql.DataSource;
-import org.apache.ibatis.io.VFS;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.util.ClassUtils;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * Mybatis支持*匹配扫描包
- * 
- * @author ruoyi
- */
-@Configuration
-public class MyBatisConfig
-{
-    @Autowired
-    private Environment env;
-
-    static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
-
-    public static String setTypeAliasesPackage(String typeAliasesPackage)
-    {
-        ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
-        MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
-        List<String> allResult = new ArrayList<String>();
-        try
-        {
-            for (String aliasesPackage : typeAliasesPackage.split(","))
-            {
-                List<String> result = new ArrayList<String>();
-                aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
-                        + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
-                Resource[] resources = resolver.getResources(aliasesPackage);
-                if (resources != null && resources.length > 0)
-                {
-                    MetadataReader metadataReader = null;
-                    for (Resource resource : resources)
-                    {
-                        if (resource.isReadable())
-                        {
-                            metadataReader = metadataReaderFactory.getMetadataReader(resource);
-                            try
-                            {
-                                result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
-                            }
-                            catch (ClassNotFoundException e)
-                            {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                }
-                if (result.size() > 0)
-                {
-                    HashSet<String> hashResult = new HashSet<String>(result);
-                    allResult.addAll(hashResult);
-                }
-            }
-            if (allResult.size() > 0)
-            {
-                typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
-            }
-            else
-            {
-                throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
-            }
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-        return typeAliasesPackage;
-    }
-
-    public Resource[] resolveMapperLocations(String[] mapperLocations)
-    {
-        ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
-        List<Resource> resources = new ArrayList<Resource>();
-        if (mapperLocations != null)
-        {
-            for (String mapperLocation : mapperLocations)
-            {
-                try
-                {
-                    Resource[] mappers = resourceResolver.getResources(mapperLocation);
-                    resources.addAll(Arrays.asList(mappers));
-                }
-                catch (IOException e)
-                {
-                    // ignore
-                }
-            }
-        }
-        return resources.toArray(new Resource[resources.size()]);
-    }
-
-    @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
-    {
-        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
-        String mapperLocations = env.getProperty("mybatis.mapperLocations");
-        String configLocation = env.getProperty("mybatis.configLocation");
-        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
-        VFS.addImplClass(SpringBootVFS.class);
-
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
-        sessionFactory.setDataSource(dataSource);
-        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
-        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
-        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
-        return sessionFactory.getObject();
-    }
-}
 \ No newline at end of file
+package com.ruoyi.framework.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * Mybatis Plus 配置
+ *
+ * @author ruoyi
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+public class MybatisPlusConfig
+{
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor()
+    {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        // 乐观锁插件
+        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+        // 阻断插件
+        interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+        return interceptor;
+    }
+
+    /**
+     * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html
+     */
+    public PaginationInnerInterceptor paginationInnerInterceptor()
+    {
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        // 设置数据库类型为mysql
+        paginationInnerInterceptor.setDbType(DbType.MYSQL);
+        // 设置最大单页限制数量，默认 500 条，-1 不受限制
+        paginationInnerInterceptor.setMaxLimit(-1L);
+        return paginationInnerInterceptor;
+    }
+
+    /**
+     * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html
+     */
+    public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor()
+    {
+        return new OptimisticLockerInnerInterceptor();
+    }
+
+    /**
+     * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html
+     */
+    public BlockAttackInnerInterceptor blockAttackInnerInterceptor()
+    {
+        return new BlockAttackInnerInterceptor();
+    }
+}
@@ -17,6 +17,11 @@
     <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.1</version>
+        </dependency>
         <!--velocity代码生成使用模板 -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
@@ -7,6 +7,7 @@ import com.ruoyi.common.utils.DateUtils;
 #break
 #end
 #end
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 #if($table.sub)
@@ -71,6 +72,9 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 #if($column.javaField == 'createTime')
         ${className}.setCreateTime(DateUtils.getNowDate());
 #end
+#if($column.javaField == 'createBy')
+    ${className}.setCreateBy(SecurityUtils.getUsername());
+#end
 #end
 #if($table.sub)
         int rows = ${className}Mapper.insert${ClassName}(${className});
@@ -97,6 +101,9 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 #if($column.javaField == 'updateTime')
         ${className}.setUpdateTime(DateUtils.getNowDate());
 #end
+#if($column.javaField == 'updateBy')
+    ${className}.setUpdateBy(SecurityUtils.getUsername());
+#end
 #end
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
 #foreach($column in $columns)
 #if($column.query)
 #set($dictType=$column.dictType)
@@ -127,13 +127,13 @@
         </template>
       </el-table-column>
 #elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
         <template #default="scope">
           <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
         </template>
       </el-table-column>
 #elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
+      <el-table-column  label="${comment}" align="center" prop="${javaField}">
         <template #default="scope">
 #if($column.htmlType == "checkbox")
           <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
@@ -146,7 +146,7 @@
       <el-table-column label="${comment}" align="center" prop="${javaField}" />
 #end
 #end
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
 package com.ruoyi.quartz.task;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.StringUtils;
+import org.springframework.web.client.RestTemplate;
+
+import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 定时任务调度测试
- * 
+ *
  * @author guzijain
  */
 @Component("ryTask")
-public class RyTask
-{
-    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
-    {
+public class RyTask {
+    @Autowired
+    private RestTemplate restTemplate;
+
+    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
-    public void ryParams(String params)
-    {
+    public void ryParams(String params) {
         System.out.println("执行有参方法：" + params);
     }
-    public void ryNoParams()
-    {
+    public void ryNoParams() {
         System.out.println("执行无参方法");
     }
+
+
 }