Merge branch 'mdc' into SelfStation

# Conflicts:
#	jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java
#	jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLibMapper.java
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
#	jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 @Component
-@FeignClient("jeecg-system")
+@FeignClient("armd-system")
 public interface SystemClient {
     /* 系统用户相关 */
     @RequestMapping("/sys/user/findUserMap")

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java

@@ -7,7 +7,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.base.bizVo.GammaRLR;
 import org.jeecg.modules.entity.GardsSampleDataSpectrum;
 import org.jeecg.modules.entity.vo.*;
-import org.jeecg.modules.feignclient.SystemClient;
 import org.jeecg.modules.service.IGammaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/feignclient/SystemClient.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 
 @Component
-@FeignClient("jeecg-spectrum")
+@FeignClient("armd-system")
 public interface SystemClient {
 
     /* 获取当前用户信息 */

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IUserTaskService.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 @Component
-@FeignClient("jeecg-system")
+@FeignClient("armd-system")
 public interface IUserTaskService {
 
     @RequestMapping("/sys/user/findUserByName")

jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 @Component
-@FeignClient(value = "jeecg-system")
+@FeignClient("armd-system")
 public interface ICacheTimeService {
 
     @RequestMapping("/sys/dictItem/findCacheTime")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @Component
-@FeignClient("jeecg-abnormal-alarm")
+@FeignClient("armd-abnormal-alarm")
 public interface AbnormalAlarmClient {
 
     /* SysEmailController下相关接口 */

jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml

@@ -76,7 +76,8 @@
         INNER JOIN RNMAN.GARDS_ANALYSES ana on ana.SAMPLE_ID = sam.SAMPLE_ID
         <where>
             sam.COLLECT_START >= TO_DATE(#{startDate}, 'yyyy-mm-dd hh24:mi:ss')
-            and sam.COLLECT_STOP &lt;= TO_DATE(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
+            AND sam.COLLECT_STOP &lt;= TO_DATE(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
+            AND ana.REPORT_PAHT IS NOT NULL
             <if test="stationIdList.size ==0 and stationIdList != null">
                 and sam.STATION_ID in ('')
             </if>

jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 @Component
-@FeignClient("jeecg-system")
+@FeignClient("armd-system")
 public interface IMenuNameService {
 
     @RequestMapping("/sys/dict/findStationListByMenuName")

jeecg-server-cloud/armd-abnormal-alarm-start/Dockerfile

@@ -0,0 +1,15 @@
+FROM armd-jdk64:latest
+
+MAINTAINER armd@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /armd-abnormal-alarm-cloud
+
+WORKDIR /armd-abnormal-alarm-cloud
+
+EXPOSE 7006
+
+ADD armd-abnormal-alarm-start-3.5.1.jar ./
+
+CMD sleep 1;java -Xms512m -Xmx1g -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-abnormal-alarm-start-3.5.1.jar

jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
   
 spring:
   application:
-    name: jeecg-abnormal-alarm
+    name: armd-abnormal-alarm
   cloud:
     nacos:
       config:

jeecg-server-cloud/armd-auto-process-start/Dockerfile

@@ -0,0 +1,24 @@
+FROM armd-jdk64:latest
+
+MAINTAINER armd@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+COPY --from=armd-jdk64 /usr/local/jdk/lib/ /usr/local/jdk/lib/
+
+RUN mkdir -p /armd-auto-process
+
+WORKDIR /armd-auto-process
+
+EXPOSE 7004
+
+ADD armd-auto-process-start-3.5.1.jar ./
+
+COPY setup.tar ./
+RUN ls ./
+RUN tar -C ./ -xvf ./setup.tar && \
+	rm ./setup.tar
+
+ENV LD_LIBRARY_PATH /usr/local/jdk/lib
+
+CMD sleep 1;java -Xms512m -Xmx1g -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-auto-process-start-3.5.1.jar

jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
   
 spring:
   application:
-    name: jeecg-auto-process
+    name: armd-auto-process
   cloud:
     nacos:
       config:

jeecg-server-cloud/armd-cloud-gateway/Dockerfile

@@ -1,15 +1,15 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM armd-jdk64:latest
 
-MAINTAINER jeecgos@163.com
+MAINTAINER armd@163.com
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
-RUN mkdir -p /jeecg-cloud-gateway
+RUN mkdir -p /armd-cloud-gateway
 
-WORKDIR /jeecg-cloud-gateway
+WORKDIR /armd-cloud-gateway
 
 EXPOSE 9999
 
-ADD ./target/jeecg-cloud-gateway-3.5.1.jar ./
+ADD armd-cloud-gateway-3.5.1.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.5.1.jar
+CMD sleep 1;java-Xms512m -Xmx1g -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-cloud-gateway-3.5.1.jar

jeecg-server-cloud/armd-cloud-nacos/Dockerfile

@@ -1,25 +1,23 @@
-#FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM jdk64:latest
-FROM openjdk:8
 
-MAINTAINER jeecgos@163.com
+MAINTAINER armd@163.com
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
-RUN mkdir -p /jeecg-cloud-nacos
+RUN mkdir -p /armd-cloud-nacos
 
-WORKDIR /jeecg-cloud-nacos
+WORKDIR /armd-cloud-nacos
 
 EXPOSE 8848
 
-
+ENV DB_URL="jdbc:postgresql://192.168.8.103:5432/nacos"
-ENV DB_URL=""
+ENV DB_USER="postgres"
-ENV DB_USER=""
+ENV DB_PASSWORD="123456"
-ENV DB_PASSWORD=""
+ENV DB_PLATFORM="postgresql"
-ENV DB_PLATFORM=""
+ENV SERVER_PORT="8848"
-ENV SERVER_PORT=""
 
 EXPOSE $SERVER_PORT
 
-ADD ./target/jeecg-cloud-nacos-3.5.1.jar ./
+ADD armd-cloud-nacos-3.5.1.jar ./
 
-CMD sleep 5;java -DSERVER_PORT=$SERVER_PORT -DDB_URL=$DB_URL -DDB_USER=$DB_USER -DDB_PASSWORD=$DB_PASSWORD -DDB_PLATFORM=$DB_PLATFORM -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.5.1.jar
+CMD sleep 5;java -DSERVER_PORT=$SERVER_PORT -DDB_URL=$DB_URL -DDB_USER=$DB_USER -DDB_PASSWORD=$DB_PASSWORD -DDB_PLATFORM=$DB_PLATFORM -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-cloud-nacos-3.5.1.jar

jeecg-server-cloud/armd-log-manage-start/Dockerfile

@@ -0,0 +1,15 @@
+FROM armd-jdk64:latest
+
+MAINTAINER armd@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /armd-log-manage
+
+WORKDIR /armd-log-manage
+
+EXPOSE 7005
+
+ADD armd-log-manage-start-3.5.1.jar ./
+
+CMD sleep 1;java -Xms512m -Xmx1g -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-log-manage-start-3.5.1.jar

jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
   
 spring:
   application:
-    name: jeecg-log-manage
+    name: armd-log-manage
   cloud:
     nacos:
       config:

jeecg-server-cloud/armd-spectrum-analysis-start/Dockerfile

@@ -0,0 +1,26 @@
+FROM armd-jdk:latest
+
+MAINTAINER armd@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+# 将共享库复制到容器中
+COPY --from=armd-jdk /usr/local/jdk/lib/ /usr/local/jdk/lib/
+
+RUN mkdir -p /armd-spectrum-analysis
+
+WORKDIR /armd-spectrum-analysis
+
+EXPOSE 7007
+
+ADD armd-spectrum-analysis-start-3.5.1.jar ./
+# 将所有配置文件复制到armd-spectrum-analysis同级目录并解压
+COPY setup.tar ./
+RUN ls ./
+RUN tar -C ./ -xvf ./setup.tar && \
+	rm ./setup.tar
+
+# 设置LD_LIBRARY_PATH环境变量
+ENV LD_LIBRARY_PATH /usr/local/jdk/lib
+
+CMD sleep 1;java -Xms512m -Xmx1g -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-spectrum-analysis-start-3.5.1.jar

jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
   
 spring:
   application:
-    name: jeecg-spectrum-analysis
+    name: armd-spectrum-analysis
   cloud:
     nacos:
       config:

jeecg-server-cloud/armd-station-operation-start/Dockerfile

@@ -0,0 +1,21 @@
+FROM armd-jdk64:latest
+
+MAINTAINER armd@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /armd-station-operation
+
+WORKDIR /armd-station-operation
+
+EXPOSE 7002
+
+ADD armd-station-operation-start-3.5.1.jar ./
+
+# 将所有配置文件复制到armd-spectrum-analysis同级目录并解压
+COPY setup.tar ./
+RUN ls ./
+RUN tar -C ./ -xvf ./setup.tar && \
+	rm ./setup.tar
+
+CMD sleep 1;java -Xms512m -Xmx1g -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-station-operation-start-3.5.1.jar

jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
   
 spring:
   application:
-    name: jeecg-station-operation
+    name: armd-station-operation
   cloud:
     nacos:
       config:

jeecg-server-cloud/armd-system-cloud-start/Dockerfile

@@ -1,15 +1,15 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM armd-jdk64:latest
 
-MAINTAINER jeecgos@163.com
+MAINTAINER armd@163.com
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
-RUN mkdir -p /jeecg-system-cloud
+RUN mkdir -p /armd-system-cloud
 
-WORKDIR /jeecg-system-cloud
+WORKDIR /armd-system-cloud
 
 EXPOSE 7001
 
-ADD ./target/jeecg-system-cloud-start-3.5.1.jar ./
+ADD armd-system-cloud-start-3.5.1.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.5.1.jar
+CMD sleep 1;java -Xms512m -Xmx1g -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar armd-system-cloud-start-3.5.1.jar

jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: jeecg-system
+    name: armd-system
   cloud:
     nacos:
       config:

jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
   
 spring:
   application:
-    name: jeecg-web-statistics
+    name: armd-web-statistics
   cloud:
     nacos:
       config:

jeecg-server-cloud/docker-compose-base.yml

@@ -1,31 +1,63 @@
 version: '2'
 services:
-  jeecg-boot-mysql:
+  jdk64:
     build:
-      context: ../db
+      context: ./jdk64
-    environment:
+    container_name: jdk64
-      MYSQL_ROOT_PASSWORD: root
+    profiles:
-      MYSQL_ROOT_HOST: '%'
+      - jdk64
-      TZ: Asia/Shanghai
-    restart: always
-    container_name: jeecg-boot-mysql
-    command:
-      --character-set-server=utf8mb4
-      --collation-server=utf8mb4_general_ci
-      --explicit_defaults_for_timestamp=true
-      --lower_case_table_names=1
-      --max_allowed_packet=128M
-      --default-authentication-plugin=caching_sha2_password
-    ports:
-      - 3306:3306
 
-  jeecg-boot-redis:
+  armd-redis:
-    image: redis:5.0
+    build:
+      context: ./redis
     ports:
       - 6379:6379
-    restart: always
+    container_name: armd-redis
-    container_name: jeecg-boot-redis
+    hostname: armd-redis
-    hostname: jeecg-boot-redis
+    restart: on-failure
+    environment:
+      - TZ=Asia/Shanghai
+    extra_hosts:
+      - "armd-redis:172.18.0.2"
+    profiles:
+      - redis
+
+  armd-vue:
+    build:
+      context: ./nginx
+    ports:
+      - 443:443
+    restart: on-failure
+    environment:
+      - TZ=Asia/Shanghai
+    container_name: armd-vue
+    profiles:
+      - nginx
+    volumes:
+      - "/home/rmsops/nginx/vue-config:/usr/share/nginx/html/static"
+      - "/home/rmsops/nginx/map:/usr/share/nginx/map"
+      - "/home/rmsops/nginx/logs:/etc/nginx/logs/"
+      - "/home/rmsops/nginx/config:/etc/nginx/conf.d/"
+
+#  jeecg-boot-mysql:
+#    build:
+#      context: ../db
+#    environment:
+#      MYSQL_ROOT_PASSWORD: root
+#      MYSQL_ROOT_HOST: '%'
+#      TZ: Asia/Shanghai
+#    restart: always
+#    container_name: jeecg-boot-mysql
+#    command:
+#      --character-set-server=utf8mb4
+#      --collation-server=utf8mb4_general_ci
+#      --explicit_defaults_for_timestamp=true
+#      --lower_case_table_names=1
+#      --max_allowed_packet=128M
+#      --default-authentication-plugin=caching_sha2_password
+#    ports:
+#      - 3306:3306
+
 
 #  jeecg-boot-rabbitmq:
 #    image: rabbitmq:3.7.7-management

jeecg-server-cloud/docker-compose.yml

@@ -1,72 +1,158 @@
 version: '2'
 services:
-  jeecg-boot-nacos:
+  nacos:
+    container_name: armd-nacos
+    hostname: armd-nacos
     restart: always
     build:
-      context: ./jeecg-cloud-nacos
+      context: ./nacos
     ports:
       - 8848:8848
+    profiles:
+      - nacos
     environment:
       - SERVER_PORT=8848
       - DB_URL=jdbc:postgresql://182.92.183.230:5432/nacos
       - DB_USER=temp
       - DB_PASSWORD=123456
       - DB_PLATFORM=postgresql
-    container_name: jeecg-boot-nacos
+    extra_hosts:
-    hostname: jeecg-boot-nacos
+      - "armd-nacos:192.168.31.23"
-    
+
-  jeecg-boot-system:
+  armd-gateway:
-    depends_on:
+    container_name: armd-gateway-start
-      - jeecg-boot-nacos
+    hostname: armd-gateway
+    # depends_on:
+    #   - armd-nacos
+    profiles:
+      - gateway
     build:
-      context: ./jeecg-system-cloud-start
+      context: ./gateway
-    container_name: jeecg-system-start
+    ports:
-    hostname: jeecg-boot-system
+      - 9999:9999
     restart: on-failure
     environment:
       - TZ=Asia/Shanghai
+    extra_hosts:
+      - "armd-gateway:192.168.31.23"
+    volumes:
+      - "/home/rmsops/armd-logs:/armd-gateway/logs"
 
-#  jeecg-boot-demo:
+  armd-system:
-#    depends_on:
+    container_name: armd-system
-#      - jeecg-boot-nacos
+    hostname: armd-system
-#    build:
+    profiles:
-#      context: ./jeecg-demo-cloud-start
+      - service
-#    container_name: jeecg-demo-start
+    build:
-#    hostname: jeecg-boot-demo
+      context: ./system
-#    restart: on-failure
+    ports:
-#    environment:
+      - 7001:7001
-#      - TZ=Asia/Shanghai
+    restart: on-failure
+    environment:
+      - TZ=Asia/Shanghai
+    extra_hosts:
+      - "armd-system:192.168.31.23"
+    volumes:
+      - "/home/rmsops/armd-logs:/armd-system-cloud/logs"
 
-  jeecg-boot-gateway:
+  armd-station-operation:
+    container_name: armd-station-operation
+    hostname: armd-station-operation
+    depends_on:
+      # - armd-nacos
+      - armd-system
+    profiles:
+      - service
     restart: on-failure
     build:
-      context: ./jeecg-cloud-gateway
+      context: ./station-operation
     ports:
-      - 9999:9999
+      - 7002:7002
-    depends_on:
+    extra_hosts:
-      - jeecg-boot-nacos
+      - "armd-station-operation:192.168.31.23"
-      - jeecg-boot-system
+    volumes:
-    container_name: jeecg-boot-gateway
+      - "/home/rmsops/armd-logs:/armd-station-operation/logs"
-    hostname: jeecg-boot-gateway
+
+  armd-web-statistics:
+    container_name: armd-web-statistics
+    hostname: armd-web-statistics
+    depends_on:
+      - armd-system
+    profiles:
+      - service
+    restart: on-failure
+    build:
+      context: ./web-statistics
+    ports:
+      - 7003:7003
+    extra_hosts:
+      - "armd-web-statistics:192.168.31.23"
+    volumes:
+      - "/home/rmsops/armd-logs:/armd-web-statistics/logs"
+
+  armd-abnormal-alarm:
+    container_name: armd-abnormal-alarm
+    hostname: armd-abnormal-alarm
+    depends_on:
+      - armd-system
+    profiles:
+      - service
+    restart: on-failure
+    build:
+      context: ./abnormal-alarm
+    ports:
+      - 7005:7005
+    extra_hosts:
+      - "armd-abnormal-alarm:192.168.31.23"
+    volumes:
+      - "/home/rmsops/armd-logs:/armd-abnormal-alarm/logs"
+
+  armd-log-manage:
+    container_name: armd-log-manage
+    hostname: armd-log-manage
+    depends_on:
+      - armd-system
+    profiles:
+      - service
+    restart: on-failure
+    build:
+      context: ./log-manage
+    ports:
+      - 7006:7006
+    extra_hosts:
+      - "armd-log-manage:192.168.31.23"
+    volumes:
+      - "/home/rmsops/armd-logs:/armd-log-manage/logs"
+
+  armd-spectrum-analysis:
+    restart: on-failure
+    build:
+      context: ./spectrum-analysis
+    ports:
+      - 7007:7007
+    profiles:
+      - service
+    depends_on:
+      - armd-system
+    container_name: armd-spectrum-analysis
+    hostname: armd-spectrum-analysis
+    extra_hosts:
+      - "armd-spectrum-analysis:127.0.0.1"
+
+  auto-process:
+    restart: on-failure
+    build:
+      context: ./auto-process
+    ports:
+      - 7004:7004
+    profiles:
+      - auto-process
+    container_name: auto-process
+    hostname: armd-auto-process
+    extra_hosts:
+      - "armd-auto-process:127.0.0.1"
+    volumes:
+      - "/home/rmsops/ftp:/armd-auto-process/ftp"
+      - "/home/rmsops/armd-logs:/armd-auto-process/logs"
+
 
-#  jeecg-boot-sentinel:
-#    restart: on-failure
-#    build:
-#      context: ./jeecg-visual/jeecg-cloud-sentinel
-#    ports:
-#      - 9000:9000
-#    depends_on:
-#      - jeecg-boot-nacos
-#      - jeecg-boot-demo
-#      - jeecg-boot-system
-#      - jeecg-boot-gateway
-#    container_name: jeecg-boot-sentinel
-#    hostname: jeecg-boot-sentinel
-#
-#  jeecg-boot-xxljob:
-#    build:
-#      context: ./jeecg-visual/jeecg-cloud-xxljob
-#    ports:
-#      - 9080:9080
-#    container_name: jeecg-boot-xxljob
-#    hostname: jeecg-boot-xxljob