From 06bbe2b33d8f147a5c5b024f3c0e507b547e794b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 11 九月 2023 21:54:32 +0800
Subject: [PATCH] 100路视频
---
ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java | 2
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 1
document/副本丽水市遂昌县智慧执法应用-资源开通表 -0228.xlsx | 0
ycl-platform/src/main/java/com/ycl/util/VideoUtil.java | 1
ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java | 12 +++---
ycl-platform/src/main/java/com/ycl/PlatformApplication.java | 1
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 12 ++++++
ycl-platform/pom.xml | 72 +++++++++++++++++++++---------------
8 files changed, 63 insertions(+), 38 deletions(-)
diff --git "a/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx" "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
index 204dfb6..b26ff01 100644
--- "a/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
+++ "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
Binary files differ
diff --git a/ycl-platform/pom.xml b/ycl-platform/pom.xml
index 4cbc411..a573f41 100644
--- a/ycl-platform/pom.xml
+++ b/ycl-platform/pom.xml
@@ -30,12 +30,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.ycl</groupId>
- <artifactId>ycl-generator</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.ycl</groupId>-->
+<!-- <artifactId>ycl-generator</artifactId>-->
+<!-- <version>1.0.0</version>-->
+<!-- <scope>compile</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>com.alibaba.xxpt</groupId>
<artifactId>zwdd</artifactId>
@@ -67,17 +67,29 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <!-- 濡傛灉瑕佹妸渚濊禆涓�璧锋墦鍖�,娉ㄩ噴涓嬮潰configuration -->
<configuration>
- <layout>ZIP</layout>
- <includes>
- <!--灏嗕緷璧栧墧闄�,鍙紪璇戞墦鍖呮湰椤圭洰-->
- <include>
- <groupId>nothing</groupId>
- <artifactId>nothing</artifactId>
- </include>
- </includes>
+ <mainClass>com.ycl.PlatformApplication</mainClass> <!-- 鎸囧畾鍚姩涓荤被 -->
+ <fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 鎵撳寘 灏嗗閮╦ar鍖呮墦鍖呰繘椤圭洰涓� -->
+ <includeSystemScope>true</includeSystemScope> <!-- 鎵撳寘 灏嗗閮╦ar鍖呮墦鍖呰繘椤圭洰涓� -->
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ <!-- 濡傛灉瑕佹妸渚濊禆涓�璧锋墦鍖�,娉ㄩ噴涓嬮潰configuration -->
+<!-- <configuration>-->
+<!-- <layout>ZIP</layout>-->
+<!-- <includes>-->
+<!-- <!–灏嗕緷璧栧墧闄�,鍙紪璇戞墦鍖呮湰椤圭洰–>-->
+<!-- <include>-->
+<!-- <groupId>nothing</groupId>-->
+<!-- <artifactId>nothing</artifactId>-->
+<!-- </include>-->
+<!-- </includes>-->
+<!-- </configuration>-->
</plugin>
@@ -90,21 +102,21 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </configuration>
- <!--鎵цpackage鏃惰嚜鍔ㄥ皢渚濊禆澶嶅埗鍑烘潵鍒�/lib涓�-->
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+<!-- <plugin>-->
+<!-- <artifactId>maven-dependency-plugin</artifactId>-->
+<!-- <configuration>-->
+<!-- <outputDirectory>${project.build.directory}/lib</outputDirectory>-->
+<!-- </configuration>-->
+<!-- <!–鎵цpackage鏃惰嚜鍔ㄥ皢渚濊禆澶嶅埗鍑烘潵鍒�/lib涓�–>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <phase>package</phase>-->
+<!-- <goals>-->
+<!-- <goal>copy-dependencies</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
diff --git a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
index 5f2d978..163ff52 100644
--- a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
+++ b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
@@ -24,7 +24,6 @@
@EnableTransactionManagement(proxyTargetClass = true)
@SpringBootApplication
public class PlatformApplication {
-
public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext application = SpringApplication.run(PlatformApplication.class, args);
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
index 14f77d1..cea3bbb 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -4,14 +4,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
+import com.ycl.dto.video.Camera;
+import com.ycl.dto.video.PageResult;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.enums.common.DictTypeEnum;
import com.ycl.service.dict.IDataDictionaryService;
+import com.ycl.util.VideoUtil;
import com.ycl.vo.dict.DataDictionaryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -32,10 +36,18 @@
public class DatabaseDictionaryController extends BaseController {
@Resource
private IDataDictionaryService iDatabaseDictionaryService;
+ @Autowired
+ private VideoUtil videoUtil;
@GetMapping("/listAll")
@ApiOperation("鑾峰彇鎵�鏈夊瓧鍏�")
private CommonResult<List<DataDictionary>> listAll() {
+ try {
+ PageResult<Camera> pageResult = videoUtil.callPostCameras(1, 20, "0");
+ System.out.println("娴峰悍瑙嗛鎴愬姛锛�" + pageResult.getTotal());
+ } catch (Exception ex) {
+ System.out.println("娴峰悍瑙嗛锛�" + ex.getMessage());
+ }
return CommonResult.success(iDatabaseDictionaryService.getAll());
}
diff --git a/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java b/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
index 2c163f9..8ce0c7f 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
@@ -88,7 +88,7 @@
@Override
public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
- runAction();
+// runAction();
}
}
@Scheduled(cron ="0 0/2 * * * ? ")
diff --git a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
index 28e3e36..c85acea 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
@@ -52,11 +52,11 @@
@Override
public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
- if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
- Thread thread = new Thread(this::run);
- thread.setUncaughtExceptionHandler(handler);
- thread.start();
- }
+// if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
+// Thread thread = new Thread(this::run);
+// thread.setUncaughtExceptionHandler(handler);
+// thread.start();
+// }
}
@Autowired
@@ -204,6 +204,6 @@
@Override
public void run(ApplicationArguments args) throws Exception {
- run();
+// run();
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
index cb8bc5d..0906ea8 100644
--- a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
@@ -137,6 +137,7 @@
public PageResult<Camera> callPostCameras(Integer pageNo, Integer pageSize, String treeCode) throws Exception {
System.out.println("娴峰悍瑙嗛-callPostCameras");
ArtemisConfig config = new ArtemisConfig();
+ System.out.println("娴峰悍瑙嗛-config");
config.setHost(HOST); // 浠ｇ悊API缃戝叧nginx鏈嶅姟鍣╥p绔彛
config.setAppKey(APP_KEY); // 绉橀挜appkey
config.setAppSecret(APP_SECRET);// 绉橀挜appSecret
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index ed746d4..366f0a5 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -264,6 +264,7 @@
and t1.handling_opinion like concat('%',#{queryForViolationParam.handlingOpinion},'%')
</if>
</where>
+ order by t1.id desc
</select>
--
Gitblit v1.8.0