Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

docker/zd/docker-compose-services.yml

@@ -6,7 +6,7 @@ services:
   # ---------------------------
 #  zd-mysql:
 #    container_name: zd-mysql
-#    image: zd.harbor.com/lib/mysql:5.7
+#    image: registry.cn-hangzhou.aliyuncs.com/lib/mysql:5.7
 #    restart: always
 #    build:
 #      context: ./mysql
@@ -35,7 +35,7 @@ services:
   # ---------------------------
   zd-nacos:
     container_name: zd-nacos
-    image: zd.harbor.com/lib/nacos/nacos-server:latest
+    image: registry.cn-hangzhou.aliyuncs.com/lib/nacos/nacos-server:latest
     # 从文件中获取配置
     env_file: docker-compose.env
 #   内部依赖数据库配置，暂使用外部数据库
@@ -59,7 +59,7 @@ services:
   # Redis
   # ---------------------------
   zd-redis:
-    image: zd.harbor.com/lib/redis:latest
+    image: registry.cn-hangzhou.aliyuncs.com/lib/redis:latest
     container_name: zd-redis
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always
@@ -76,7 +76,7 @@ services:
   # api网关
   # ---------------------------
   zd-gateway:
-    image: zd.harbor.com/zd/zd-gateway:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-gateway:latest
     container_name: zd-gateway
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -98,7 +98,7 @@ services:
   # 授权服务
   # ---------------------------
   zd-auth:
-    image: zd.harbor.com/zd/zd-auth:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-auth:latest
     container_name: zd-auth
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -117,7 +117,7 @@ services:
   # 系统服务
   # ---------------------------
   zd-system:
-    image: zd.harbor.com/zd/zd-modules-system:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-system:latest
     container_name: zd-system
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -136,7 +136,7 @@ services:
 #  # 测试算法转发服务
 #  # ---------------------------
   zd-forward:
-    image: zd.harbor.com/zd/zd-forward:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-forward:latest
     container_name: zd-forward
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -154,19 +154,38 @@ services:
   # ---------------------------
   # 气瓶服务
   # ---------------------------
-  zd-airbottle:
-    image: zd.harbor.com/zd/zd-airbottle:latest
-    container_name: zd-airbottle
+#  zd-airbottle:
+#    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-airbottle:latest
+#    container_name: zd-airbottle
+#    env_file: docker-compose.env  # 从文件中获取配置
+#    depends_on:
+#      - zd-nacos
+#      - zd-redis
+#    restart: always
+#    ports:
+#      - "9400:9400"
+#    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
+#    volumes:
+#      - /zd/logs/zd-airbottle:/logs/zd-airbottle
+#    networks:
+#      - net
+
+  # ---------------------------
+  # 新气瓶服务
+  # ---------------------------
+  zd-bottle:
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-bottle:latest
+    container_name: zd-bottle
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
       - zd-nacos
       - zd-redis
     restart: always
     ports:
-      - "9400:9400"
+      - "9401:9401"
     entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
     volumes:
-      - /zd/logs/zd-airbottle:/logs/zd-airbottle
+      - /zd/logs/zd-bottle:/logs/zd-bottle
     networks:
       - net
 
@@ -174,7 +193,7 @@ services:
   # 报警系统
   # ---------------------------
   zd-alarm:
-    image: zd.harbor.com/zd/zd-alarm:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-alarm:latest
     container_name: zd-alarm
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -193,7 +212,7 @@ services:
   # 相机系统
   # ---------------------------
   zd-camera:
-    image: zd.harbor.com/zd/zd-camera:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-camera:latest
     container_name: zd-camera
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -212,7 +231,7 @@ services:
   # 化学品系统
   # ---------------------------
   zd-chemical:
-    image: zd.harbor.com/zd/zd-chemical:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-chemical:latest
     container_name: zd-chemical
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -231,7 +250,7 @@ services:
   # 人脸识别系统
   # ---------------------------
   zd-face:
-    image: zd.harbor.com/zd/zd-common-face:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-common-face:latest
     container_name: zd-face
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -250,7 +269,7 @@ services:
   # 考试系统
   # ---------------------------
   zd-exam:
-    image: zd.harbor.com/zd/zd-exam:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-exam:latest
     container_name: zd-exam
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -269,7 +288,7 @@ services:
   # 消息系统
   # ---------------------------
   zd-message:
-    image: zd.harbor.com/zd/zd-message:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-message:latest
     container_name: zd-message
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -288,7 +307,7 @@ services:
   # app系统
   # ---------------------------
   zd-app:
-    image: zd.harbor.com/zd/zd-modules-app:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-app:latest
     container_name: zd-app
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -307,7 +326,7 @@ services:
   # 文件系统
   # ---------------------------
   zd-file:
-    image: zd.harbor.com/zd/zd-modules-file:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-file:latest
     container_name: zd-file
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -326,7 +345,7 @@ services:
   # 代码生成系统
   # ---------------------------
   zd-gen:
-    image: zd.harbor.com/zd/zd-modules-gen:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-gen:latest
     container_name: zd-gen
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -345,7 +364,7 @@ services:
   # 任务调度系统
   # ---------------------------
   zd-job:
-    image: zd.harbor.com/zd/zd-modules-job:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-job:latest
     container_name: zd-job
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -364,7 +383,7 @@ services:
   # 实验室管理系统
   # ---------------------------
   zd-laboratory:
-    image: zd.harbor.com/zd/zd-modules-laboratory:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-laboratory:latest
     container_name: zd-laboratory
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -383,7 +402,7 @@ services:
   # netty系统
   # ---------------------------
   zd-netty:
-    image: zd.harbor.com/zd/zd-netty:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-netty:latest
     container_name: zd-netty
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -402,7 +421,7 @@ services:
   # 喇叭系统
   # ---------------------------
   zd-speaker:
-    image: zd.harbor.com/zd/zd-speaker:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-speaker:latest
     container_name: zd-speaker
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:
@@ -421,7 +440,7 @@ services:
   # 监控系统
   # ---------------------------
   zd-monitor:
-    image: zd.harbor.com/zd/zd-monitor:latest
+    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-monitor:latest
     container_name: zd-monitor
     env_file: docker-compose.env  # 从文件中获取配置
     depends_on:

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/ZdBottleApplication.java

@@ -9,6 +9,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.TimeZone;
+
 /**
  * Application
  *
@@ -23,6 +25,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @Slf4j
 public class ZdBottleApplication {
     public static void main(String[] args) {
+        TimeZone.setDefault(TimeZone.getTimeZone("CTT"));
         SpringApplication.run(ZdBottleApplication.class, args);
         log.info("(♥◠‿◠)ﾉﾞ  气瓶模块启动成功   ლ(´ڡ`ლ)ﾞ");
     }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageErrorServiceImpl.java

@@ -43,11 +43,11 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         LambdaQueryWrapper<BottleStorageError> queryWrapper = Wrappers.lambdaQuery(BottleStorageError.class);
         String startTime = bottleStorageError.getStartTime();
         if (StringUtils.hasLength(startTime)) {
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') >=" + startTime);
+            queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(create_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')");
         }
         String endTime = bottleStorageError.getEndTime();
         if (StringUtils.hasLength(endTime)) {
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') <=" + endTime);
+            queryWrapper.apply(StringUtils.hasLength(endTime), "DATE_FORMAT(create_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
         }
         String searchValue = bottleStorageError.getSearchValue();
         if (StringUtils.hasLength(searchValue)) {
@@ -60,6 +60,7 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         if (ids!=null && !ids.isEmpty()){
             queryWrapper.in(BottleStorageError::getId,ids);
         }
+        queryWrapper.orderByDesc(true,BottleStorageError::getCreateTime);
         return list(queryWrapper);
     }
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -97,6 +97,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         if (ids != null && !ids.isEmpty()) {
             queryWrapper.in(UseRecord::getId, ids);
         }
+        queryWrapper.orderByDesc(true,UseRecord::getUseTime);
         queryWrapper.setEntity(useRecord);
         return list(queryWrapper);
     }

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/zd-airbottle"/>
+    <property name="log.path" value="logs/zd-bottle"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasApplyMapper.xml

@@ -29,7 +29,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,
+        id
+        ,
         create_time,
         location, subject_id, apply_user, user_id, dept_id, dept_name, phone, start_time, end_time, gas_use, apply_certificate, safety_precautions, use_gas_id, use_gas_name, lead_audit_staus, lead_audit_userid, lead_audit_username, lead_audit_time, lead_audit_cause
     </sql>
@@ -39,7 +40,8 @@
             resultType="com.zd.bottle.vo.UsegasApplyVo">
         select ua.id,ua.apply_user applyUserName,ua.phone applyUserPhone,ua.use_gas_name useGasName,ua.create_time
         applyTime,
-        ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.safety_precautions safetyPrecautions,
+        ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.apply_certificate applyCertificate,
+        ua.safety_precautions safetyPrecautions,
         ua.use_gas_file useGasFile
         from ab_usegas_apply ua
         <where>