feat: 通过人事系统获取人员信息

guzijian
1 parent 9d418400
Showing 34 changed files with 1148 additions and 186 deletions
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/common/ConstDriverProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/SignInEnum.java → ruoyi-admin/src/main/java/com/ruoyi/common/ConstSignInConstSignInProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/ErrorTypeProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/global/GlobalDriverInfoCache.java
ruoyi-admin/src/main/java/com/ruoyi/common/redispre/GlobalRedisPreName.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ApplicationUpdateController.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/AlcoholFlagConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/SignInConvert.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/SignInStatusConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/SignInTypeConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/PersonnelRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/personnel/FormData.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/personnel/ImageField_lk9mk228.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/personnel/ImageUrlResultResponseVo.java
@@ -70,6 +70,11 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
     </dependencies>
+package com.ruoyi.common;
+
+/**
+ * 驾驶员配置
+ * @author 20412
+ */
+public interface ConstDriverProperties {
+    String PERSONNEL_TYPE_DRIVER = "驾驶员";
+}
 package com.ruoyi.common;
-public interface SignInEnum {
+/**
+ * 签到枚举
+ * @author 20412
+ */
+public interface ConstSignInConstSignInProperties {
     /**
      * 导出图片
      */
@@ -33,5 +37,10 @@ public interface SignInEnum {
     Integer ALCOHOL_FLAG_NO = 2;
     String ALCOHOL_FLAG_NO_STRING = "未测试";
+    /**
+     * 酒精测试异常指定次数 弹出更换驾驶员提示
+     */
+    Integer SIGN_IN_ERROR_COUNT = 2;
+
 }
@@ -6,7 +6,7 @@ package com.ruoyi.common;
 public interface ErrorTypeProperties {
     String SIGN_IN_ERROR = "签到异常";
     String EQUIPMENT_ERROR = "设备异常";
-    String ALCOHOL_SIGN_IN_ERROR = "酒精测试超标";
-    String WORK_DAY_ERROR = "当天没有排班";
-    String SIGN_IN_TIMEOUT = "签到超时";
+    String ALCOHOL_SIGN_IN_ERROR = "酒精测试超标,";
+    String WORK_DAY_ERROR = "当天没有排班,";
+    String SIGN_IN_TIMEOUT = "签到超时,";
 }
+package com.ruoyi.common.global;
+
+import com.ruoyi.in.domain.SignIn;
+import org.springframework.stereotype.Component;
+
+import java.security.Principal;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author 20412
+ */
+@Component
+public class GlobalDriverInfoCache {
+    private final ConcurrentHashMap<String, List<SignIn>> userCurrentMap = new ConcurrentHashMap();
+
+    /**
+     * 驾驶员签到
+     * @param signIn
+     */
+    public void putDriver(SignIn signIn) {
+        if (Objects.isNull(userCurrentMap.get(signIn.getJobCode()))) {
+            userCurrentMap.put(signIn.getJobCode(), new ArrayList<>(Arrays.asList(signIn)));
+        } else {
+            userCurrentMap.get(signIn.getJobCode()).add(signIn);
+        }
+    }
+
+
+}
@@ -6,4 +6,18 @@ package com.ruoyi.common.redispre;
 public interface GlobalRedisPreName {
     String DRIVER_SCHEDULING_PRE = "driver:scheduling:";
     String REDIS_SIGN_IN = "sign:in:";
+    /**
+     * 请求人事系统token
+     */
+    String REDIS_PERSONNEL_TOKEN = "personnel:token";
+
+    /**
+     * 驾驶员签到 hash key
+     */
+    String REDIS_PERSONNEL_DRIVER = "personnel:driver";
+
+    /**
+     * 其他人员
+     */
+
 }
@@ -13,6 +13,7 @@ import java.io.IOException;
 /**
  * 管理应用更新
+ * @author 20412
  */
 @RestController
 @Api(tags = "管理应用更新")
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.stream.Collectors;
-import static com.ruoyi.common.SignInEnum.EXPORT;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.EXPORT;
 /**
  * @author 20412
@@ -3,10 +3,7 @@ package com.ruoyi.driver.domain;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
-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;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -143,7 +140,7 @@ public class Driver extends BaseEntity {
     private String image;
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @ApiModelProperty("更新时间")
-    private Date update_time;
+    private Date updateTime;
     @ApiModelProperty("注册设备列表")
     private String signInEquipment;
@@ -61,6 +61,8 @@ public class DriverServiceImpl implements IDriverService {
     @Autowired
     private RedisCache redisCache;
+    @Value("${api.headImage}")
+    private String headImagePre;
     /**
      * 查询驾驶员信息
      *
@@ -149,7 +151,7 @@ public class DriverServiceImpl implements IDriverService {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        Map<String, List<ResponseScheduling>> scheduling = driverJob.saveSchedulingToRedis(getSchedulingInfoUrl, Collections.emptyList(), schedulingDate);
+        Map<String, List<ResponseScheduling>> scheduling = driverJob.saveSchedulingToRedis(getSchedulingInfoUrl, schedulingDate);
         // 数据库中读取所有接收到的排班信息
 //        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
         return AjaxResult.success(scheduling.get(jobCode));
@@ -182,10 +184,11 @@ public class DriverServiceImpl implements IDriverService {
     @Override
     public AjaxResult uploadImage(MultipartFile file) throws InvalidExtensionException, IOException {
+        // 上传并返回新文件名称
         // 上传文件路径
-        String baseUrl = RuoYiConfig.getUploadPath() + "/head/image";
-        // 上传并返回新文件名称
+        String baseUrl = RuoYiConfig.getUploadPath() + headImagePre;
+        // 校验文件格式
         FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         // 后期可以通过请求头拿到对应的工号
         String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "." + FileUploadUtils.getExtension(file);
@@ -233,10 +236,9 @@ public class DriverServiceImpl implements IDriverService {
     }
-
     @Override
     public AjaxResult faceRegistrationFeedback(String deviceId, List<String> jobCodes) {
-        threadJobService.asyncUpdateDriver(deviceId,jobCodes);
+        threadJobService.asyncInsertSignInContactEquipment(deviceId, jobCodes);
         return AjaxResult.success("注册成功");
     }
@@ -15,12 +15,13 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.SignInEnum;
+import com.ruoyi.common.ConstSignInConstSignInProperties;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.pojo.response.ResponseScheduling;
@@ -36,8 +37,10 @@ import com.ruoyi.in.service.ISignInService;
 import javax.annotation.Resource;
+import static com.ruoyi.common.ConstDriverProperties.PERSONNEL_TYPE_DRIVER;
 import static com.ruoyi.common.ErrorTypeProperties.*;
-import static com.ruoyi.common.SignInEnum.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN;
 /**
@@ -52,6 +55,9 @@ public class SignInServiceImpl implements ISignInService {
     private SignInMapper signInMapper;
     @Autowired
+    private DriverMapper driverMapper;
+
+    @Autowired
     private EquipmentMapper equipmentMapper;
     @Autowired
@@ -93,7 +99,7 @@ public class SignInServiceImpl implements ISignInService {
         signIn.setIp(IpUtils.getIpAddr());
         signIn.setCreateTime(DateUtils.getNowDate());
         if (signIn.getType() == null) {
-            signIn.setType(SignInEnum.SIGN_IN);
+            signIn.setType(ConstSignInConstSignInProperties.SIGN_IN);
         }
         if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())) {
             signIn.setStatus(signIn.getAlcoholIntake().compareTo(new BigDecimal(20)) < 0 ? SIGN_IN_SUCCESS : SIGN_IN_FAIL);
@@ -138,99 +144,129 @@ public class SignInServiceImpl implements ISignInService {
     @Override
     public AjaxResult addSignIn(SignIn signIn) throws IOException {
+        Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        // 查询地址
+        Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
+        SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
         // 签到检查
-        checkSignIn(signIn);
+        if (checkSignIn(signIn, driver)) {
+            signIn.setStatus(SIGN_IN_SUCCESS);
+        } else {
+            signIn.setStatus(SIGN_IN_FAIL);
+        }
         // base64转图片
         signIn.setCreateTime(new Date());
         signIn.setIp(IpUtils.getIpAddr());
         uploadImage(signIn);
         signInMapper.insertSignIn(signIn);
+        // TODO redis 存储每个人的签到 用于后续考勤
+
         // TODO 驾驶人员二次签到酒精测试异常
-        if (true) {
-            Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
-            SignInResponseVo vo = new SignInResponseVo();
-            vo.setAddress(equipment.getAddress());
-            vo.setDeviceId(signIn.getDeviceId());
-            Integer count = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode());
-            if (Objects.isNull(count)) {
-                redisCache.setCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 0);
-            } else {
-                count = redisCache.increment(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 1);
-            }
-            if (count.compareTo(2) >= 0) {
-                // TODO
-                return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING,vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过两次请更换车辆驾驶员",vo);
+        if (PERSONNEL_TYPE_DRIVER.equals(driver.getPosts())) {
+            AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
+            if (!Objects.isNull(result)) {
+                return result;
             }
         }
-        // 查询地址
-        Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
-        System.out.println("设备信息:" + equipment);
+        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(), vo);
+    }
+
+    private SignInResponseVo getSignInResponseVo(SignIn signIn, Equipment equipment) {
         SignInResponseVo vo = new SignInResponseVo();
+        if (Objects.isNull(equipment)) {
+            equipment = new Equipment();
+        }
         vo.setAddress(equipment.getAddress());
         vo.setDeviceId(signIn.getDeviceId());
-        System.out.println("返回数据:" + vo.toString());
-        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING,vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(),vo);
+        return vo;
+    }
+
+    private AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInResponseVo vo) {
+        // 驾驶员酒精测试连续超标两次则提示换人
+        Integer count = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode());
+        if (Objects.isNull(count) || count.equals(0)) {
+            count = 1;
+            redisCache.setCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), count);
+        } else {
+            count = redisCache.setIncrementMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 1);
+        }
+        if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
+            // TODO
+            return AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过" + count + "次请更换车辆驾驶员", vo);
+        }
+        return null;
     }
-    private void checkSignIn(SignIn signIn) {
-        // TODO 更具工号获取人员信息
-        Driver driver = getDriverInfoByJobCode(signIn.getJobCode());
+    private boolean checkSignIn(SignIn signIn, Driver driver) {
+        boolean result = true;
         if (Objects.isNull(driver)) {
-            signIn.setStatus(SIGN_IN_SUCCESS);
-            return;
+            return true;
         }
-        // TODO 排班校验 非司售未作
-        checkWorkDay(signIn, driver.getPersonnelType());
+        // TODO 排班校验 和签到超时校验 非司售未作
+        result = checkWorkDay(signIn, driver.getPosts());
-        // 酒精测试校验 TODO 判断人员类型
-        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())) {
-            signIn.setStatus(signIn.getAlcoholIntake().compareTo(new BigDecimal(20)) < 0 ? SIGN_IN_SUCCESS : SIGN_IN_FAIL);
-            signIn.setRemark(signIn.getStatus().equals(SIGN_IN_FAIL) ? ALCOHOL_SIGN_IN_ERROR : "");
+        // 酒精测试校验 确定 且员工工种是驾驶员
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_TYPE_DRIVER.equals(driver.getPosts())) {
+            if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) > 0) {
+                result = true;
+            } else {
+                signIn.setRemark(ALCOHOL_SIGN_IN_ERROR);
+                result = false;
+            }
         }
+        return result;
     }
-    private Driver getDriverInfoByJobCode(String jobCode) {
-        return null;
-    }
-    private void checkWorkDay(SignIn signIn, String personnelType) {
+    /**
+     * 排班和超时检查
+     *
+     * @param signIn
+     * @param personnelType
+     * @return
+     */
+    private boolean checkWorkDay(SignIn signIn, String personnelType) {
+        boolean result = true;
         List<ResponseScheduling> jobs = null;
         switch (personnelType) {
             case "0":
                 // 查询工号对应的排班 司售人员
-                jobs = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd"), signIn.getJobCode());
+                jobs = redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd"), signIn.getJobCode());
                 if (Objects.isNull(jobs) || jobs.size() == 0) {
-                    signIn.setStatus(SIGN_IN_FAIL);
-                    signIn.setRemark(WORK_DAY_ERROR);
+                    signIn.setRemark(signIn.getRemark() + WORK_DAY_ERROR);
+                    result = false;
                 }
                 break;
             case "1":
                 // 查询工号对应的排班 非司售人员
                 // 查询数据库
+                result = true;
                 break;
         }
         // 超时校验司售人员
-        checkTimeOut(signIn, jobs);
-        // TODO 非司售人员
-
+        if (result) {
+            // TODO 非司售人员
+            result = checkTimeOut(signIn, jobs);
+        }
+        return result;
     }
-    private void checkTimeOut(SignIn signIn, List<ResponseScheduling> driver) {
+    private boolean checkTimeOut(SignIn signIn, List<ResponseScheduling> driver) {
         // 那发车时间和到站时间作为开始上班的时间
         LocalDateTime startTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getFcsjT());
         LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getZdsjT());
         LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime());
         long morningBetween = ChronoUnit.MINUTES.between(startTime, signTime);
         long afternoonBetween = ChronoUnit.MINUTES.between(endTime, signTime);
+        // 签到范围一小时内
         if (Math.abs(morningBetween) <= 60 || Math.abs(afternoonBetween) <= 60) {
-            signIn.setStatus(SIGN_IN_SUCCESS);
+            return true;
         } else {
-            signIn.setStatus(SIGN_IN_FAIL);
-            signIn.setRemark(SIGN_IN_TIMEOUT);
+            signIn.setRemark(signIn.getRemark() + SIGN_IN_TIMEOUT);
+            return false;
         }
-
     }
     private void uploadImage(SignIn signIn) throws IOException {
@@ -249,7 +285,7 @@ public class SignInServiceImpl implements ISignInService {
         String pathFileName = getPathFileName(filePath, fileName);
         signIn.setImage(pathFileName);
         // 异步上传文件
-        threadJobConfig.asyncStartUpload(absPath, base64);
+        threadJobConfig.asyncStartUploadBase64Image(absPath, base64);
     }
     /**
 package com.ruoyi.job;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
+import com.ruoyi.pojo.request.PersonnelRequestVo;
+import com.ruoyi.pojo.request.TokenRequestVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
-import com.ruoyi.pojo.response.TokenResponseVo;
+import com.ruoyi.pojo.response.personnel.*;
+import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.HttpUtils;
 import com.ruoyi.utils.ListUtils;
+import lombok.extern.slf4j.Slf4j;
 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.*;
 import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_PERSONNEL_TOKEN;
 /**
  * 该定时任务用户获取驾驶员信息
@@ -31,6 +40,7 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE
  * @author 20412
  */
 @Component("driverJob")
+@Slf4j
 public class DriverJob implements InitializingBean {
     @Autowired
@@ -39,6 +49,9 @@ public class DriverJob implements InitializingBean {
     @Resource
     private RestTemplate restTemplate;
+    @Resource
+    private ThreadJobService threadJobService;
+
     @Autowired
     private IDriverService driverService;
@@ -46,14 +59,14 @@ public class DriverJob implements InitializingBean {
     private String getDriverInfoUrl;
-//    @Value("${api.personnel.token.tokenUrl}")
-//    private String tokenUrl;
+    @Value("${api.personnel.token.tokenUrl}")
+    private String tokenUrl;
-//    @Value("${api.personnel.token.appKey}")
-//    private String appKey;
+    @Value("${api.personnel.token.appKey}")
+    private String appKey;
-//    @Value("${api.personnel.token.appSecret}")
-//    private String appSecret;
+    @Value("${api.personnel.token.appSecret}")
+    private String appSecret;
     @Value("${api.url.getSchedulingInfo}")
     private String getSchedulingInfoUrl;
@@ -64,6 +77,7 @@ public class DriverJob implements InitializingBean {
     @Value("${api.config.nonce}")
     private String nonce;
+    private static ThreadJobService THREAD_JOB_SERVICE;
     private static String APP_KEY;
     private static String TOKEN_URL;
     private static String APP_SECRET;
@@ -79,45 +93,95 @@ public class DriverJob implements InitializingBean {
     /**
      * 通过该定时任务获取驾驶员信息 并保存到数据库
-     * 排班信息映射 20分钟更新一次
+     * 排班信息映射 不低于2小时更新一次
      */
     public void getDriverInfo(String params) throws Exception {
         try {
-            String getDriverInfoUrl = String.format(GET_DRIVER_INFO_URL, params);
-            long timestamp = System.currentTimeMillis();
+//            String getDriverInfoUrl = String.format(GET_DRIVER_INFO_URL, params);
+            //获取token
+            TokenResponseVo tokenVo = getToken(TOKEN_URL);
             // 获取驾驶员信息
-            List<Driver> drivers = getDrivers(APP_SECRET, String.valueOf(timestamp));
-            // 格式化请求
-            String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", ConstDateUtil.formatDate("yyyyMMdd"), timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
-            // 获取排班信息并存入redis
-            saveSchedulingToRedis(getSchedulingInfoUrl, drivers,ConstDateUtil.formatDate("yyyyMMdd"));
-            // 分片插入
-            List<List<Driver>> splitList = ListUtils.splitList(drivers, 1000);
-            System.out.println("开始更新数据-----");
-            for (List<Driver> driverList : splitList) {
-                DRIVER_SERVICE.insertDrivers(driverList);
-            }
-            System.out.println("数据更新完毕-----");
+            List<Driver> drivers = getDrivers(tokenVo.getAccessToken());
+            //  插入信息
+            saveDrivers(drivers, tokenVo.getAccessToken());
+
         } catch (Exception e) {
-            System.out.println("执行失败：" + e.getMessage());
+            log.info("执行失败：" + e.getMessage());
         }
-        System.out.println("执行结束");
+        log.info("执行结束");
     }
-    /**
-     * 获取员工数据
-     */
+    private void saveDrivers(List<Driver> drivers, String accessToken) {
+        // 获取图片
+        List<List<Driver>> list = ListUtils.splitList(drivers, 800);
+        for (List<Driver> driverList : list) {
+            // 多线程插入数据
+            THREAD_JOB_SERVICE.asyncUploadDriverWithUpdateImageUrl(driverList, accessToken);
+            log.info("开始插入");
+        }
+//        String downloadImage = getDownloadImage(url, accessToken, "");
+    }
+
+//    public static void main(String[] args) {
+//        String str = "[{\"previewUrl\":\"/ossFileHandle?appType=APP_HV8J7X8PFRXLJJW8JTZK&fileName=APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png&instId=&type=open&process=image/resize,m_fill,w_200,h_200,limit_0/quality,q_80\",\"size\":621992,\"name\":\"0332d25e3b9e80bca3d90daf0d5857d.png\",\"downloadUrl\":\"/ossFileHandle?appType=APP_HV8J7X8PFRXLJJW8JTZK&fileName=APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png&instId=&type=download\",\"fileUuid\":\"APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png\",\"url\":\"/ossFileHandle?appType=APP_HV8J7X8PFRXLJJW8JTZK&fileName=APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png&instId=&type=download\"}]";
+////        List<List> lists = JSONArray.parseArray(str, List.class);
+//        List<ImageField_lk9mk228> lists = JSONArray.parseArray(str, ImageField_lk9mk228.class);
+//        System.out.println(lists);
+//    }
+
+    public static String getDownloadImageUrl(String accessToken, String preViewUrl) {
+        accessToken = REDIS_CACHE.getCacheObject(REDIS_PERSONNEL_TOKEN);
+        String url = "https://api.dingtalk.com/v1.0/yida/apps/temporaryUrls/APP_HV8J7X8PFRXLJJW8JTZK";
+        String fileUrl = "https://scroix.aliwork.com";
+        try {
+            fileUrl = URLEncoder.encode(fileUrl + preViewUrl, String.valueOf(StandardCharsets.UTF_8));
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        Map<String, Object> param = new HashMap<>();
+        param.put("userId", "InterfaceManagement");
+        param.put("timeout", 86400000L);
+        param.put("fileUrl", fileUrl);
+        param.put("systemToken", "16A66291CHE9K5DPE1IDO9E63FOE2VWA09QFLV");
+        Map<String, String> header = new HashMap<>();
+        header.put("x-acs-dingtalk-access-token", accessToken);
+        header.put("Content-Type", "application/json");
+        String result = "";
+
+        try {
+            String s = HttpUtils.doGet(url, param, header);
+            ImageUrlResultResponseVo vo = JSON.parseObject(s, ImageUrlResultResponseVo.class);
+            result = vo.getResult();
+            // 可能需要重新获取token
+        }catch (Exception e){
+            String token = DriverJob.getToken(TOKEN_URL).getAccessToken();
+            header.put("x-acs-dingtalk-access-token", token);
+            String s = HttpUtils.doGet(url, param, header);
+            ImageUrlResultResponseVo vo = JSON.parseObject(s, ImageUrlResultResponseVo.class);
+            result = vo.getResult();
+        }
+        return result;
+    }
     /**
-     * 导入图片任务
+     * 获取排班任务请求
+     * 12小时执行一次
      */
-    public void importImages(){
-        // TODO 获取用户列表 通过用户列表的jobCode来匹配对应的用户图像信息并保存到服务器
-
+    public void getSchedulingInfo() {
+        // 获取排班请求
+        long timestamp = System.currentTimeMillis();
+        String getSchedulingInfoUrl = null;
+        try {
+            getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", ConstDateUtil.formatDate("yyyyMMdd"), timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        // 获取排班信息并存入redis
+        saveSchedulingToRedis(getSchedulingInfoUrl, ConstDateUtil.formatDate("yyyyMMdd"));
     }
-    public Map<String, List<ResponseScheduling>> saveSchedulingToRedis(String getSchedulingInfoUrl, List<Driver> drivers,String dateKey) {
+    public Map<String, List<ResponseScheduling>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey) {
         List<ResponseScheduling> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
                 HttpMethod.GET,
@@ -125,10 +189,10 @@ public class DriverJob implements InitializingBean {
                 new ParameterizedTypeReference<List<ResponseScheduling>>() {
                 }).getBody();
-        Map<String, List<ResponseScheduling>> driverSchedulingMap = new HashMap<>();
+        Map<String, List<ResponseScheduling>> driverSchedulingMap = new HashMap<>(200);
         // 按照员工工号来获取排班信息
         originSchedulingList = originSchedulingList.stream()
-                .map(subItem->{
+                .map(subItem -> {
                     subItem.setJobCode(subItem.getJsy().split("/")[0]);
                     return subItem;
                 }).collect(Collectors.toList());
@@ -152,30 +216,66 @@ public class DriverJob implements InitializingBean {
         return driverSchedulingMap;
     }
-    private List<Driver> getDrivers(String url, String timestamp) throws Exception {
-        Map<String, String> configMap = getStringStringMap(timestamp);
-        String sign = getSHA1(configMap);
-        //生成签名
-        TokenResponseVo tokenVo = getToken(url);
-//        redisCache.setCacheObject();
-//        getPersonInfo(tokenVo);
+    public static List<Driver> getDrivers(String accessToken) throws Exception {
+//        Map<String, String> configMap = getStringStringMap(timestamp);
+//        String sign = getSHA1(configMap);
+        Date date = new Date();
+        PersonnelResultResponseVo vo = getPersonInfo(accessToken);
+        return vo.getData().stream().map(item -> {
+            Driver driver = new Driver();
+            FormData formData = item.getFormData();
+            driver.setUpdateTime(date);
+            driver.setJobCode(formData.getTextField_lk9mk222());
+            driver.setPersonnelName(formData.getTextField_lk9mk224());
+            driver.setPosts(formData.getTextField_lk9mk226());
+//            driver.setImage(form);
+            // 解析JSON字符串
+            List<ImageField_lk9mk228> lists = JSONArray.parseArray(formData.getImageField_lk9mk228(), ImageField_lk9mk228.class);
+            driver.setImage(lists.get(0).getPreviewUrl());
+            return driver;
+        }).collect(Collectors.toList());
 //        return drivers;
-        return null;
     }
-    private TokenResponseVo getToken(String url) {
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-        params.add("appSecret", APP_SECRET);
-        params.add("appKey", APP_KEY);
+    private static PersonnelResultResponseVo getPersonInfo(String accessToken) {
+        RestTemplate restTemplate = new RestTemplate();
+        String url = "https://api.dingtalk.com/v1.0/yida/forms/instances/search";
+        PersonnelRequestVo vo = new PersonnelRequestVo();
+        vo.setAppType("APP_HV8J7X8PFRXLJJW8JTZK");
+        vo.setFormUuid("FORM-CP766081XRMCZBZC7URI45AVVB662XFNMKAKLB");
+        vo.setUserId("InterfaceManagement");
+        vo.setSystemToken("16A66291CHE9K5DPE1IDO9E63FOE2VWA09QFLV");
+        // 工号组件
+//        vo.setSearchFieldJson(" size = 4");
         // 设置请求头
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("x-acs-dingtalk-access-token", accessToken);
         // 创建HttpEntity对象
-        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(params, headers);
+        HttpEntity<String> requestEntity = new HttpEntity<>(JSON.toJSONString(vo), headers);
         // 发送POST请求
-        ResponseEntity<TokenResponseVo> responseEntity = restTemplate.postForEntity(url, requestEntity, TokenResponseVo.class);
-        return responseEntity.getBody();
+        ResponseEntity<PersonnelResultResponseVo> result = restTemplate.postForEntity(url, requestEntity, PersonnelResultResponseVo.class);
+        PersonnelResultResponseVo body = result.getBody();
+        return body;
+    }
+
+    public static TokenResponseVo getToken(String url) {
+        TokenRequestVo request = new TokenRequestVo();
+        request.setAppKey(APP_KEY);
+        request.setAppSecret(APP_SECRET);
+        String requestBody = JSON.toJSONString(request);
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        // 创建HttpEntity对象
+        HttpEntity<String> requestEntity = new HttpEntity<>(requestBody, headers);
+        // 发送POST请求
+        ResponseEntity<TokenResponseVo> responseEntity = RESTTEMPLATE.postForEntity(url, requestEntity, TokenResponseVo.class);
+        TokenResponseVo vo = responseEntity.getBody();
+        REDIS_CACHE.setCacheObject(REDIS_PERSONNEL_TOKEN, vo.getAccessToken(), vo.getExpireIn(), TimeUnit.SECONDS);
+
+        return vo;
     }
     public Map<String, String> getStringStringMap(String timestamp) {
@@ -255,9 +355,9 @@ public class DriverJob implements InitializingBean {
         DRIVER_SERVICE = driverService;
         REDIS_CACHE = redisCache;
         GET_SCHEDULING_INFO_URL = getSchedulingInfoUrl;
-
-//        TOKEN_URL = tokenUrl;
-//        APP_KEY = appKey;
-//        APP_SECRET = appSecret;
+        THREAD_JOB_SERVICE = threadJobService;
+        TOKEN_URL = tokenUrl;
+        APP_KEY = appKey;
+        APP_SECRET = appSecret;
     }
 }
@@ -6,7 +6,7 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import static com.ruoyi.common.SignInEnum.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 /**
  * 酒精测试
@@ -6,7 +6,7 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import static com.ruoyi.common.SignInEnum.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 /**
  * 签到类型
@@ -6,7 +6,7 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import static com.ruoyi.common.SignInEnum.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 /**
  * @author 20412
@@ -6,7 +6,7 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import static com.ruoyi.common.SignInEnum.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 /**
  * @author 20412
+package com.ruoyi.pojo.request;
+
+import lombok.Data;
+
+@Data
+public class PersonnelRequestVo {
+    String appType;
+    String systemToken;
+    String userId;
+    String formUuid;
+    /**
+     *     非必须
+     */
+    String searchFieldJson;
+}
+package com.ruoyi.pojo.response.personnel;
+
+/**
+ * Auto-generated: 2023-07-21 10:29:43
+ *
+ * @author json.cn (i@json.cn)
+ * @website http://www.json.cn/java2pojo/
+ */
+public class FormData {
+
+    private String textField_lk9mk226;
+    private String imageField_lk9mk228;
+    private String textField_lk9mk222;
+    private String textField_lk9mk224;
+    public void setTextField_lk9mk226(String textField_lk9mk226) {
+        this.textField_lk9mk226 = textField_lk9mk226;
+    }
+    public String getTextField_lk9mk226() {
+        return textField_lk9mk226;
+    }
+
+    public void setImageField_lk9mk228(String imageField_lk9mk228) {
+        this.imageField_lk9mk228 = imageField_lk9mk228;
+    }
+    public String getImageField_lk9mk228() {
+        return imageField_lk9mk228;
+    }
+
+    public void setTextField_lk9mk222(String textField_lk9mk222) {
+        this.textField_lk9mk222 = textField_lk9mk222;
+    }
+    public String getTextField_lk9mk222() {
+        return textField_lk9mk222;
+    }
+
+    public void setTextField_lk9mk224(String textField_lk9mk224) {
+        this.textField_lk9mk224 = textField_lk9mk224;
+    }
+    public String getTextField_lk9mk224() {
+        return textField_lk9mk224;
+    }
+
+}
 \ No newline at end of file
+package com.ruoyi.pojo.response.personnel;
+
+
+/**
+ * Auto-generated: 2023-07-21 13:58:9
+ *
+ * @author json.cn (i@json.cn)
+ * @website http://www.json.cn/java2pojo/
+ */
+public class ImageField_lk9mk228 {
+
+    private String previewUrl;
+    private String size;
+    private String name;
+    private String downloadUrl;
+    private String fileUuid;
+    private String url;
+    public void setPreviewUrl(String previewUrl) {
+        this.previewUrl = previewUrl;
+    }
+    public String getPreviewUrl() {
+        return previewUrl;
+    }
+
+    public void setSize(String size) {
+        this.size = size;
+    }
+    public String getSize() {
+        return size;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setDownloadUrl(String downloadUrl) {
+        this.downloadUrl = downloadUrl;
+    }
+    public String getDownloadUrl() {
+        return downloadUrl;
+    }
+
+    public void setFileUuid(String fileUuid) {
+        this.fileUuid = fileUuid;
+    }
+    public String getFileUuid() {
+        return fileUuid;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+    public String getUrl() {
+        return url;
+    }
+
+}
 \ No newline at end of file
+package com.ruoyi.pojo.response.personnel;
+
+import lombok.Data;
+
+/**
+ * @author 20412
+ */
+@Data
+public class ImageUrlResultResponseVo {
+    private String result;
+}
+package com.ruoyi.pojo.response.personnel;
+
+
+
+/**
+ * Auto-generated: 2023-07-21 10:29:43
+ *
+ * @author json.cn (i@json.cn)
+ * @website http://www.json.cn/java2pojo/
+ */
+public class ModifyUser {
+
+    private UserName userName;
+    private String userId;
+    public void setUserName(UserName userName) {
+        this.userName = userName;
+    }
+    public UserName getUserName() {
+        return userName;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+    public String getUserId() {
+        return userId;
+    }
+
+}
 \ No newline at end of file
+package com.ruoyi.pojo.response.personnel;
+
+/**
+ * Copyright 2023 json.cn
+ */
+
+
+/**
+ * Auto-generated: 2023-07-21 10:29:43
+ *
+ * @author json.cn (i@json.cn)
+ * @website http://www.json.cn/java2pojo/
+ */
+public class Originator {
+
+    private UserName userName;
+    private String userId;
+    public void setUserName(UserName userName) {
+        this.userName = userName;
+    }
+    public UserName getUserName() {
+        return userName;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+    public String getUserId() {
+        return userId;
+    }
+
+}
 \ No newline at end of file
+package com.ruoyi.pojo.response.personnel;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PersonnelData {
+
+    private String creatorUserId;
+    private String formUuid;
+    private Date modifiedTimeGMT;
+    private Date createdTimeGMT;
+    private String formInstanceId;
+    private Originator originator;
+    private String modelUuid;
+    private String title;
+    private String instanceValue;
+    private int version;
+    private String modifierUserId;
+    private ModifyUser modifyUser;
+    private FormData formData;
+}
+package com.ruoyi.pojo.response.personnel;
+
+import java.util.List;
+
+public class PersonnelResultResponseVo {
+    private List<PersonnelData> data;
+    private int currentPage;
+    private int totalCount;
+
+    @Override
+    public String toString() {
+        return "PersonnelResultResponseVo{" +
+                "data=" + data +
+                ", currentPage=" + currentPage +
+                ", totalCount=" + totalCount +
+                '}';
+    }
+
+    public List<PersonnelData> getData() {
+        return data;
+    }
+
+    public void setData(List<PersonnelData> data) {
+        this.data = data;
+    }
+
+    public int getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(int currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public int getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+}
-package com.ruoyi.pojo.response;
+package com.ruoyi.pojo.response.personnel;
 import lombok.Data;
+package com.ruoyi.pojo.response.personnel;
+
+/**
+ * Auto-generated: 2023-07-21 10:29:43
+ *
+ * @author json.cn (i@json.cn)
+ * @website http://www.json.cn/java2pojo/
+ */
+public class UserName {
+
+    private String nameInChinese;
+    private String nameInEnglish;
+    private String type;
+    public void setNameInChinese(String nameInChinese) {
+        this.nameInChinese = nameInChinese;
+    }
+    public String getNameInChinese() {
+        return nameInChinese;
+    }
+
+    public void setNameInEnglish(String nameInEnglish) {
+        this.nameInEnglish = nameInEnglish;
+    }
+    public String getNameInEnglish() {
+        return nameInEnglish;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+    public String getType() {
+        return type;
+    }
+
+}
 \ No newline at end of file
@@ -18,7 +18,6 @@ import java.util.stream.Collectors;
 import static com.ruoyi.common.ErrorTypeProperties.EQUIPMENT_ERROR;
 import static com.ruoyi.common.ErrorTypeProperties.SIGN_IN_ERROR;
-import static com.ruoyi.common.SignInEnum.EXPORT;
 /**
  * @author 20412
@@ -6,21 +6,29 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.job.DriverJob;
+import com.ruoyi.utils.HttpUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
 import sun.misc.BASE64Decoder;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Base64;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -38,6 +46,8 @@ public class ThreadJobService {
     @Autowired
     private DriverMapper driverMapper;
+    @Value("${api.headImage}")
+    private String headImagePre;
     /**
@@ -49,7 +59,7 @@ public class ThreadJobService {
      * @throws IOException
      */
     @Async
-    public void asyncStartUpload(String url, String base64) {
+    public void asyncStartUploadBase64Image(String url, String base64) {
         FileOutputStream outputStream = null;
         base64 = base64.replaceAll(" ", "");
         BASE64Decoder decoder = new BASE64Decoder();
@@ -76,27 +86,101 @@ public class ThreadJobService {
             }
         }
     }
+
+    /**
+     * 签到人员与签到设备绑定
+     *
+     * @param deviceId
+     * @param jobCodes
+     */
     @Async
-    public void asyncUpdateDriver(String deviceId, List<String> jobCodes){
+    public void asyncInsertSignInContactEquipment(String deviceId, List<String> jobCodes) {
         Integer result = driverMapper.insertDriverFace(deviceId, jobCodes);
-        log.info("注册设备与员工关联完毕:{}",result);
+        log.info("注册设备与员工关联完毕:{}", result);
+    }
+
+    @Async
+    public void asyncUploadDriverWithUpdateImageUrl(List<Driver> drivers, String token) {
+        // 插入数据
+        for (Driver driver : drivers) {
+            String imageUlr = driver.getImage();
+            // 生成文件路径
+            String fileName = driver.getJobCode() + ".png";
+            String filePath = RuoYiConfig.getUploadPath() + headImagePre + "/" + fileName;
+            try {
+                fileName = FileUploadUtils.getPathFileName(RuoYiConfig.getUploadPath() + headImagePre, fileName);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            driver.setImage(fileName);
+            // 插入数据  如果员工已经存在在不在下载图片
+            int result = driverMapper.insertDriver(driver);
+            log.debug("插入完毕");
+            if (result == 0) {
+                continue;
+            }
+            // 获取图片请求地址
+            String imageUrl = DriverJob.getDownloadImageUrl(token, imageUlr);
+            // 获取图片数据
+            InputStream is = HttpUtils.doGet(imageUrl, new HashMap<>());
+            // 上传图片
+            uploadImage(is, filePath);
+        }
+
+
+    }
+
+    private void uploadImage(InputStream is, String filePath) {
+        File file = new File(filePath + File.separator);
+        if (!file.exists()) {
+            if (!file.getParentFile().exists()) {
+                file.getParentFile().mkdirs();
+            }
+        }
+        // 保存图片到本地文件
+        FileOutputStream fos = null;
+        try {
+
+            fos = new FileOutputStream(file);
+            byte[] cbuf = new byte[1024];
+            int len;
+            while ((len = is.read(cbuf)) != -1) {
+                fos.write(cbuf, 0, len);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                if (is != null) {
+                    is.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                if (fos != null) {
+                    fos.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
     /**
      * 检查文件类型
      *
-     * @param base64ImgData
+     * @param b
      * @return
      */
-    public static String checkImageBase64Format(String base64ImgData) {
-        byte[] b = Base64.getDecoder().decode(base64ImgData);
+    public static String checkImageBase64Format(byte[] b) {
         String type = "";
         if (0x424D == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
-            type = "bmp";
+            type = ".bmp";
         } else if (0x8950 == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
-            type = "png";
+            type = ".png";
         } else {
-            type = "jpg";
+            type = ".jpg";
         }
 //        else if (0xFFD8 == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
 //            type = "jpg";
@@ -104,48 +188,5 @@ public class ThreadJobService {
         return type;
     }
-    /**
-     * 获取相对路径名
-     *
-     * @param uploadDir
-     * @param fileName
-     * @return
-     * @throws IOException
-     */
-    public File getAbsoluteFile(String uploadDir, String fileName) throws IOException {
-        File desc = new File(uploadDir + File.separator + fileName);
-
-        if (!desc.exists()) {
-            if (!desc.getParentFile().exists()) {
-                desc.getParentFile().mkdirs();
-            }
-        }
-        return desc;
-    }
-
-    /**
-     * 获取扩展文件名
-     *
-     * @param extendFileName
-     * @return
-     */
-    public String extractFilename(String extendFileName) {
-        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
-                FilenameUtils.getBaseName(UUID.randomUUID().toString().replace("-", "")), Seq.getId(Seq.uploadSeqType), extendFileName);
-    }
-
-    /**
-     * @param uploadDir
-     * @param fileName
-     * @return
-     * @throws IOException
-     */
-    public String getPathFileName(String uploadDir, String fileName) throws IOException {
-        int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
-        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
-        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
-    }
-
-
 }
+package com.ruoyi.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.*;
+
+@Slf4j
+public class HttpUtils {
+    private static PoolingHttpClientConnectionManager connMgr;
+    private static RequestConfig requestConfig;
+    private static final int MAX_TIMEOUT = 10000;
+
+    private static final Logger logger = LoggerFactory.getLogger(HttpUtils.class);
+
+    static {
+        // 设置连接池
+        connMgr = new PoolingHttpClientConnectionManager();
+        // 设置连接池大小
+        connMgr.setMaxTotal(20);
+        connMgr.setDefaultMaxPerRoute(connMgr.getMaxTotal());
+        // Validate connections after 1 sec of inactivity
+        connMgr.setValidateAfterInactivity(5000);
+        RequestConfig.Builder configBuilder = RequestConfig.custom();
+        // 设置连接超时
+        configBuilder.setConnectTimeout(MAX_TIMEOUT);
+        // 设置读取超时
+        configBuilder.setSocketTimeout(MAX_TIMEOUT);
+        // 设置从连接池获取连接实例的超时
+        configBuilder.setConnectionRequestTimeout(MAX_TIMEOUT);
+
+        requestConfig = configBuilder.build();
+    }
+
+    /**
+     * 发送 GET 请求（HTTP），不带输入数据
+     *
+     * @param url
+     * @return
+     */
+    public static String doGet(String url) {
+        return doGet(url, new HashMap<String, Object>(), new HashMap<>());
+    }
+
+    /**
+     * 发送 GET 请求（HTTP），K-V形式
+     *
+     * @param url
+     * @param params
+     * @return
+     */
+    public static String doGet(String url, Map<String, Object> params, Map<String, String> headers) {
+        String apiUrl = url;
+        StringBuffer param = new StringBuffer();
+        int i = 0;
+        for (String key : params.keySet()) {
+            if (i == 0)
+                param.append("?");
+            else
+                param.append("&");
+            param.append(key).append("=").append(params.get(key));
+            i++;
+        }
+        apiUrl += param;
+        String result = null;
+        CloseableHttpClient httpClient = null;
+        if (apiUrl.startsWith("https")) {
+            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
+                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
+        } else {
+            httpClient = HttpClients.createDefault();
+        }
+        HttpResponse response = null;
+        try {
+            log.info("HttpUrl:{}",apiUrl);
+            HttpGet httpGet = new HttpGet(apiUrl);
+            httpGet.setConfig(requestConfig);
+            for (Map.Entry<String, String> header : headers.entrySet()) {
+                httpGet.addHeader(header.getKey(), header.getValue());
+            }
+            response = httpClient.execute(httpGet);
+            HttpEntity entity = response.getEntity();
+            if (entity != null) {
+                InputStream instream = entity.getContent();
+                result = IOUtils.toString(instream, "UTF-8");
+                logger.info("Http Result:{}",result);
+            }
+        } catch (IOException e) {
+            logger.error("Http Error:{}",e.getMessage());
+            try {
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+                if (response != null) {
+                    EntityUtils.consume(response.getEntity());
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    public static InputStream doGet(String url,Map<String, Object> params) {
+        HashMap<String, String> headers = new HashMap<>();
+        String apiUrl = url;
+        StringBuffer param = new StringBuffer();
+        int i = 0;
+        for (String key : params.keySet()) {
+            if (i == 0)
+                param.append("?");
+            else
+                param.append("&");
+            param.append(key).append("=").append(params.get(key));
+            i++;
+        }
+        apiUrl += param;
+        InputStream result = null;
+        CloseableHttpClient httpClient = null;
+        if (apiUrl.startsWith("https")) {
+            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
+                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
+        } else {
+            httpClient = HttpClients.createDefault();
+        }
+        HttpResponse response = null;
+        try {
+            log.info("HttpUrl:{}",apiUrl);
+            HttpGet httpGet = new HttpGet(apiUrl);
+            httpGet.setConfig(requestConfig);
+            for (Map.Entry<String, String> header : headers.entrySet()) {
+                httpGet.addHeader(header.getKey(), header.getValue());
+            }
+            response = httpClient.execute(httpGet);
+            HttpEntity entity = response.getEntity();
+            if (entity != null) {
+                result = entity.getContent();
+                logger.info("Http Result:{}",result);
+            }
+        } catch (IOException e) {
+            logger.error("Http Error:{}",e.getMessage());
+            try {
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+                if (response != null) {
+                    EntityUtils.consume(response.getEntity());
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
+        return result;
+    }
+    /**
+     * 发送 GET 请求（HTTP），K-V形式--------取消重定向！！！！！！
+     *
+     * @param url
+     * @param params
+     * @return
+     */
+    public static HttpResponse doGetAndReturnResponse(String url, Map<String, Object> params, Map<String, String> headers) {
+        String apiUrl = url;
+        StringBuffer param = new StringBuffer();
+        int i = 0;
+        for (String key : params.keySet()) {
+            if (i == 0)
+                param.append("?");
+            else
+                param.append("&");
+            param.append(key).append("=").append(params.get(key));
+            i++;
+        }
+        apiUrl += param;
+
+        CloseableHttpClient httpClient = null;
+        if (apiUrl.startsWith("https")) {
+            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
+                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
+        } else {
+            httpClient = HttpClients.createDefault();
+        }
+        CloseableHttpResponse response = null;
+        try {
+            HttpGet httpGet = new HttpGet(apiUrl);
+            httpGet.setConfig(requestConfig);
+
+            //取消强制重定向！！！！！
+            httpGet.setConfig(RequestConfig.custom().setRedirectsEnabled(false).build());
+
+
+            for (Map.Entry<String, String> header : headers.entrySet()) {
+                httpGet.addHeader(header.getKey(), header.getValue());
+            }
+            response = httpClient.execute(httpGet);
+
+            return response;
+        } catch (IOException e) {
+            try {
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+                if (response != null) {
+                    EntityUtils.consume(response.getEntity());
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 发送 POST 请求（HTTP），不带输入数据
+     *
+     * @param apiUrl
+     * @return
+     */
+    public static String doPost(String apiUrl) {
+        return doPost(apiUrl, "", new HashMap<>());
+    }
+
+    /**
+     * 发送 POST 请求，K-V形式
+     *
+     * @param apiUrl API接口URL
+     * @return
+     */
+    public static String doPost(String apiUrl, String paramStr, Map<String, String> headers) {
+        CloseableHttpClient httpClient = null;
+        if (apiUrl.startsWith("https")) {
+            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
+                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
+        } else {
+            httpClient = HttpClients.createDefault();
+        }
+        String httpStr = null;
+        HttpPost httpPost = new HttpPost(apiUrl);
+        CloseableHttpResponse response = null;
+
+        try {
+            httpPost.setConfig(requestConfig);
+            if(CollectionUtils.isNotEmpty(headers.entrySet())){
+                for (Map.Entry<String, String> header : headers.entrySet()) {
+                    httpPost.addHeader(header.getKey(), header.getValue());
+                }
+            }
+            httpPost.setEntity(new StringEntity(paramStr));
+            response = httpClient.execute(httpPost);
+            HttpEntity entity = response.getEntity();
+            httpStr = EntityUtils.toString(entity, "UTF-8");
+        } catch (IOException e) {
+            log.error("Http调用异常：{}",e.getMessage());
+            e.printStackTrace();
+        } finally {
+            try {
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+                if (response != null) {
+                    EntityUtils.consume(response.getEntity());
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
+        return httpStr;
+    }
+
+    public static HttpResponse doPostAndReturnResponse(String apiUrl, Map<String, String> params, Map<String, String> headers) {
+        CloseableHttpClient httpClient = null;
+        if (apiUrl.startsWith("https")) {
+            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
+                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
+        } else {
+            httpClient = HttpClients.createDefault();
+        }
+        HttpPost httpPost = new HttpPost(apiUrl);
+        CloseableHttpResponse response = null;
+
+        try {
+            httpPost.setConfig(requestConfig);
+            for (Map.Entry<String, String> header : headers.entrySet()) {
+                httpPost.addHeader(header.getKey(), header.getValue());
+            }
+            //组织请求参数
+            List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+            if (params != null && params.size() > 0) {
+                Set<String> keySet = params.keySet();
+                for (String key : keySet) {
+                    paramList.add(new BasicNameValuePair(key, params.get(key)));
+                }
+            }
+            httpPost.setEntity(new UrlEncodedFormEntity(paramList, "UTF-8"));
+            response = httpClient.execute(httpPost);
+            return response;
+        } catch (IOException e) {
+            log.error("发送Http Post异常：{}", e);
+        } finally {
+            try {
+                if (httpClient != null) {
+                //    httpClient.close();
+                }
+                if (response != null) {
+                    EntityUtils.consume(response.getEntity());
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 发送 POST 请求，JSON形式，接收端需要支持json形式，否则取不到数据
+     *
+     * @param apiUrl
+     * @param json   json对象
+     * @return
+     */
+    public static String doPost(String apiUrl, String json) {
+        CloseableHttpClient httpClient = null;
+        if (apiUrl.startsWith("https")) {
+            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory()).setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
+        } else {
+            httpClient = HttpClients.createDefault();
+        }
+        String httpStr = null;
+        HttpPost httpPost = new HttpPost(apiUrl);
+        CloseableHttpResponse response = null;
+
+        try {
+            httpPost.setConfig(requestConfig);
+            StringEntity stringEntity = new StringEntity(json, "UTF-8");// 解决中文乱码问题
+            stringEntity.setContentEncoding("UTF-8");
+            stringEntity.setContentType("application/json");
+            httpPost.setEntity(stringEntity);
+            response = httpClient.execute(httpPost);
+            HttpEntity entity = response.getEntity();
+            httpStr = EntityUtils.toString(entity, "UTF-8");
+        } catch (IOException e) {
+            log.error("发送Http Post异常：{}}", e);
+        } finally {
+            try {
+                if (response != null) {
+                    EntityUtils.consume(response.getEntity());
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
+        return httpStr;
+    }
+
+    /**
+     * 创建SSL安全连接
+     *
+     * @return
+     */
+    private static SSLConnectionSocketFactory createSSLConnSocketFactory() {
+        SSLConnectionSocketFactory sslsf = null;
+        try {
+            SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+
+                public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                    return true;
+                }
+            }).build();
+            sslsf = new SSLConnectionSocketFactory(sslContext, new HostnameVerifier() {
+
+                @Override
+                public boolean verify(String arg0, SSLSession arg1) {
+                    return true;
+                }
+            });
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }
+        return sslsf;
+    }
+
+
+}
@@ -7,7 +7,7 @@ spring:
             # 主库数据源
             master:
                 # 测试地址
-                url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true
                 username: root
                 password: guzijian
             # 从库数据源
@@ -144,7 +144,13 @@ api:
         nonce: adfsad
     apk:
         path: /apk/dev/
+    # 用户头像存放位置
+    headImage: /head/image
+
     personnel:
-        tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
-        appKey: dingsclwvxui5zilg1xk
-        appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
 \ No newline at end of file
+        token:
+            tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+            appKey: dingsclwvxui5zilg1xk
+            appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
+        people:
+            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 \ No newline at end of file
@@ -71,7 +71,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: D:/ruoyi/uploadPath
+    profile: /home/ruoyi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -104,6 +104,9 @@ api:
         nonce: adfsad
     apk:
         path: /apk/dev/
+    # 用户头像存放位置
+    headImage: /head/image
+
     personnel:
         tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
         appKey: dingsclwvxui5zilg1xk
@@ -164,6 +164,9 @@ api:
     nonce: adfsad
   apk:
     path: /apk/dev/
+  # 用户头像存放位置
+  headImage: /head/image
+
   personnel:
     token:
       tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
@@ -188,6 +188,8 @@
             <if test="faceSignIn != null">#{faceSignIn},</if>
             <if test="image != null">#{image}</if>
         </trim>
+        on duplicate key update
+        job_code = values(job_code)
     </insert>
     <update id="updateDriver" parameterType="Driver">
@@ -46,6 +46,9 @@ public class RedisCache {
     public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
+    public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
+        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+    }
     /**
      * 设置有效时间
@@ -263,7 +266,7 @@ public class RedisCache {
         return redisTemplate.opsForHash().delete(key, hKey) > 0;
     }
-    public Integer increment(String key, String hkey,Integer value){
+    public Integer setIncrementMapValue(String key, String hkey, Integer value){
         return redisTemplate.opsForHash().increment(key,hkey,value.longValue()).intValue();
     }