修改救生衣逻辑

download-center-server/src/main/java/com/shanghaichengdi/downloadcenterserver/faced/AnalyseFaced.java

@@ -202,6 +202,7 @@ public class AnalyseFaced {
 
   public static String lifeJacketAnalyse(String id, List<String> filePathList, String bayonetId) {
     String result = null;
+    HashMap<String,String> resultMap = new HashMap<>();
     for (String filePath : filePathList) {
       HttpRequest post = HttpUtil.createPost(LIFE_JACKET);
       Map<String, String> headers = new HashMap<>();
@@ -216,16 +217,32 @@ public class AnalyseFaced {
       JSONObject jsonObject = JSONObject.parseObject(responseBody);
       List<Object> strings = JSONArray.parseArray(jsonObject.get("result").toString());
       JSONObject jsonObject1 = JSONObject.parseObject(strings.get(0).toString());
-      if(String.valueOf(1).equals(jsonObject1.get("is_wear") == null ? null : jsonObject1.get("is_wear").toString())) {
+      if(String.valueOf(1).equals(jsonObject1.get("is_wear").toString())) {
         // 如果whetherWearLifejacket为1
-        result = responseBody;
+        resultMap.put("1",responseBody);
+//        result = responseBody;
         break;
+        // 如果whetherWearLifejacket为0
+      } else if (String.valueOf(0).equals(jsonObject1.get("is_wear").toString())) {
+        resultMap.put("0",responseBody);
+//        result = responseBody;
       } else {
-        // 如果whetherWearLifejacket为0或空值
+        // 如果whetherWearLifejacket为空值（2）
         // 处理穿救生衣或无人时的分析结果
-        result = responseBody;
+        resultMap.put("2",responseBody);
+//        result = responseBody;
       }
     };
+    //等级排序:1>0>2
+    if (resultMap.get("2") != null){
+      result = resultMap.get("2");
+    }
+    if (resultMap.get("0") != null){
+      result = resultMap.get("0");
+    }
+    if (resultMap.get("1") != null) {
+      result = resultMap.get("1");
+    }
 //    log.info("救生衣分析最终结果:{}", result);
     // 调用云上覆盖物/国旗/救生衣接收接口
     Map<String, Object> yunParam = new LinkedHashMap<>();

download-center-server/src/main/resources/profile/pro/serviceServer/application.properties

@@ -1,157 +0,0 @@
-#�˿ں�
-#web�����������˿�
-server.port=8090
-#ת�������������˿�
-#server.port=9090
-#�ļ������������˿�
-#server.port=8080
-#���������ݿ�
-spring.datasource.url=jdbc:oracle:thin:@//172.17.190.5/orcl
-#spring.datasource.url=jdbc:oracle:thin:@//10.114.4.56/shhwdb
-spring.datasource.username=ghjg_basics
-spring.datasource.password=GHJG@123
-#ͼ��ռ����� ��������
-spaceCoordinatesSystem=300003
-##ͼ��ռ����� ���Ի���
-#spaceCoordinatesSystem=300015
-#ͼƬ�ϳ� ��������
-photoSynthesisPath=E:\\DataShareFolder\\mapPrint
-#ͼƬ�ϳ� ���Ի���
-#photoSynthesisPath=D:\\work\\chengdi\\back\\actuatorjob\\src\\image\\image
-imgjinshan=E:\\DataShareFolder\\supervise\\seal\\js.png
-swagger2.enable=false
-# Max file size.
-spring.http.multipart.max-file-size=20Mb
-# Max request size.
-spring.http.multipart.max-request-size=10Mb
-#自己写需要过滤的内容
-static.file.notPass=
-mybatis-plus.global-config.db-config.id-type=input
-mybatis-plus.type-enums-package=com.shcd.ghjg.eum
-#mybatis-plus.typeEnumsPackage=com.shcd.ghjg.eum
-
-xml=D:/
-#如果部署windows使用/部署linux使用\
-#文件存储路径上传xml
-xmlDown=file:E:/DataShareFolder/xml/
-
-#电科所路域范围推送接口
-dianKeLuYuPhoto=https://10.83.248.123:2001/shipping/hyShippingImagesService/insertShippingImages
-
-#路域范围图片存储路径
-mapPrintFileLoad=file:E:/DataShareFolder/mapPrint      
-#??????????404
-spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-
-spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.hikari.maximum-pool-size= 60
-spring.datasource.hikari.maximum-idle = 15
-spring.datasource.hikari.idle-timeout= 30000
-
-#增加tomcatpost请求传参大小为10m
-server.tomcat.max-http-post-size=-1
-
-#Mybatis����
-mybatis.mapper-locations=classpath*:mapper/*.xml
-mybatis.type-aliases-package=com.shcd.ghjg.entity
-mybatis.configuration.useGeneratedkeys=true
-mybatis.configuration.mapUnderscoreToCamelCase=true
-mybatis.configuration.call-setters-on-nulls=true
-#�ֲ�ʽurl��ַ
-##����������Url��ַ
-bigDataCenterUrl.WebServerApiApplyUrl = http://10.81.67.30:8081/wsproxy
-bigDataCenterUrl.httpApiApplyUrl = http://10.81.67.30:8081/httpproxy
-
-#�����ļ��ϴ������ļ����
-spring.servlet.multipart.max-file-size=120MB
-spring.servlet.multipart.max-request-size=120MB
-##����Url��ַ
-creditCenterUrl.HttpApiUrl =http://10.85.23.130/xyxxfwpt/services/XyDataQuery
-
-#����sql��ӡ��Ӧ�ķ����ӿ����ڵİ�
-logging.level.com.shcd.ghjg.dao=debug
-
-plugins=E:/DataShareFolder/plugins
-uploadInfo=E:/DataShareFolder/ChangHuShenXian/KeyTraceBoat
-SuperviseFileLoad=E:/DataShareFolder/supervise/             
-ghjgFileLoad=E:/DataShareFolder/
-
-consumer_client.client_id=243
-consumer_client.secret_key=MIIBIjANBgkqhkiG9w0BAQEABCDEFG8AMIIBCgKCAQEA5mZjecr3Y63o85F55OmzRLmwY0AansLbjaBzqh3HNgAtJs7z7/oLTfNAyUxY3izM5aHPg52kzAwRslnKD1sxlSjL9EL3YQRt7wvCCBIzT+INy6rkqTkAEtK4EvbXVGF8clisY//af5F/P3CH+YecUJlFBvw29oCchb33x49+226aOmud2GU7UxUAYdzsB7GScLtI1V30+l8XKyzYlg11Yf+Na34q2TkJxheCbpwsMM4Y99PUpZR7xe14M6vD9NFk5Qb678bC7fYi04RxG+cOfxI9WYobVZW1wW6UjNW1uo0P79d3CUQFfPMqr9ZkY56QkWrh1FYn8ctXDBxUQFLnTwIDAQAB
-
-#20210708���InstanceAlreadyExistsException: com.zaxxer.hikari:name=dataSource,type=HikariDataSource����
-spring.jmx.enabled=false
-
-#hiakangvideo=172.16.58.60:4443
-#hiakangvideo=219.233.233.59:4443
-hiakangvideo=10.121.41.13:4443
-hiakangAppKey=29125464
-hiakangAppSecret=0E0mA8uF5T9cVNvE5CxX
-
-seisys_gate.ip=10.81.65.225
-seisys_gate.port=8000
-
-#user��ַ
-userUrl:https://10.83.248.123:2001/externalAuth/user/
-
-#�ۺ���ܻ��������ַӳ��
-ghjgService:http://10.83.68.108:8090/ghjgWebService/
-loadService:http://127.0.0.1:8090/ghjgWebService/
-oth0203ToWbeghjgService:http://172.31.237.40:8090/ghjgWebService/
-#�ļ�������  --ʹ�ã���ҵ���ģ���ļ��ϴ� FileSuprevisionController��
-ghjgFileservice:http://10.83.68.109:8080/ghjgWebService/
-oth0203ToghjgFileservice:http://172.31.236.75:8080/ghjgWebService/
-webghjgserviceToghjgFileservice:http://172.17.159.2:8080/ghjgWebService/
-ghjgDataShareService=http://172.31.237.40:8090/ghjgDataShareApi/
-
-#�ļ�ӳ��
-spring.resources.static-locations: file:E:/DataShareFolder
-spring.mvc.static-path-pattern: /supervise/**
-存储界面上传的文件内容
-mapUpSave=file:E:/DataShareFolder/portDrawImg/
-#testSave=file:D:/work/chengdi/back/actuatorjob/
-#�ļ����·��
-Fileservice:http://10.83.68.109/Supervise
-oth0203ToFileservice:http://172.31.236.75/Supervise
-#�ʼ�������
-MailService:http://10.114.4.14:8080/ghjgWebService/
-MailService2:http://172.31.233.22:8090/ghjgWebService/
-MailService3:http://127.0.0.1:8090/SpringMail/
-
-# ��ͼ����ӿ�
-mapService=http://172.30.188.13:8080/GISProxyService/gis/services/1/jtw_zfzd/UEBzc3dvcmQh
-
-#��Ⱦ�����ݽӿ�
-shhsService:http://47.110.81.227:30000/
-
-#东安污染物接收数据（新平台）
-daService=https://dass-api.shcthy.cn/
-
-#group��ַ
-groupUrl:https://10.83.248.123:2001/externalAuth/group/
-
-#auth��ַ
-authUtl:https://10.83.248.123:2001/externalAuth/auth/
-
-authUrl2:https://10.83.248.123:2001/auth-server/
-
-#clientUrl
-clientUrl:http://10.83.68.108:8090/ghjg/
-
-wrwToken=https://10.250.1.15:8020/oauth/token
-wrwManageService=https://10.250.1.15:8040/manage/service
-
-#spring.application.name=InterfaceServices
-#spring.boot.admin.client.url=http://10.83.68.109:8093/springAdmin-server
-management.endpoints.web.exposure.include=*
-#spring.boot.admin.client.username=admin
-#spring.boot.admin.client.password=root123CD
-logging.level.root=${LOG_LEVEL:INFO}
-logging.level.com.test.demo=info
-logging.file=C:/gxjhForWordApi/soutlog.log
-
-
-
-#报表字体设置
-net.sf.jasperreports.extension.registry.factory.simple.font.families=net.sf.jasperreports.engine.fonts.SimpleFontExtensionsRegistryFactory
-net.sf.jasperreports.extension.simple.font.families.dejavu=jaspers/fonts/fonts.xml

download-center-server/src/main/resources/profile/pro/serviceServer/application.yml

@@ -0,0 +1,9 @@
+spring:
+  application:
+    name: downloadPictures
+  resources:
+    static-locations: file:/disk
+  mvc:
+    static-path-pattern: /static/**
+server:
+  port: 8090