From 5559f732c6549e61df9a5efaba9e1b4c98552101 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Sat, 19 Jul 2025 18:30:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bonus-business/pom.xml | 28 +++++++-------- .../com/bonus/BonusBusinessApplication.java | 3 +- .../controller/robot/RobotController.java | 2 +- .../business/robot/util/XxmSendUtils.java | 5 +++ .../impl/RobotEventXmlServiceImpl.java | 8 ++--- .../service/impl/RobotServiceImpl.java | 5 ++- .../service/impl/SbdUserServiceImpl.java | 1 - .../src/main/resources/application-druid.yml | 34 +++++++++++-------- .../src/main/resources/application.yml | 5 +-- .../security/filter/AuthWriteUtils.java | 3 +- .../filter/SbdUserJwtTokenFilter.java | 27 ++++++++++----- pom.xml | 30 ++++++++-------- 12 files changed, 87 insertions(+), 64 deletions(-) diff --git a/bonus-business/pom.xml b/bonus-business/pom.xml index e3ecd56..2653112 100644 --- a/bonus-business/pom.xml +++ b/bonus-business/pom.xml @@ -21,24 +21,24 @@ 5.3.2 - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - + + + + + - - org.springframework.boot - spring-boot-devtools - true - + + + + + diff --git a/bonus-business/src/main/java/com/bonus/BonusBusinessApplication.java b/bonus-business/src/main/java/com/bonus/BonusBusinessApplication.java index 747a83a..54d766a 100644 --- a/bonus-business/src/main/java/com/bonus/BonusBusinessApplication.java +++ b/bonus-business/src/main/java/com/bonus/BonusBusinessApplication.java @@ -3,7 +3,6 @@ package com.bonus; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.scheduling.annotation.EnableScheduling; /** @@ -12,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @author ruoyi */ @EnableScheduling -@EnableDiscoveryClient +//@EnableDiscoveryClient @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) public class BonusBusinessApplication { diff --git a/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java b/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java index e9b1936..3a6365a 100644 --- a/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java +++ b/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java @@ -173,7 +173,7 @@ public class RobotController extends BaseController { } /** - * 查询录音文件 + * 删除录音文件 * @param vo * @return */ diff --git a/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java b/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java index 0956e54..f1a2d28 100644 --- a/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java +++ b/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java @@ -65,6 +65,11 @@ public class XxmSendUtils { */ public static String ROBOT_MAP_STOP="C_ST_RobotStopBase"; + /** + * 全部停止 + */ + public static String ROBOT_ALL_STOP="C_ST_RobotStop"; + /** * 机器人-前往充电桩 */ diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java index 0cf0cdb..7420255 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java @@ -192,9 +192,7 @@ public class RobotEventXmlServiceImpl implements IRobotEventXmlService { String res= QxVideotape.sendDevicePost(token, TVideoConfigUtil.Q2HTTPURL,puid,xml); Map map= XmlUtils.getRobotTaskImage(res); // 上传文件路径-配置生成 - String dateTimeNow=DateUtils.dateTimeNow(); - long millis=System.currentTimeMillis(); - String filePath = RuoYiConfig.getUploadPath(); + String url=map.get("url").split("\\?")[0]; String lastPath=fileService.uploadFile(url,"task"); //生成图路径 @@ -203,8 +201,8 @@ public class RobotEventXmlServiceImpl implements IRobotEventXmlService { String uuid= UUID.randomUUID().toString().replaceAll("-",""); RobotTaskImageVo vo; if(imageUrl!=null){ - String bast641=fileService.getFileBast64(lastPath); - String bast642=fileService.getFileBast64(imageUrl.getImage()); + String bast641=fileService.getFileBast64(lastPath); + String bast642=fileService.getFileBast64(imageUrl.getImage()); double value = ImageSimilarity.calculateSimilarity(bast641, bast642); String formattedValue = String.format("%.2f", value*100); vo=new RobotTaskImageVo(uuid,taskId,positionId,taskTime,lastPath,imageUrl.getImage(),imageUrl.getTaskTime(),formattedValue); diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java index c6aaafb..81e2c35 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java @@ -252,7 +252,7 @@ public class RobotServiceImpl implements IRobotService { return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("9".equals(robotVo.getType())){ //机器人 停止 - String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_MAP_STOP); + String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_ALL_STOP); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("10".equals(robotVo.getType())){ @@ -360,6 +360,9 @@ public class RobotServiceImpl implements IRobotService { @Override public AjaxResult addTasks(PatrolTask vo) { + if(StringHelper.isNullOrEmptyString(vo.getRobotId())){ + vo.setRobotId("BNS_ROBOT"); + } String uuid= UUID.randomUUID().toString().replaceAll("-",""); vo.setId(uuid); vo.setTaskStatus("0"); diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java index e7aa6d1..4191a4a 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java @@ -1,6 +1,5 @@ package com.bonus.business.service.impl; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.bonus.business.mapper.SbdUserMapper; import com.bonus.business.minio.FileServiceImpl; import com.bonus.business.robot.util.IdUtils; diff --git a/bonus-business/src/main/resources/application-druid.yml b/bonus-business/src/main/resources/application-druid.yml index 2b94b24..227f555 100644 --- a/bonus-business/src/main/resources/application-druid.yml +++ b/bonus-business/src/main/resources/application-druid.yml @@ -1,14 +1,16 @@ # 数据源配置 spring: application: - name: bonus-robot - cloud: - nacos: - username: nacos - password: Jjsp@nacos2023 - discovery: - server-addr: 127.0.0.1:18848 - namespace: robot + name: sbdRobot + # application: +# name: bonus-robot +# cloud: +# nacos: +# username: nacos +# password: Jjsp@nacos2023 +# discovery: +# server-addr: 127.0.0.1:18848 +# namespace: robot datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver @@ -18,10 +20,14 @@ spring: # url: jdbc:mysql://192.168.0.14:4417/sbd_robot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: Bonus@admin123! +# master: +# url: jdbc:mysql://127.0.0.1:3306/sbd_robot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: mroot +# password: bonus@admin123 master: - url: jdbc:mysql://127.0.0.1:3306/sbd_robot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: mroot - password: bonus@admin123 + url: jdbc:mysql://127.0.0.1:23306/wunan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: youotech123# # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -79,7 +85,7 @@ spring: # secretKey: bonus@admin123 # bucketName: robot minio: - endpoint: http://192.168.0.14:9090 - accessKey: minio - secretKey: bonus@admin123 + endpoint: http://10.138.55.114:9000 + accessKey: minioadmin + secretKey: minioadmin bucketName: robot \ No newline at end of file diff --git a/bonus-business/src/main/resources/application.yml b/bonus-business/src/main/resources/application.yml index 954509b..1eb4696 100644 --- a/bonus-business/src/main/resources/application.yml +++ b/bonus-business/src/main/resources/application.yml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2025 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: F:/Files/robot/upload + profile: D:/files/upload # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -19,7 +19,7 @@ server: port: 58080 servlet: # 应用的访问路径 - context-path: / + context-path: /sbdRobot tomcat: # tomcat的URI编码 uri-encoding: UTF-8 @@ -73,6 +73,7 @@ spring: port: 6379 # 数据库索引 database: 7 + password: youotech123# # 密码 # password: Xbzbns@Redis123! # 连接超时时间 diff --git a/bonus-framework/src/main/java/com/bonus/framework/security/filter/AuthWriteUtils.java b/bonus-framework/src/main/java/com/bonus/framework/security/filter/AuthWriteUtils.java index 29d6c37..14fc067 100644 --- a/bonus-framework/src/main/java/com/bonus/framework/security/filter/AuthWriteUtils.java +++ b/bonus-framework/src/main/java/com/bonus/framework/security/filter/AuthWriteUtils.java @@ -15,7 +15,8 @@ public class AuthWriteUtils { public static List getWriteUrl(){ List whiteUrl=new ArrayList<>(); whiteUrl.add("/robot/push/**"); - return whiteUrl; + whiteUrl.add("/sbdRobot/robot/push/**"); + return whiteUrl; } diff --git a/bonus-framework/src/main/java/com/bonus/framework/security/filter/SbdUserJwtTokenFilter.java b/bonus-framework/src/main/java/com/bonus/framework/security/filter/SbdUserJwtTokenFilter.java index 5b10851..3790554 100644 --- a/bonus-framework/src/main/java/com/bonus/framework/security/filter/SbdUserJwtTokenFilter.java +++ b/bonus-framework/src/main/java/com/bonus/framework/security/filter/SbdUserJwtTokenFilter.java @@ -31,22 +31,33 @@ import static com.bonus.framework.security.filter.JwtUtils.parseToken; @Component public class SbdUserJwtTokenFilter implements HandlerInterceptor { + public static void main(String[] args) { + String uri="/sbdRobot/robot/push/xmlAnalysis"; + System.err.println(uri); + if (StringUtils.matches(uri, AuthWriteUtils.getWriteUrl())) { + System.err.println(1); + }else{ + System.err.println(2); + } + } + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { String uri=request.getRequestURI(); + System.err.println(uri); if (StringUtils.matches(uri, AuthWriteUtils.getWriteUrl())) { return true; } String token=request.getHeader("token"); - if(StringHelper.isNullOrEmptyString(token)){ - returnJson(response,"请先登录！",401); - return false; - }else { - if("test".equals(token)){ - return true; + if(StringHelper.isNullOrEmptyString(token)){ + returnJson(response,"请先登录！",401); + return false; + }else { + if("test".equals(token)){ + return true; + } } - } - RestTemplate restTemplate = new RestTemplate(); + RestTemplate restTemplate = new RestTemplate(); String sessionKey = JwtUtils.getValue(token,"seesion"); HttpHeaders headers = new HttpHeaders(); HttpEntity> formEntity = new HttpEntity>(headers); diff --git a/pom.xml b/pom.xml index 14cad2f..b3aa0ce 100644 --- a/pom.xml +++ b/pom.xml @@ -47,22 +47,22 @@ - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - + + + + + + + - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - + + + + + + + + org.springframework