Browse Source

1、新增52环境的配置文件;
2、新增上传消息封面的接口;
3、调整查询技能接口,改为返回固定值(DevicesSoundSensorsServiceImpl);
4、调整alarms的封面url值

pc147123 5 months ago
parent
commit
358f4d3965

+ 16 - 0
src/main/java/com/example/unusualsounds/project/device/controller/SensorsController.java

@@ -30,6 +30,9 @@ public class SensorsController {
     @Value("${minio.dir}")
     private String dir;
 
+    @Value("${minio.source-dir}")
+    private String printDir;
+
     @Autowired
     private MinioUtil minioUtil;
 
@@ -144,5 +147,18 @@ public class SensorsController {
     }
 
 
+    @Operation(summary = "上传封面图片")
+    @PostMapping("/upPrint")
+    public AjaxResult uploadPrint(@RequestParam("file") MultipartFile file){
+        AjaxResult ajaxResult = new AjaxResult();
+
+        String upload = minioUtil.upload(file,printDir);
+        ajaxResult.put("code",200);
+        ajaxResult.put("msg","文件上传成功");
+        ajaxResult.put("fileUUID",upload);
+        return ajaxResult;
+
+    }
+
 
 }

+ 12 - 5
src/main/java/com/example/unusualsounds/project/device/service/impl/DevicesSoundSensorsServiceImpl.java

@@ -95,6 +95,7 @@ public class DevicesSoundSensorsServiceImpl extends ServiceImpl<DevicesSoundSens
         devicesSoundSensors.setDeptUuid(soundSensors.getDeptUuid());
 
         if("file".equals(soundSensors.getSoundSensorType())){
+            System.out.println("获取:"+soundSensors.getSoundFileUUid().toString());
             Object o = RedisUtils.get(soundSensors.getSoundFileUUid());
 
             devicesSoundSensors.setStreamUrl(o.toString());
@@ -122,11 +123,17 @@ public class DevicesSoundSensorsServiceImpl extends ServiceImpl<DevicesSoundSens
         //对文件进行立刻通知算法解析(如果是文件类型,通知算法解析)
 
         if("file".equals(soundSensors.getSoundSensorType())){
-            QueryWrapper<Skills> skillsQueryWrapper = new QueryWrapper<>();
-            skillsQueryWrapper.eq("uuid",soundSensors.getSkillUuid()).last("limit 1");
-            Skills skills = skillsServiceImpl.getBaseMapper().selectOne(skillsQueryWrapper);
-
-            this.analysisSoundFile(devicesSoundSensors.getSrcUrl(),skills.getName(), devicesSoundSensors.getUuid(),
+//            QueryWrapper<Skills> skillsQueryWrapper = new QueryWrapper<>();
+//            skillsQueryWrapper.eq("uuid",soundSensors.getSkillUuid()).last("limit 1");
+//            Skills skills = skillsServiceImpl.getBaseMapper().selectOne(skillsQueryWrapper);
+            //应现场环境,改成固定值
+            List<Skills> skillByName = skillsServiceImpl.getSkillByName(null);
+
+            String skillName = "未命名技能";
+            for (Skills skills : skillByName) {
+                if (skills.getUuid().equals(soundSensors.getSkillUuid())) skillName = skills.getName();
+            }
+            this.analysisSoundFile(devicesSoundSensors.getSrcUrl(),skillName, devicesSoundSensors.getUuid(),
                     devicesSoundSensors.getName(),soundSensors.getSkillUuid());
         }
         if (insert > 0){

+ 2 - 2
src/main/java/com/example/unusualsounds/project/vox/entity/Alarms.java

@@ -426,8 +426,8 @@ public class Alarms implements Serializable {
         private String status = "created";
         private String displayStatus = "pending";
         private Integer level = 4;
-        private String imageUrl = "s3://windmill/store/452b784fe34d42b1b3700b6aeb648e1e/alarm-images/cloud/2025-02-14/681082ce-31e3-4dcf-9393-cbc67e9c4749.jpeg";
-        private String thumbnailUrl = "";
+        private String imageUrl = "s3://windmill/store/abnormal-sound/source/2025-03-20/aafdfd09-0f41-4942-9414-10061f8f674e.jpeg";
+        private String thumbnailUrl = "s3://windmill/store/abnormal-sound/source/2025-03-20/d4a6fa31-0404-486e-997d-9fd9a89f87bd.jpg";
         private String imageDrawUrl = "";
         private String videoUrl = "";
         private String deviceUuid = "";

+ 0 - 2
src/main/java/com/example/unusualsounds/project/vox/service/impl/EdgeOrganizationServiceImpl.java

@@ -95,8 +95,6 @@ public class EdgeOrganizationServiceImpl extends ServiceImpl<EdgeOrganizationMap
         }
 
     }
-
-
 }
 
 

+ 5 - 5
src/main/resources/application-prod.yml

@@ -9,9 +9,9 @@ knife4j:
 
 minio:
   #  中心测
-  endpoint: http://minio-idaas-0.middleware.svc.cluster.local:8077
+  endpoint: http://minio-idaas.middleware.svc.cluster.local:9000
   ak: AKIAIOSFODNN7EXAMPLE
-  sk: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKE
+  sk: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
   bucket: windmill
   dir: store/abnormal-sound/
   source-dir: store/abnormal-sound/source/
@@ -53,9 +53,9 @@ spring:
       max-request-size: 100MB
   data:
     redis:
-      host: redis-single.middleware.svc.cluster.local
-      port: 8485
-      password: MTJmYkxmSloxYTNG
+      host: redis-single-master.middleware.svc.cluster.local
+      port: 6379
+      password: 12fbLfJZ1a3F
       database: 0
       timeout: 6000ms
       lettuce:

+ 74 - 0
src/main/resources/application-test.yml

@@ -0,0 +1,74 @@
+# 应用服务 WEB 访问端口 52云服务
+server:
+  port: 19801
+
+knife4j:
+  #开启生产环境屏蔽
+  production: true
+
+
+minio:
+  #  中心测
+  endpoint: http://minio-idaas.middleware.svc.cluster.local:9000
+  ak: AKIAIOSFODNN7EXAMPLE
+  sk: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+  bucket: windmill
+  dir: store/abnormal-sound/
+  source-dir: store/abnormal-sound/source/
+
+spring:
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        #中心测
+        master:
+          type: com.alibaba.druid.pool.DruidDataSource
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://xdbmysql57-leader.middleware.svc.cluster.local:8436/iip_api_service?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+          username: root
+          password: fbLfJZ1sFMAw
+        #边缘测
+        slave:
+          type: com.alibaba.druid.pool.DruidDataSource
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://xdbmysql57-leader.middleware.svc.cluster.local:8436/iip_api_service?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+          username: root
+          password: fbLfJZ1sFMAw
+    druid:
+      initial-size: 5
+      min-idle: 5
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+      timeBetweenEvictionRunsMillis: 6000
+      # 配置一个连接在池中最小生存的时间,单位是毫秒
+      minEvictableIdleTimeMillis: 60000
+      # 配置一个连接在池中最大生存的时间,单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  data:
+    redis:
+      host: redis-single-master.middleware.svc.cluster.local
+      port: 6379
+      password: 12fbLfJZ1a3F
+      database: 0
+      timeout: 6000ms
+      lettuce:
+        pool:
+          min-idle: 5
+          max-idle: 10
+          max-wait: -1ms
+          max-active: 1000
+
+#异音算法接口
+vox:
+  #vox服务地址
+#  post-analysis-url: http://vox-model-service.vox-services.svc.cluster.local:8899/audio
+  post-analysis-url: http://vox-model-service:8899/audio
+  #视频流切片保存地址
+  video-dir: /tmp

+ 7 - 3
src/main/resources/application.yml

@@ -57,9 +57,13 @@ Camera:
 yijian-interface:
   #中心节点配置信息
   center:
-    ak: fd01ec4de8724d71bb764190f202929c
-    sk: f44a391cadcc42f98167e7e42086514f
-    endpoint: http://10.68.204.52:8412
+    ak: a440a816330a4e558ec33d50aaad379d
+    sk: d9068f8ff3604a45a83b81c987de673a
+    endpoint: http://10.170.69.123:8412
+#    ak: fd01ec4de8724d71bb764190f202929c
+#    sk: f44a391cadcc42f98167e7e42086514f
+#    endpoint: http://10.68.204.52:8412
+
 
   #接口地址前缀配置
   uri-path-prefix: /api/spi