dev环境

docker-compose-dev.yml

@@ -0,0 +1,97 @@
+version: '2'
+networks:
+  tsg-bridge:
+    driver: bridge
+services:
+  redis:
+    container_name: hsz-redis
+    image: docker.1ms.run/bitnami/redis:latest
+    privileged: true
+    environment:
+      - TZ=Asia/Shanghai
+    ports:
+      - 7379:6379
+    networks:
+      - tsg-bridge
+    volumes:
+      - /opt/hsz/redis/conf/redis.conf:/usr/local/etc/redis/conf/redis.conf
+      - /opt/hsz/redis/data:/data
+    command: redis-server /usr/local/etc/redis/conf/redis.conf
+
+  es:
+    container_name: es
+    image: docker.1ms.run/elasticsearch:8.12.2
+    environment:
+      - 'ELASTIC_PASSWORD=1234567a'
+      - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - xpack.security.http.ssl.enabled=false
+      - xpack.security.enabled=false
+      - ES_SETTING_XPACK_SECURITY_ENABLED=false
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    networks:
+      - tsg-bridge
+
+  #前端
+  hsz-nginx:
+    container_name: hsz-nginx
+    image: docker.1ms.run/library/nginx:mainline-alpine-perl
+    privileged: true
+    ports:
+      - "8088:80"
+      - "4443:443"
+    networks:
+      - tsg-bridge
+    volumes:
+      - /opt/hsz/nginx/html:/usr/share/nginx/html
+      #- /opt/tsg/nginx/conf/default.conf:/etc/nginx/nginx.conf
+      - /opt/hsz/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
+      #- /home/ec2-user/etx/nginx/ssl/ssl.crt:/etc/nginx/ssl.crt
+      #- /home/ec2-user/etx/nginx/ssl/ssl.key:/etc/nginx/ssl.key
+      - /opt/hsz/java:/app
+    depends_on:
+      - hsz-dev
+      #- language-server
+    environment:
+      - NGINX_ENABLE_HTTPS=no  # 关键：禁用默认HTTPS配置
+
+  #后端
+  hsz-dev:
+    container_name: hsz-dev
+    image: docker.1ms.run/library/openjdk:21-ea-jdk
+    working_dir: /app
+    networks:
+      - tsg-bridge
+    volumes:
+      - /opt/hsz/java:/app
+    ports:
+      - "24105:24105"
+    environment:
+      # 指定时区
+      - SPRING_PROFILES_ACTIVE=dev
+      - TZ=Asia/Shanghai
+    depends_on:
+      - redis
+      - es
+      - postgres
+    #启动容器后执行的命令
+    entrypoint: java -cp "gunshi-project-hsz-1.0-SNAPSHOT.jar:./lib/*" com.gunshi.project.hsz.Main
+
+  # PostgreSQL 数据库
+  postgres:
+    container_name: postgres
+    image: docker.1ms.run/bitnami/postgresql:latest
+    privileged: true  # 新增：赋予容器特权
+    environment:
+      POSTGRES_DB: hsz  # 默认数据库名称
+      POSTGRES_USER: gunshiiot     # 默认用户名
+      POSTGRES_PASSWORD: 1234567a  # 默认密码
+    ports:
+      - "5432:5432"  # 将容器的 5432 端口映射到主机的 5432 端口
+    networks:
+      - tsg-bridge
+    volumes:
+      - /opt/hsz/postgres/data:/var/lib/postgresql/data  # 持久化数据卷
+    restart: always  # 容器意外停止时自动重启

nginx.conf

@@ -0,0 +1,113 @@
+user  root;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log debug;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" - $uri '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    types_hash_max_size 2048;
+    client_max_body_size 100m;
+    server {
+        listen 80;
+        server_name localhost;
+
+	location /gunshiApp/tsg/ {
+		proxy_pass http://10.142.147.46:24105/gunshiApp/tsg/;
+		proxy_set_header Host $host;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+
+		proxy_connect_timeout 60s;
+		proxy_read_timeout 300s;
+		proxy_send_timeout 60s;
+	}
+	location /gunshiApp/tsg/profile {
+            rewrite /gunshiApp/tsg/profile/(.*) /gunshiApp/tsg/$1 last;
+        }
+        location /gunshiApp/tsg/upload {
+                alias /app/uploadPath/upload;
+        }
+        # 其他location规则（如静态文件等）
+        location /tsg {
+                root /usr/share/nginx/html;
+                #try_files $uri $uri/ =404;
+        }
+
+        # 雷达图
+        location /shzh/service2/shzh/met/zyqxfw/api/radar/getImgNames {
+                proxy_pass http://10.42.6.68:81;
+                proxy_set_header Host $host;
+                proxy_set_header X-Real-IP $remote_addr;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                proxy_read_timeout 60s;
+        }
+
+        # 气象云图
+        location /shzh/service2/shzh/met/zyqxfw/api/radar/sateCloud/getImgNames {
+                proxy_pass http://10.42.6.68:81;
+                proxy_set_header Host $host;
+                proxy_set_header X-Real-IP $remote_addr;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                proxy_read_timeout 60s;
+        }
+
+        location /gunshiApp/hsz/ {
+		proxy_pass http://0.0.0.0:24205/gunshiApp/hsz/;
+		proxy_set_header Host $host;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+
+		proxy_connect_timeout 60s;
+		proxy_read_timeout 300s;
+		proxy_send_timeout 60s;
+	}
+	location /gunshiApp/hsz/profile {
+    	        rewrite /gunshiApp/hsz/profile/(.*)$ /gunshiApp/hsz/$1 last;
+	}
+        location /gunshiApp/hsz/upload {
+                alias /app/uploadPath/upload;
+        }
+        location /hsz {
+                root /usr/share/nginx/html;
+                #try_files $uri $uri/ =404;
+        }
+
+        location /rtutesttemp {
+		proxy_pass http://10.142.147.46:22205/rtutesttemp;
+		proxy_set_header Host $host;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+
+		proxy_connect_timeout 60s;
+		proxy_read_timeout 300s;
+		proxy_send_timeout 60s;
+	}
+    }
+
+    include /etc/nginx/conf.d/*.conf;
+}

src/main/java/com/gunshi/project/hsz/entity/vo/StStatusVo.java

@@ -21,4 +21,10 @@ public class StStatusVo {
     @Schema(description = "状态 0 离线  1在线")
     private Integer status;
 
+    @Schema(description = "经度")
+    private BigDecimal lgtd;
+
+    @Schema(description = "纬度")
+    private BigDecimal lttd;
+
 }

src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java

@@ -487,7 +487,7 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
             }else{
                 // 计算公式：2/3 * irrigationUse * sArea / 10000
                 BigDecimal value = new BigDecimal("2")
-                        .divide(new BigDecimal("3"), 20, RoundingMode.HALF_UP) // 2/3，保留10位小数
+                        .divide(new BigDecimal("3"), 10, RoundingMode.HALF_UP) // 2/3，保留10位小数
                         .multiply(irrigationUse)
                         .multiply(sArea)
                         .divide(new BigDecimal("10000")); // 除以10000，保留2位小数
@@ -544,7 +544,7 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
                 re.setIrrigationUse(BigDecimal.ZERO);
             }else{
                 BigDecimal value = new BigDecimal("2")
-                        .divide(new BigDecimal("3"), 20, RoundingMode.HALF_UP) // 2/3，保留10位小数
+                        .divide(new BigDecimal("3"), 10, RoundingMode.HALF_UP) // 2/3，保留10位小数
                         .multiply(irrigationUse)
                         .multiply(sArea)
                         .divide(new BigDecimal("10000")); // 除以10000，保留2位小数

src/main/java/com/gunshi/project/hsz/service/StWaterRRealService.java

@@ -26,6 +26,22 @@ public class StWaterRRealService extends ServiceImpl<StWaterRRealMapper, StWater
 
     public List<StWaterRReal> listRelated() {
         List<StWaterRReal> stWaterRReals = baseMapper.listRelated();
+        // 获取当前时间整点（去掉分钟和秒）
+        Calendar now = Calendar.getInstance();
+        now.set(Calendar.MINUTE, 0);
+        now.set(Calendar.SECOND, 0);
+        now.set(Calendar.MILLISECOND, 0);
+        Date currentHour = now.getTime();
+        for (StWaterRReal stWaterRReal : stWaterRReals) {
+            Date tm = stWaterRReal.getTm();
+            if(tm != null){
+                if(tm.before(currentHour)){
+                    stWaterRReal.setTm(null);
+                    stWaterRReal.setQ(null);
+                    stWaterRReal.setV(null);
+                }
+            }
+        }
         return stWaterRReals;
     }
 

src/main/resources/application-dev.yml

@@ -2,5 +2,5 @@ spring:
   config:
     import:
       - config-common.yml
-      - config-local.yml
+      - config-dev.yml
       - config-ruoyi.yml

src/main/resources/application-local.yml

@@ -2,5 +2,5 @@ spring:
   config:
     import:
       - config-common.yml
-      - config-dev.yml
+      - config-local.yml
       - config-ruoyi.yml

src/main/resources/config-dev.yml

@@ -5,30 +5,32 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:postgresql://10.0.41.112:5432/hsz?stringtype=unspecified
+          url: jdbc:postgresql://postgres:5432/hsz?stringtype=unspecified
           username: gunshiiot
           password: 1234567a
           driver-class-name: org.postgresql.Driver
         access-logging:
-          url: jdbc:postgresql://10.0.41.112:5432/hsz
+          url: jdbc:postgresql://postgres:5432/hsz
           username: gunshiiot
           password: 1234567a
           driver-class-name: org.postgresql.Driver
   data:
     redis:
-      host: 10.0.41.112
+      host: hsz-redis
       port: 6379
-      password: 1234567a
+      #password: 1234567a
-      database: 4
+      database: 0
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 gunshi:
+  core:
+    appName: project-hsz
   file:
     key: 6gaWRs4bz4mxpXXxgZF4
     secret: 3QFbff974hVwpH6laAondq33iShpzs6YG4XsrTRT
-    endpoint: http://223.75.53.141:9100
+    endpoint: http://10.42.6.75:9100
     publicBucket: gs-hsz
     loginBucket: gs-hsz
     privateBucket: gs-hsz
@@ -36,10 +38,10 @@ gunshi:
 # 洪水预测数据库连接信息
 algorithem:
   datasource:
-    url: jdbc:postgresql://10.0.41.112:5432/hsz?stringtype=unspecified
+    url: jdbc:postgresql://postgres:5432/hsz?stringtype=unspecified
     username: gunshiiot
     password: 1234567a
     driver-class-name: org.postgresql.Driver
 
-jcskPath: http://223.75.53.124:8002/shareddata/api/v1/monitdata
+jcskPath: http://64.97.142.113:8002/shareddata/api/v1/monitdata
 jcskToken: FB1EE57468E0CB9A51306F9056A534776A505E95AB687866AD05EA91C61B1444D210FF3E3033E268869C0C0D788770D4DE62078895538CF5BA652F6F1C751D24

src/main/resources/config-local.yml

@@ -5,30 +5,32 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:postgresql://10.0.41.112:5432/hsz?stringtype=unspecified
+          url: jdbc:postgresql://postgres:5432/hsz?stringtype=unspecified
           username: gunshiiot
           password: 1234567a
           driver-class-name: org.postgresql.Driver
         access-logging:
-          url: jdbc:postgresql://10.0.41.112:5432/hsz
+          url: jdbc:postgresql://postgres:5432/hsz
           username: gunshiiot
           password: 1234567a
           driver-class-name: org.postgresql.Driver
   data:
     redis:
-      host: 10.0.41.112
+      host: hsz-redis
       port: 6379
-      password: 1234567a
+      #password: 1234567a
-      database: 4
+      database: 0
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 gunshi:
+  core:
+    appName: project-hsz
   file:
     key: 6gaWRs4bz4mxpXXxgZF4
     secret: 3QFbff974hVwpH6laAondq33iShpzs6YG4XsrTRT
-    endpoint: http://223.75.53.141:9100
+    endpoint: http://10.42.6.75:9100
     publicBucket: gs-hsz
     loginBucket: gs-hsz
     privateBucket: gs-hsz
@@ -36,10 +38,10 @@ gunshi:
 # 洪水预测数据库连接信息
 algorithem:
   datasource:
-    url: jdbc:postgresql://10.0.41.112:5432/hsz?stringtype=unspecified
+    url: jdbc:postgresql://postgres:5432/hsz?stringtype=unspecified
     username: gunshiiot
     password: 1234567a
     driver-class-name: org.postgresql.Driver
 
-jcskPath: http://223.75.53.124:8002/shareddata/api/v1/monitdata
+jcskPath: http://64.97.142.113:8002/shareddata/api/v1/monitdata
 jcskToken: FB1EE57468E0CB9A51306F9056A534776A505E95AB687866AD05EA91C61B1444D210FF3E3033E268869C0C0D788770D4DE62078895538CF5BA652F6F1C751D24