fix: 新增日志，新增请求token任务

guzijian
1 parent 5ab2f5ee
Showing 9 changed files with 110 additions and 20 deletions
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/request/TokenRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/SignInResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/TokenResponseVo.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
@@ -164,6 +164,7 @@ public class SignInServiceImpl implements ISignInService {
         SignInResponseVo vo = new SignInResponseVo();
         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);
     }
  
@@ -4,14 +4,17 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.pojo.response.ResponseScheduling;
+import com.ruoyi.pojo.response.TokenResponseVo;
 import com.ruoyi.utils.ConstDateUtil;
 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.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;
@@ -42,6 +45,16 @@ public class DriverJob implements InitializingBean {
     @Value("${api.url.getDriverInfo}")
     private String getDriverInfoUrl;
  
+
+    @Value("${api.personnel.token.tokenUrl}")
+    private String tokenUrl;
+
+    @Value("${api.personnel.token.appKey}")
+    private String appKey;
+
+    @Value("${api.personnel.token.appSecret}")
+    private String appSecret;
+
     @Value("${api.url.getSchedulingInfo}")
     private String getSchedulingInfoUrl;
  
@@ -51,6 +64,9 @@ public class DriverJob implements InitializingBean {
     @Value("${api.config.nonce}")
     private String nonce;
  
+    private static String APP_KEY;
+    private static String TOKEN_URL;
+    private static String APP_SECRET;
     private static IDriverService DRIVER_SERVICE;
     private static RedisCache REDIS_CACHE;
     private static RestTemplate RESTTEMPLATE;
@@ -70,7 +86,7 @@ public class DriverJob implements InitializingBean {
             String getDriverInfoUrl = String.format(GET_DRIVER_INFO_URL, params);
             long timestamp = System.currentTimeMillis();
             // 获取驾驶员信息
-            List<Driver> drivers = getDrivers(getDriverInfoUrl, String.valueOf(timestamp));
+            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
@@ -89,6 +105,11 @@ public class DriverJob implements InitializingBean {
     }
  
     /**
+     * 获取员工数据
+     */
+
+
+    /**
      * 导入图片任务
      */
     public void importImages(){
@@ -131,25 +152,30 @@ public class DriverJob implements InitializingBean {
         return driverSchedulingMap;
     }
  
-    private List<Driver> getDrivers(String format, String timestamp) throws Exception {
+    private List<Driver> getDrivers(String url, String timestamp) throws Exception {
         Map<String, String> configMap = getStringStringMap(timestamp);
         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().stream().map(item ->{
-                    item.setJobCode(item.getJobCode().split("-")[1]);
-                    return item;
-                }).collect(Collectors.toList());
-        return drivers;
+        TokenResponseVo tokenVo = getToken(url);
+//        redisCache.setCacheObject();
+//        getPersonInfo(tokenVo);
+//        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);
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        // 创建HttpEntity对象
+        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(params, headers);
+
+        // 发送POST请求
+        ResponseEntity<TokenResponseVo> responseEntity = restTemplate.postForEntity(url, requestEntity, TokenResponseVo.class);
+        return responseEntity.getBody();
     }
  
     public Map<String, String> getStringStringMap(String timestamp) {
@@ -229,5 +255,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;
     }
 }
+package com.ruoyi.pojo.request;
+
+import lombok.Data;
+
+/**
+ * token请求vo
+ * @author 20412
+ */
+@Data
+public class TokenRequestVo {
+    String appKey;
+    String appSecret;
+
+}
@@ -10,4 +10,12 @@ import lombok.Data;
 public class SignInResponseVo {
     String address;
     String deviceId;
+
+    @Override
+    public String toString() {
+        return "SignInResponseVo{" +
+                "address='" + address + '\'' +
+                ", deviceId='" + deviceId + '\'' +
+                '}';
+    }
 }
+package com.ruoyi.pojo.response;
+
+import lombok.Data;
+
+/**
+ * token接收
+ * @author 20412
+ */
+@Data
+public class TokenResponseVo {
+    /**
+     * 生成的accessToken（此Token仅用于获取员工数据及获取临时照片下载地址）
+     */
+    String accessToken;
+    /**
+     * ：accessToken的有效期为7200秒（2小时）
+     */
+    Long expireIn;
+}
@@ -144,4 +144,7 @@ api:
         nonce: adfsad
     apk:
         path: /apk/dev/
-
+    personnel:
+        tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+        appKey: dingsclwvxui5zilg1xk
+        appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
 \ No newline at end of file
@@ -104,3 +104,7 @@ api:
         nonce: adfsad
     apk:
         path: /apk/dev/
+    personnel:
+        tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+        appKey: dingsclwvxui5zilg1xk
+        appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
 \ No newline at end of file
@@ -164,3 +164,10 @@ api:
     nonce: adfsad
   apk:
     path: /apk/dev/
+  personnel:
+    token:
+      tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+      appKey: dingsclwvxui5zilg1xk
+      appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
+    personnel:
+      url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 \ No newline at end of file
@@ -146,4 +146,8 @@ api:
   config:
     password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
     # 随机字符串
-    nonce: adfsad
 \ No newline at end of file
+    nonce: adfsad
+  personnel:
+    tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+    appKey: dingsclwvxui5zilg1xk
+    appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5