admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并解决冲突或升级jdk17语法

Browse Source
This commit is contained in:
guoshengxiong 2025-10-16 16:57:07 +08:00
parent d4bd514d9a
commit 0eb84d4cf6
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pom.xml
View File

@ -26,6 +26,8 @@
<commons.version>2.6</commons.version> <commons.version>2.6</commons.version>
<tomcat.version>10.1.44</tomcat.version> <tomcat.version>10.1.44</tomcat.version>
<netty.version>4.1.124.Final</netty.version> <netty.version>4.1.124.Final</netty.version>
<djl.platform.windows-x86_64>win-x86_64</djl.platform.windows-x86_64>
<djl.platform.linux-x86_64>linux-x86_64</djl.platform.linux-x86_64>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -102,6 +104,38 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!--PyTorch离线平台依赖-->
<dependency>
<groupId>ai.djl.pytorch</groupId>
<artifactId>pytorch-native-cpu</artifactId>
<classifier>${djl.platform.linux-x86_64}</classifier>
<version>2.5.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ai.djl.pytorch</groupId>
<artifactId>pytorch-jni</artifactId>
<version>2.5.1-0.32.0</version>
<scope>runtime</scope>
</dependency>
<!--tensorflow离线平台依赖-->
<dependency>
<groupId>ai.djl.tensorflow</groupId>
<artifactId>tensorflow-native-cpu</artifactId>
<classifier>${djl.platform.linux-x86_64}</classifier>
<scope>runtime</scope>
<version>2.16.1</version>
</dependency>
<!--mxnet离线平台依赖-->
<dependency>
<groupId>ai.djl.mxnet</groupId>
<artifactId>mxnet-native-mkl</artifactId>
<classifier>${djl.platform.linux-x86_64}</classifier>
<scope>runtime</scope>
<version>1.9.1</version>
</dependency>
<dependency> <dependency>
<groupId>com.tencentcloudapi</groupId> <groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java</artifactId> <artifactId>tencentcloud-sdk-java</artifactId>

1
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
View File

@ -152,6 +152,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
private ISystemUserService systemUserService; private ISystemUserService systemUserService;
@Autowired @Autowired
private CarCameraMapper carCameraMapper; private CarCameraMapper carCameraMapper;
@Lazy
@Autowired @Autowired
private ITowerService towerService; private ITowerService towerService;
@Autowired @Autowired