Merge branch 'master' of http://120.25.74.229:8003/ztpt-dev/data-service

video/src/main/java/cn/com/taiji/video/VideoApplication.java

@@ -5,7 +5,10 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @MapperScan(basePackages = "cn.com.taiji.video.mapper")
 @SpringBootApplication
 public class VideoApplication {

video/src/main/java/cn/com/taiji/video/service/impl/VideoUrlServiceImpl.java

@@ -45,6 +45,12 @@ public class VideoUrlServiceImpl implements IVideoUrlService {
     @Autowired
     private IHtDpVideoAnalysisService videoAnalysisService;
 
+    @Value("${taiji.clientId}")
+    private String clientId;
+
+    @Value("${taiji.clientSecret}")
+    private String clientSecret;
+
     @Value("${taiji.faceTaskId}")
     private String faceTaskId;
 
@@ -65,8 +71,8 @@ public class VideoUrlServiceImpl implements IVideoUrlService {
     @Override
     public void httpsPost(String deviceids) {
         MultiValueMap<String,String> params = new LinkedMultiValueMap<>();
-        params.add("client_id","5f1bf9b33df94328a559dfed33bf3605");
-        params.add("client_secret","970f78a3c2704aa2be402933e558f371");
+        params.add("client_id",clientId);
+        params.add("client_secret",clientSecret);
         params.add("grant_type","client_credentials");
 
         String tokenUrl = url + "/tglserver/token";
@@ -80,7 +86,7 @@ public class VideoUrlServiceImpl implements IVideoUrlService {
         log.info(token);
 
         //登录接口
-        String deviceUrl = url + "/api/Common/GeMonitorListByDeviceId?client_id=5f1bf9b33df94328a559dfed33bf3605&deviceids="+deviceids;
+        String deviceUrl = url + "/api/Common/GeMonitorListByDeviceId?client_id="+clientId+"&deviceids="+deviceids;
 
         headers.clear();
         headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
@@ -163,64 +169,6 @@ public class VideoUrlServiceImpl implements IVideoUrlService {
         }
     }
 
-    @Scheduled(cron = "0 0 5 * * ?")
-    public void scheduleOne() {
-        log.info("===========定时开始===========");
-        LocalDate localDate = LocalDate.now().plusDays(-1);
-        log.info("统计日期：{}",localDate);
-        log.info("获取视频解析人员");
-        this.querytime(1,localDate);
-        log.info("获取视频解析车辆");
-        this.querytime(2,localDate);
-        log.info("===========定时结束===========");
-    }
-
-    public void querytime(Integer type, LocalDate localDate) {
-        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM");
-        ArtemisConfig.host=analysisUrl;
-        ArtemisConfig.appKey=ak;
-        ArtemisConfig.appSecret=sk;
-        final String artemispath = "/artemis";
-        long startTimestamp = LocalDateTime.of(localDate, LocalTime.MIN).toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
-        long endTimestamp = LocalDateTime.of(localDate, LocalTime.MAX).toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
-        log.info("开始时间：{} ；结束时间：{}",startTimestamp,endTimestamp);
-        HtDpVideoAnalysis videoAnalysis = new HtDpVideoAnalysis();
-        videoAnalysis.setYear(String.valueOf(localDate.getYear()));
-        videoAnalysis.setYearMonth(localDate.format(fmt));
-        videoAnalysis.setStatDate(localDate);
-        videoAnalysis.setType(type);
-        String taskId = carTaskId;
-        if (1 == type) {
-            taskId = faceTaskId;
-        }
-        videoAnalysis.setTaskId(taskId);
-        String previewurlsapi = artemispath + "/api/v2/tasks/picture/statistics/"+taskId+"/"+ startTimestamp +"/"+endTimestamp;
-        log.info(previewurlsapi);
-
-        Map<String, String> path = new HashMap<String, String>(2) {
-            {
-                put("https://", previewurlsapi);//根据现场环境部署确认是http还是https
-            }
-        };
-        String contentType = "application/json";
-        // post请求application/json类型参数
-        String result = ArtemisHttpUtil.doGetArtemis(path, null, null, contentType, null);
-        log.info(result);
-        JSONObject jsonObject = JSONObject.parseObject(result).getJSONObject("data");
-        videoAnalysis.setPicAnalysisTotal(jsonObject.getInteger("picAnalysisTotal"));
-        videoAnalysis.setPicAnalysisFailCount(jsonObject.getInteger("picAnalysisFailCount"));
-        videoAnalysis.setPicAnalysisSuccessCount(jsonObject.getInteger("picAnalysisSuccessCount"));
-        videoAnalysis.setPicCaptureTotal(jsonObject.getInteger("picCaptureTotal"));
-        videoAnalysis.setPicFilterCount(jsonObject.getInteger("picFilterCount"));
-        videoAnalysis.setPicSubmitFailCount(jsonObject.getInteger("picSubmitFailCount"));
-        videoAnalysis.setPicSubmitSuccessCount(jsonObject.getInteger("picSubmitSuccessCount"));
-        videoAnalysisService.saveOrUpdate(
-                videoAnalysis,
-                Wrappers.<HtDpVideoAnalysis>lambdaUpdate()
-                        .eq(HtDpVideoAnalysis::getType,type)
-                        .eq(HtDpVideoAnalysis::getStatDate,localDate));
-    }
-
     @Override
     public VideoAnalysisPieDTO queryPieRecord(Integer type) {
         LocalDate localDate = LocalDate.now();

video/src/main/java/cn/com/taiji/video/task/TimeTask.java

@@ -0,0 +1,111 @@
+package cn.com.taiji.video.task;
+
+
+import cn.com.taiji.video.model.HtDpVideoAnalysis;
+import cn.com.taiji.video.service.IHtDpVideoAnalysisService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description
+ *
+ * @Author  yangyue
+ * @Date 2023/8/4
+ */
+@Component
+@Slf4j
+public class TimeTask {
+
+    @Autowired
+    private IHtDpVideoAnalysisService videoAnalysisService;
+
+    @Value("${taiji.faceTaskId}")
+    private String faceTaskId;
+
+    @Value("${taiji.carTaskId}")
+    private String carTaskId;
+
+    @Value("${taiji.url}")
+    private String analysisUrl;
+
+    @Value("${taiji.ak}")
+    private String ak;
+
+    @Value("${taiji.sk}")
+    private String sk;
+
+
+    @Scheduled(cron = "0 0 5 * * ?")
+    public void scheduleOne() {
+        log.info("===========定时开始===========");
+        LocalDate localDate = LocalDate.now().plusDays(-1);
+        log.info("统计日期：{}",localDate);
+        log.info("获取视频解析人员");
+        this.querytime(1,localDate);
+        log.info("获取视频解析车辆");
+        this.querytime(2,localDate);
+        log.info("===========定时结束===========");
+    }
+
+    public void querytime(Integer type, LocalDate localDate) {
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM");
+        ArtemisConfig.host=analysisUrl;
+        ArtemisConfig.appKey=ak;
+        ArtemisConfig.appSecret=sk;
+        final String artemispath = "/artemis";
+        long startTimestamp = LocalDateTime.of(localDate, LocalTime.MIN).toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
+        long endTimestamp = LocalDateTime.of(localDate, LocalTime.MAX).toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
+        log.info("开始时间：{} ；结束时间：{}",startTimestamp,endTimestamp);
+        HtDpVideoAnalysis videoAnalysis = new HtDpVideoAnalysis();
+        videoAnalysis.setYear(String.valueOf(localDate.getYear()));
+        videoAnalysis.setYearMonth(localDate.format(fmt));
+        videoAnalysis.setStatDate(localDate);
+        videoAnalysis.setType(type);
+        String taskId = carTaskId;
+        if (1 == type) {
+            taskId = faceTaskId;
+        }
+        videoAnalysis.setTaskId(taskId);
+        String previewurlsapi = artemispath + "/api/v2/tasks/picture/statistics/"+taskId+"/"+ startTimestamp +"/"+endTimestamp;
+        log.info(previewurlsapi);
+
+        Map<String, String> path = new HashMap<String, String>(2) {
+            {
+                put("https://", previewurlsapi);//根据现场环境部署确认是http还是https
+            }
+        };
+        String contentType = "application/json";
+        // post请求application/json类型参数
+        String result = ArtemisHttpUtil.doGetArtemis(path, null, null, contentType, null);
+        log.info(result);
+        JSONObject jsonObject = JSONObject.parseObject(result).getJSONObject("data");
+        videoAnalysis.setPicAnalysisTotal(jsonObject.getInteger("picAnalysisTotal"));
+        videoAnalysis.setPicAnalysisFailCount(jsonObject.getInteger("picAnalysisFailCount"));
+        videoAnalysis.setPicAnalysisSuccessCount(jsonObject.getInteger("picAnalysisSuccessCount"));
+        videoAnalysis.setPicCaptureTotal(jsonObject.getInteger("picCaptureTotal"));
+        videoAnalysis.setPicFilterCount(jsonObject.getInteger("picFilterCount"));
+        videoAnalysis.setPicSubmitFailCount(jsonObject.getInteger("picSubmitFailCount"));
+        videoAnalysis.setPicSubmitSuccessCount(jsonObject.getInteger("picSubmitSuccessCount"));
+        videoAnalysisService.saveOrUpdate(
+                videoAnalysis,
+                Wrappers.<HtDpVideoAnalysis>lambdaUpdate()
+                        .eq(HtDpVideoAnalysis::getType,type)
+                        .eq(HtDpVideoAnalysis::getStatDate,localDate));
+    }
+
+}

video/src/main/resources/application.yml

@@ -58,6 +58,10 @@ mybatis-plus:
       update-strategy: not_empty
     banner: false   # 不打印banner
 taiji:
+#  clientId: 5f1bf9b33df94328a559dfed33bf3605
+#  clientSecret: 970f78a3c2704aa2be402933e558f371
+  clientId: d0773cd26f6349eeb7af8d0f47d81d9a
+  clientSecret: 0a7445624cac4bbdb1361ee3a6635327
   url: 10.110.33.6:443
   ak: 27335616
   sk: KZTwnMbtnKHCyNju0eur