Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
hongawen
2023-05-23 19:31:11 +08:00
parent fd97f5fd78
commit 2925d46a07
22 changed files with 166 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pqs-auth/Dockerfile
View File

@@ -1,9 +1,12 @@
FROM openjdk:8-jdk-alpine
#作者MAINTAINER Wu Jize <wujize188@163.com>#指定阿里镜象
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
RUN set -xe \&& apk --no-cache add ttf-dejavu fontconfig
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/auth.jar auth.jar
ENTRYPOINT ["java","-jar","/auth.jar"]
EXPOSE 10214
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /auth.jar
EXPOSE 10214

10
pqs-auth/pom.xml
View File

@@ -21,16 +21,6 @@
<groupId>com.njcn</groupId>
<artifactId>common-web</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.njcn</groupId>

15
pqs-device/device-boot/Dockerfile
View File

@@ -1,5 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/deviceboot.jar deviceboot.jar
ENTRYPOINT ["java","-jar","/deviceboot.jar"]
EXPOSE 10202
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /deviceboot.jar
EXPOSE 10202

10
pqs-device/pms-device/pms-device-boot/pom.xml
View File

@@ -39,16 +39,6 @@
<groupId>com.njcn</groupId>
<artifactId>common-web</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.njcn</groupId>

10
pqs-device/pq-device/pq-device-boot/pom.xml
View File

@@ -38,16 +38,6 @@
<groupId>com.njcn</groupId>
<artifactId>common-web</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.njcn</groupId>

31
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -1649,7 +1649,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
private String saveTerminalInfo(List<OracleTerminalExcel> oracleTerminalExcels, List<OverLimitExcel> overLimitExcels) {
List<OracleTerminalExcel.OracleTerminalExcelMsg> oracleTerminalExcelMsg = new ArrayList<>();
//任意集合数据为空，不处理
if (CollectionUtil.isNotEmpty(oracleTerminalExcels) && CollectionUtil.isNotEmpty(overLimitExcels)) {
if (CollectionUtil.isNotEmpty(oracleTerminalExcels)) {
Line temp;
List<String> pids = new ArrayList<>();
for (OracleTerminalExcel oracleTerminalExcel : oracleTerminalExcels) {
@@ -1865,15 +1865,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
}
}
//获取该监测点的限值数据
List<OverLimitExcel> overLimitList = overLimitExcels.stream()
.filter(overLimitExcel -> overLimitExcel.getId().equals(oracleTerminalExcel.getId()))
.collect(Collectors.toList());
if (CollectionUtil.isEmpty(overLimitList)) {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "没有找到该监测点的限值数据"));
//删除刚刚新增装置信息
this.baseMapper.deleteById(temp.getId());
continue;
}
// List<OverLimitExcel> overLimitList = overLimitExcels.stream()
// .filter(overLimitExcel -> overLimitExcel.getId().equals(oracleTerminalExcel.getId()))
// .collect(Collectors.toList());
// if (CollectionUtil.isEmpty(overLimitList)) {
// oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "没有找到该监测点的限值数据"));
// //删除刚刚新增装置信息
// this.baseMapper.deleteById(temp.getId());
// continue;
// }
lineDetail.setNum(oracleTerminalExcel.getLineNum());
//干扰源类型
DictData loadTypeDicData = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getLoadType()).getData();
@@ -1910,15 +1910,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
lineBak.setLineId(oracleTerminalExcel.getId());
lineBakService.removeById(oracleTerminalExcel.getId());
lineBakService.save(lineBak);
OverLimitExcel overLimitExcel = overLimitList.get(0);
Overlimit overlimit = new Overlimit();
BeanUtils.copyProperties(overLimitExcel, overlimit);
overlimit.setId(temp.getId());
overlimitMapper.insert(overlimit);
// OverLimitExcel overLimitExcel = overLimitList.get(0);
// Overlimit overlimit = new Overlimit();
// BeanUtils.copyProperties(overLimitExcel, overlimit);
// overlimit.setId(temp.getId());
// overlimitMapper.insert(overlimit);
}
}
}
//错误信息不为空，则以excel的形式输出到前台
this.updatePqOverLimit();
if (CollectionUtil.isNotEmpty(oracleTerminalExcelMsg)) {
ExcelUtil.exportExcel("失败列表.xlsx", OracleTerminalExcel.OracleTerminalExcelMsg.class, oracleTerminalExcelMsg);
return null;

13
pqs-energy/energy-boot/Dockerfile
View File

@@ -1,6 +1,13 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/energyboot.jar energyboot.jar
ENTRYPOINT ["java","-jar","/energyboot.jar"]
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /energyboot.jar
EXPOSE 10208
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone

10
pqs-energy/energy-boot/pom.xml
View File

@@ -42,16 +42,6 @@
<groupId>com.njcn</groupId>
<artifactId>common-web</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.njcn</groupId>

16
pqs-event/event-boot/Dockerfile
View File

@@ -1,7 +1,15 @@
FROM openjdk:8-jdk-alpine
RUN mkdir -p /usr/local/comtrate
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/eventboot.jar eventboot.jar
ENTRYPOINT ["java","-jar","/eventboot.jar"]
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /eventboot.jar
EXPOSE 10203
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone

16
pqs-gateway/Dockerfile
View File

@@ -1,6 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/gateway.jar gateway.jar
ENTRYPOINT ["java","-jar","/gateway.jar"]
EXPOSE 10215
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /gateway.jar
EXPOSE 10215

8
pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java
View File

@@ -45,13 +45,13 @@ public class IpUtils {
public static String getRealIpAddress(ServerHttpRequest request) {
HttpHeaders headers = request.getHeaders();
String ipAddress = headers.getFirst(HEADER_X_FORWARDED_FOR);
log.error("X-Forwarded-For:"+ipAddress);
// log.error("X-Forwarded-For:"+ipAddress);
ipAddress = headers.getFirst("X-Real-IP");
log.error("X-Real-IP:"+ipAddress);
// log.error("X-Real-IP:"+ipAddress);
ipAddress = headers.getFirst("Proxy-Client-IP");
log.error("Proxy-Client-IP:"+ipAddress);
// log.error("Proxy-Client-IP:"+ipAddress);
ipAddress = headers.getFirst("REMOTE-HOST");
log.error("REMOTE-HOST:"+ipAddress);
// log.error("REMOTE-HOST:"+ipAddress);
if (StrUtil.isBlankIfStr(ipAddress) || UNKNOWN.equalsIgnoreCase(ipAddress)) {
ipAddress = headers.getFirst(HEADER_PROXY_CLIENT_IP);
}

15
pqs-harmonic/harmonic-boot/Dockerfile
View File

@@ -1,5 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/harmonicboot.jar harmonicboot.jar
ENTRYPOINT ["java","-jar","/harmonicboot.jar"]
EXPOSE 10204
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /harmonicboot.jar
EXPOSE 10204

14
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -242,9 +242,9 @@ public class CustomReportServiceImpl implements CustomReportService {
//报表日期
.eq(ExcelRpt::getDataDate, reportSearchParam.getStartTime());
try {
ExcelRpt excelRpts = excelRptMapper.selectOne(lambdaQuery);
if (Objects.nonNull(excelRpts)) {
fileStorageUtil.downloadStream(response, excelRpts.getContent());
List<ExcelRpt> excelRpts = excelRptMapper.selectList(lambdaQuery);
if (CollUtil.isNotEmpty(excelRpts)) {
fileStorageUtil.downloadStream(response, excelRpts.get(0).getContent());
} else {
fileStorageUtil.downloadStream(response, analyzeReport(reportSearchParam, excelRptTemp));
}
@@ -467,7 +467,7 @@ public class CustomReportServiceImpl implements CustomReportService {
InputStream reportStream = IoUtil.toStream(jsonArray.toString(), CharsetUtil.UTF_8);
String newContent = fileStorageUtil.uploadStream(reportStream, OssPath.HARMONIC_EXCEL_REPORT, FileUtil.generateFileName("json"));
//存入报表库
//入库前判断是否有了，有了就更新
ExcelRpt excelRpt = new ExcelRpt();
excelRpt.setName(excelRptTemp.getName());
excelRpt.setLineId(reportSearchParam.getLineId());
@@ -524,6 +524,7 @@ public class CustomReportServiceImpl implements CustomReportService {
.append(InfluxDBSqlConstant.QM);
}
//data_flicker、data_fluc、data_plt 无 value_type
if (!InfluxDBTableConstant.DATA_FLICKER.equals(data.getClassId()) && !InfluxDBTableConstant.DATA_FLUC.equals(data.getClassId()) && !InfluxDBTableConstant.DATA_PLT.equals(data.getClassId())) {
sql.append(InfluxDBSqlConstant.AND)
@@ -541,6 +542,11 @@ public class CustomReportServiceImpl implements CustomReportService {
.append(InfluxDBSqlConstant.TIME).append(InfluxDBSqlConstant.LT).append(InfluxDBSqlConstant.QM).append(reportSearchParam.getEndTime()).append(InfluxDBSqlConstant.END_TIME).append(InfluxDBSqlConstant.QM);
sql.append(InfluxDBSqlConstant.TZ);
if(data.getClassId().equals(InfluxDBTableConstant.DATA_PLT)){
System.out.println(sql);
}
//根据不同的库表赋值
QueryResult queryResult = influxDbUtils.query(String.valueOf(sql));

16
pqs-job/job-admin/Dockerfile
View File

@@ -1,6 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/job-admin.jar job-admin.jar
ENTRYPOINT ["java","-jar","/job-admin.jar"]
EXPOSE 10217
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /job-admin.jar
EXPOSE 10217

13
pqs-job/job-executor/Dockerfile
View File

@@ -1,6 +1,13 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/job-executor.jar job-executor.jar
ENTRYPOINT ["java","-jar","/job-executor.jar"]
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /job-executor.jar
EXPOSE 10218
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone

10
pqs-prepare/prepare-api/pom.xml
View File

@@ -33,16 +33,6 @@
<groupId>com.njcn</groupId>
<artifactId>common-web</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

13
pqs-prepare/prepare-boot/Dockerfile
View File

@@ -1,5 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/prepareboot.jar prepareboot.jar
ENTRYPOINT ["java","-jar","/prepareboot.jar"]
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /prepareboot.jar
EXPOSE 10221
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone

5
pqs-prepare/prepare-boot/pom.xml
View File

@@ -165,6 +165,11 @@
<artifactId>process-api</artifactId>
<version>1.0.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.njcn</groupId>-->
<!-- <artifactId>influxdb-springboot-starter</artifactId>-->
<!-- <version>1.0.0</version>-->
<!-- </dependency>-->
</dependencies>
<build>

1
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java
View File

@@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.DependsOn;
/**
* @author hongawen

15
pqs-process/process-boot/Dockerfile
View File

@@ -1,5 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/processboot.jar processboot.jar
ENTRYPOINT ["java","-jar","/processboot.jar"]
EXPOSE 10222
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /processboot.jar
EXPOSE 10222

15
pqs-system/system-boot/Dockerfile
View File

@@ -1,5 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/systemboot.jar systemboot.jar
ENTRYPOINT ["java","-jar","/systemboot.jar"]
EXPOSE 10207
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /systemboot.jar
EXPOSE 10207

16
pqs-user/user-boot/Dockerfile
View File

@@ -1,6 +1,12 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ADD target/userboot.jar userboot.jar
ENTRYPOINT ["java","-jar","/userboot.jar"]
EXPOSE 10201
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /userboot.jar
EXPOSE 10201