调整完成

aidex-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ aidex:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/aidex/uploadPath，Linux配置 /home/aidex/uploadPath）
-  profile: /home/aidex/uploadPath
+  profile: D:/aidex/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 192.168.1.243
     # 端口，默认为6379
-    port: 16379
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
-    # password: 12345678
+    password: 12345678
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -123,7 +123,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: true
+  enabled: false
   # 请求前缀
   pathMapping: /api
 
@@ -138,8 +138,8 @@ xss:
 
 wx:
   miniapp:
-    appid: wx43371b1687d52c06 #微信小程序的appid
-    secret: 98444ae0dfb97e12eb262bea10a5fbd5  #微信小程序的Secret
+    appid: wx89863f6cc3943d04 #微信小程序的appid
+    secret: 1d8a4519dd92e626e183c4c7e2dad14e  #微信小程序的Secret
     msgDataFormat: JSON
     token:
     aesKey:

aidex-system/src/main/java/com/aidex/common/app/server/impl/AppService.java

@@ -151,7 +151,7 @@ public class AppService implements IAppService {
                     // 将时间戳转换为LocalDateTime
                     LocalDateTime longStopTime = LocalDateTime.ofEpochSecond(Long.valueOf(alarmDetails.getAlarmime()) / 1000, 0, java.time.ZoneOffset.UTC);
                     // 计算两个日期时间之间的分钟数
-                    Long stopTime = ChronoUnit.MINUTES.between(endOfDay, longStopTime);
+                    Long stopTime = ChronoUnit.MINUTES.between(longStopTime, endOfDay);
 
                     if(stopTime.doubleValue() > Double.valueOf(inStopTime)) {
                         locationEntity.setIsLongStop(Boolean.TRUE);
@@ -246,17 +246,17 @@ public class AppService implements IAppService {
             Long distSiteNum = 0L;
             if(direction){
                 Double position = CalcDist.gps2d(Double.valueOf(wharfShip.getLat()),Double.valueOf(wharfShip.getLng()),Double.valueOf(res.getLat()),Double.valueOf(res.getLon()));
-                if(position <= 0){
-                   distSiteNum = (wharf.getWharfOrder() / 10) - (wharfShip.getWharfOrder() / 10) ;
+                if(position > 0){
+                   distSiteNum = (wharfShip.getWharfOrder() / 10)  - (wharf.getWharfOrder() / 10) ;
                 }else {
-                   distSiteNum = (wharf.getWharfOrder() / 10) - ((wharfShip.getWharfOrder() / 10) + 1);
+                   distSiteNum = ((wharfShip.getWharfOrder() / 10) - 1) - (wharf.getWharfOrder() / 10)  ;
                 }
             }else {
                 Double position = CalcDist.gps2d(Double.valueOf(res.getLat()),Double.valueOf(res.getLon()),Double.valueOf(wharfShip.getLat()),Double.valueOf(wharfShip.getLng()));
-                if(position <= 0){
-                    distSiteNum = (wharfShip.getWharfOrder() / 10) - (wharf.getWharfOrder() / 10) ;
+                if(position > 0){
+                    distSiteNum = (wharf.getWharfOrder() / 10) - (wharfShip.getWharfOrder() / 10) ;
                 }else {
-                    distSiteNum = ((wharfShip.getWharfOrder() / 10) - 1) - (wharf.getWharfOrder() / 10) ;
+                    distSiteNum = (wharf.getWharfOrder() / 10) - ((wharfShip.getWharfOrder() / 10) - 1);
                 }
             }