From 2ea6f1abf46fa5a911200c998dddc6ea374cd246 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 三月 2025 19:45:25 +0800
Subject: [PATCH] 修改演示版本的逻辑
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Vehicles.java | 5 ++
guns-admin/src/main/java/com/stylefeng/guns/core/util/CrossOriginFilter.java | 54 +++++++++++++++++++++++++++
guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java | 1
guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java | 1
guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java | 11 +++--
guns-admin/src/main/resources/application.yml | 10 ++--
6 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java b/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
index 20e6b8e..7d25b20 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
@@ -21,6 +21,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.request.RequestContextListener;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/core/util/CrossOriginFilter.java b/guns-admin/src/main/java/com/stylefeng/guns/core/util/CrossOriginFilter.java
new file mode 100644
index 0000000..99c9f95
--- /dev/null
+++ b/guns-admin/src/main/java/com/stylefeng/guns/core/util/CrossOriginFilter.java
@@ -0,0 +1,54 @@
+package com.stylefeng.guns.core.util;
+
+
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 统一配置跨域处理
+ */
+@Order(-100)
+@Component
+@ServletComponentScan
+@WebFilter(urlPatterns = "/*",filterName = "crossOriginFilter")
+public class CrossOriginFilter implements Filter {
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ // 允许哪些Origin发起跨域请求
+ // response.setHeader( "Access-Control-Allow-Origin", config.getInitParameter( "AccessControlAllowOrigin" ) );
+ response.setHeader( "Access-Control-Allow-Origin", "*" );
+ // 允许请求的方法
+ response.setHeader( "Access-Control-Allow-Methods", "POST,GET,OPTIONS,DELETE,PUT" );
+ //多少秒内,不需要再发送预检验请求，可以缓存该结果
+ response.setHeader( "Access-Control-Max-Age", "3600" );
+ // 表明它允许跨域请求包含xxx头
+ response.setHeader( "Access-Control-Allow-Headers", "x-auth-token,Origin,Access-Token,X-Requested-With,Content-Type, Accept, Authorization" );
+ //是否允许浏览器携带用户身份信息（cookie）
+ response.setHeader( "Access-Control-Allow-Credentials", "true" );
+ //prefight请求
+ if (request.getMethod().equals( "OPTIONS" )) {
+ response.setStatus( 204 );
+ return;
+ }
+ filterChain.doFilter( servletRequest, response );
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+}
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
index 3c0fcf8..cbdfdff 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
@@ -131,6 +131,7 @@
vehicle1.setId(vehicle.getId());
vehicle1.setVehicleNum(vehicle.getVehicleCode());
vehicle1.setCompanyName(vehicle.getCompanyName());
+ vehicle1.setCompanyId(vehicle.getCompanyId().toString());
list.add(vehicle1);
}
return ResultUtil.success(list);
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Vehicles.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Vehicles.java
index 340fd13..85708b8 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Vehicles.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Vehicles.java
@@ -28,4 +28,9 @@
*/
@TableField("companyName")
private String companyName;
+ /**
+ * 公司id
+ */
+ @TableField("companyId")
+ private Integer companyId;
}
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java
index 9393b91..bf42180 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java
@@ -35,8 +35,7 @@
/**
* 本地存储图片地址
*/
- private static String filePath = "/home/file/image/";
-// private static String filePath = "d:/file/";
+ private static String filePath = "/home/yijing010/server/app/image/";
/**
@@ -75,6 +74,7 @@
log.error("顶盖密闭模型调用失败：" + execute.body());
throw new RuntimeException("顶盖密闭模型调用失败：" + execute.body());
}
+ log.info("调用顶盖密闭模型结果：{}", execute.body());
JSONObject result = JSON.parseObject(execute.body());
JSONArray predicted_labels = result.getJSONArray("predicted_labels");
List<String> list = new ArrayList<>();
@@ -112,15 +112,16 @@
private static List<String> cameraFaultModel(File file){
log.info("--------调用摄像头故障模型开始--------");
HttpRequest post = HttpUtil.createPost("http://120.232.235.142:4000/predict");
- post.form("file", file);
+ post.form("file1", file);
HttpResponse execute = post.execute();
int status = execute.getStatus();
if(200 != status){
log.error("摄像头故障模型调用失败：" + execute.body());
throw new RuntimeException("摄像头故障模型调用失败：" + execute.body());
}
- JSONObject result = JSON.parseObject(execute.body());
- String predicted_labels = result.getString("predicted_label");
+ log.info("调用摄像头故障模型结果：{}", execute.body());
+ JSONArray result = JSON.parseArray(execute.body());
+ String predicted_labels = result.getJSONObject(0).getString("predicted_label");
List<String> list = new ArrayList<>();
list.add(predicted_labels);
log.info("--------调用摄像头故障模型结束--------");
diff --git a/guns-admin/src/main/resources/application.yml b/guns-admin/src/main/resources/application.yml
index 142e9e5..1e1047c 100644
--- a/guns-admin/src/main/resources/application.yml
+++ b/guns-admin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 3000
guns:
swagger-open: true #是否开启swagger (true/false)
@@ -45,12 +45,12 @@
---
-# 岐济生数据库
+# jaabc数据库
spring:
datasource:
- url: jdbc:mysql://47.109.70.48:3306/vehicle_inspection_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://8.137.16.120:3306/vehicle_inspection_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: Si8bnm5KPGSZkF3F
+ password: dGms8IAd6vi7Aiff
db-name: vehicle_inspection #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -102,4 +102,4 @@
---
# 任务执行最大线程数
-maxThreadCount: 50
\ No newline at end of file
+maxThreadCount: 2
\ No newline at end of file
--
Gitblit v1.7.1