瀏覽代碼

更新了局部变量声明形式

verguenza 5 年之前
父節點
當前提交
f59eefe8cf

+ 2 - 2
pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.2.6.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.galaxis</groupId>
     <artifactId>manatee</artifactId>
-    <version>0.1</version>
+    <version>1.0</version>
     <name>manatee</name>
     <description>galaxis first step into cloud</description>
 

+ 6 - 6
src/main/java/com/galaxis/manatee/service/ChuanyunScheduledTask.java

@@ -69,10 +69,10 @@ public class ChuanyunScheduledTask {
      * 预计2020年4月份之后逐步将各个部门物料补发数据迁移到氚云进行审批,这个功能逐步废弃
      */
     private void putMaterialResendInstance(){
-        int currentPage=0;
-        int totalPage=Integer.MAX_VALUE;
+        var currentPage=0;
+        var totalPage=Integer.MAX_VALUE;
 
-        ObjectMapper objectMapper=new ObjectMapper();
+        var objectMapper=new ObjectMapper();
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 
@@ -116,9 +116,9 @@ public class ChuanyunScheduledTask {
      * 定时更新项目信息
      */
     private void getProjectInformationFromChuanyun(){
-        int start=0;
-        long totalCount=0;
-        boolean flag=true;
+        var start=0;
+        var totalCount=0L;
+        var flag=true;
         while (flag){
             try {
                 //从氚云查询数据

+ 8 - 4
src/main/java/com/galaxis/manatee/service/DingTalkAuthorization.java

@@ -32,11 +32,15 @@ public class DingTalkAuthorization {
      */
     @Scheduled(fixedDelay = 7000000L)
     private void getToken() throws URISyntaxException {
-        RestTemplate restTemplate=new RestTemplate();
-        URI uri=new URI(getTokenUri+"?appkey="+ DingTalkConstant.DING_TALK_APP_KEY +"&appsecret="+DingTalkConstant.DING_TALK_APP_SECRET);
+        var restTemplate=new RestTemplate();
+        var uri=new URI(getTokenUri+"?appkey="+ DingTalkConstant.DING_TALK_APP_KEY +"&appsecret="+DingTalkConstant.DING_TALK_APP_SECRET);
         DingTalkToken dingTalkToken=restTemplate.getForObject(uri,DingTalkToken.class);
-        DingTalkConstant.DING_TALK_TOKEN =dingTalkToken.getAccessToken();
-        log.info("获得token"+ LocalDateTime.now());
+        if(dingTalkToken!=null){
+            DingTalkConstant.DING_TALK_TOKEN =dingTalkToken.getAccessToken();
+            log.info("获得token"+ LocalDateTime.now());
+        }else {
+            log.error("获取钉钉token失败");
+        }
     }
 
     /**

+ 11 - 10
src/main/java/com/galaxis/manatee/service/DingTalkScheduledTask.java

@@ -73,17 +73,17 @@ public class DingTalkScheduledTask {
     }
 
     private void updateProcessInstanceIdList(String businessTripProcessCode) throws ApiException {
-        boolean flag=true;
+        var flag=true;
         //单个请求
-        OapiProcessinstanceListidsRequest oapiProcessinstanceListidsRequest=new OapiProcessinstanceListidsRequest();
-        oapiProcessinstanceListidsRequest.setProcessCode(businessTripProcessCode);
-        oapiProcessinstanceListidsRequest.setStartTime(LocalDateTime.of(2019,1,1,0,0).toInstant(ZoneOffset.UTC).toEpochMilli());
-        oapiProcessinstanceListidsRequest.setEndTime(LocalDateTime.now().toInstant(ZoneOffset.UTC).toEpochMilli());
-        oapiProcessinstanceListidsRequest.setCursor(0L);
-        oapiProcessinstanceListidsRequest.setSize(20L);
+        var oApiProcessInstanceListIdsRequest=new OapiProcessinstanceListidsRequest();
+        oApiProcessInstanceListIdsRequest.setProcessCode(businessTripProcessCode);
+        oApiProcessInstanceListIdsRequest.setStartTime(LocalDateTime.of(2019,1,1,0,0).toInstant(ZoneOffset.UTC).toEpochMilli());
+        oApiProcessInstanceListIdsRequest.setEndTime(LocalDateTime.now().toInstant(ZoneOffset.UTC).toEpochMilli());
+        oApiProcessInstanceListIdsRequest.setCursor(0L);
+        oApiProcessInstanceListIdsRequest.setSize(20L);
         while(flag){
             LocalDateTime start=LocalDateTime.now();
-            OapiProcessinstanceListidsResponse oapiProcessinstanceListidsResponse=processInstanceListIdsClient.execute(oapiProcessinstanceListidsRequest,DingTalkConstant.DING_TALK_TOKEN);
+            OapiProcessinstanceListidsResponse oapiProcessinstanceListidsResponse=processInstanceListIdsClient.execute(oApiProcessInstanceListIdsRequest,DingTalkConstant.DING_TALK_TOKEN);
             List<DingTalkProcessInstance> dingTalkProcessInstanceList=new ArrayList<>();
             if(oapiProcessinstanceListidsResponse.getErrcode()!=0){
                 log.info(oapiProcessinstanceListidsResponse.getErrmsg());
@@ -97,7 +97,8 @@ public class DingTalkScheduledTask {
             //逐个请求
             oapiProcessinstanceListidsResponse.getResult().getList().forEach(resultId->{
                 Optional<DingTalkProcessInstance> instance=dingTalkProcessInstanceDao.findById(resultId);
-                if(!instance.isEmpty()&&instance.get()==null){
+                if(!instance.isEmpty()){
+                    //&&instance.get()==null
                     //淘宝SDK方法
                     OapiProcessinstanceGetRequest request=new OapiProcessinstanceGetRequest();
                     request.setProcessInstanceId(resultId);
@@ -118,7 +119,7 @@ public class DingTalkScheduledTask {
             log.info(businessTripProcessCode+"下一个cursor为"+oapiProcessinstanceListidsResponse.getResult().getNextCursor()+"保存成功"+"耗时"+ ChronoUnit.SECONDS.between(start,LocalDateTime.now())+"秒");
             flag=null!=oapiProcessinstanceListidsResponse.getResult().getNextCursor();
             if (flag){
-                oapiProcessinstanceListidsRequest.setCursor(oapiProcessinstanceListidsResponse.getResult().getNextCursor());
+                oApiProcessInstanceListIdsRequest.setCursor(oapiProcessinstanceListidsResponse.getResult().getNextCursor());
             }
         }
     }

+ 3 - 3
src/main/java/com/galaxis/manatee/util/DingTalkRobotUtils.java

@@ -27,10 +27,10 @@ public class DingTalkRobotUtils {
      * @throws InvalidKeyException          非法的关键字
      */
     public static String sign(String secret,Long timestamp) throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
-        String stringToSign = timestamp + "\n" + secret;
-        Mac mac = Mac.getInstance("HmacSHA256");
+        var stringToSign = timestamp + "\n" + secret;
+        var mac = Mac.getInstance("HmacSHA256");
         mac.init(new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
-        byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8));
+        var signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8));
         return URLEncoder.encode(new String(Base64.encodeBase64(signData)),StandardCharsets.UTF_8);
     }
 }

+ 2 - 2
src/main/resources/application.yml

@@ -36,8 +36,8 @@ spring:
       thread-name-prefix: scheduled-task-
   datasource:
     url: jdbc:mysql://localhost:3306/manatee?autoReconnect=true&characterEncoding=utf-8
-    username: root
-    password: kcsm@111
+    username: ${USER_NAME}
+    password: ${PASSWORD}
   jpa:
     hibernate:
       ddl-auto: update