修改xxl-job的maven发布

fbs_code/fbs-backend/fbs-statistic-service/src/main/java/com/yyjc/fbs/statistics/biz/impl/CompanyCreditBizImpl.java

@@ -71,6 +71,7 @@ public class CompanyCreditBizImpl implements ICompanyCreditBiz {
 				for (Warn warn : comWarnMap.get(com.getCompany_id())) {
 					String warnType = warn.getWarn_type();
 					boolean flag = false;
+					//没有工单记录的没有处置的直接进入统计  或者告警开始到工单创建超过120分钟的
 					if (warn.getWork_order_time() == null) {
 						flag = true;
 					} else {

fbs_code/fbs-backend/fbs-statistic-service/src/main/java/com/yyjc/fbs/statistics/biz/impl/CompanyRedBlackImpl.java

@@ -31,6 +31,12 @@ public class CompanyRedBlackImpl implements ICompanyRedBlack {
 	@Autowired
 	private MonitorMapper monitorMapper;
 
+	/**
+	 * 处理商户一天时间之内，所有设备的排放总量，以及油烟，voc以及pm2.5超标的告警总次数
+	 * @param date
+	 * @param queryStart
+	 * @param queryEnd
+	 */
 	@Override
 	public void companyRedBlackStatis(Long date, Long queryStart, Long queryEnd) {
 		// 查询报警列表

fbs_code/fbs-backend/fbs-statistic-service/src/main/java/com/yyjc/fbs/statistics/biz/impl/MonitorDateBizImpl.java

@@ -30,6 +30,12 @@ public class MonitorDateBizImpl implements IMonitorDateBiz {
 	@Autowired
 	private OnlineDataMapper onlineDataMapper;
 
+	/**
+	 * 统计anal_monitor_date表，将当天内每个设备中油烟，voc,pm2.5数据汇总成一天的总量
+	 * @param date
+	 * @param queryStart
+	 * @param queryEnd
+	 */
 	@Override
 	public void monitorDateStatis(Long date, Long queryStart, Long queryEnd) {
 		MonitorDTO monitorDTO = new MonitorDTO();

fbs_code/fbs-backend/fbs-statistic-service/src/main/java/com/yyjc/fbs/statistics/biz/impl/MonitorRuntimeBizImpl.java

@@ -35,6 +35,11 @@ public class MonitorRuntimeBizImpl implements IMonitorRunTimeBiz {
 	@Autowired
 	private AnalDeviceRuntimeMapper analDeviceRuntimeMapper;
 
+	/**
+	 * 统计设备运行时长（anal_device_runtime）：当上传数据的电流大于设备电流阀值 运行时间+5
+	 * @param analTime
+	 * @param uploadDate
+	 */
 	@Override
 	public void updateMonitorRunTime(Long analTime, Long uploadDate) {
 		XxlJobHelper.log("开始统计设备运行时间：" + analTime);
@@ -68,15 +73,11 @@ public class MonitorRuntimeBizImpl implements IMonitorRunTimeBiz {
 				AnalDeviceRuntime vo = new AnalDeviceRuntime();
 				vo.setCompany_id(m.getCompany_id());
 				vo.setDevice_id(m.getId());
-				if (map.containsKey(m.getId())) {
-					vo.setRun_time(map.get(m.getId()));
-				} else {
-					vo.setRun_time(0);
-				}
+				vo.setRun_time(map.getOrDefault(m.getId(), 0));
 				vo.setUpload_date(uploadDate);
 
 				Integer status = getRunStatus(m, elecMap.get(m.getElectric_id()));
-				if (null != status && DeviceStatusEnum.RUN.getCode().equals(status)) {
+				if (DeviceStatusEnum.RUN.getCode().equals(status)) {
 					// 从当天零点开始计算，零点运行算10分钟
 					vo.setRun_time(vo.getRun_time() + SysConstants.UPLOAD_PERIOD);
 				}

fbs_code/fbs-backend/fbs-statistic-service/src/main/java/com/yyjc/fbs/statistics/biz/impl/OnlineComAndOrgBizImpl.java

@@ -173,7 +173,7 @@ public class OnlineComAndOrgBizImpl implements IOnlineComAndOrgBiz {
 			OnlineDataLampblackOrg org = new OnlineDataLampblackOrg();
 			org.setOrg_id(orgId);
 			org.setUpload_date(getTime);
-			// 这里只计算油烟浓度，voc，pm25
+			// 这里只计算油烟浓度，voc，pm25  求的是平均值
 			BigDecimal smoke_density = BigDecimal.ZERO;
 			BigDecimal voc_density = BigDecimal.ZERO;
 			BigDecimal pm25 = BigDecimal.ZERO;

fbs_code/fbs-backend/fbs-statistic-service/src/main/java/com/yyjc/fbs/statistics/jobhandler/WarnXxlJob.java

@@ -61,7 +61,7 @@ public class WarnXxlJob {
 	@XxlJob("WarnDeviceOfflineJobHandler")
 	public void warnDeviceOfflineJobHandler() throws Exception {
 		// 1)有持续时间，持续离线算是一条告警记录
-		// 2)如果有审核通过的维护申报，在维护区间内不产生告警，中断的告警状态置为恢复；
+		// 2)如果有审核通过的维护申报，在维护区间内不产生告警，中断的告警状态置为恢复
 		XxlJobHelper.log("开始统计设备离线报警");
 		String param = XxlJobHelper.getJobParam();
 		DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");

fbs_code/fbs-server-parent/fbs-hj212-server-bootstrap/src/main/resources/application-dev.yml

@@ -1,7 +1,8 @@
 app:
   id: cems-hj212-server
 apollo:
-  meta: http://120.25.176.175:8180
+  #meta: http://120.25.176.175:8180
+  meta: http://127.0.0.1:8180
   bootstrap:
     enabled: true
     namespaces: ${namespace}

fbs_code/xxl-job/xxl-job-admin/pom.xml

@@ -76,7 +76,92 @@
 	</dependencies>
 
 	<build>
+		<!--2023/07/21  start 由于程序源代码不需要修改 ,只需要变更配置文件，修改发布时候配置文件外置 -->
+		<!-- 控制resources资源文件的拷贝, -->
+		<!-- 这里需要配置两个resource -->
+		<!-- 一个resource控制把配置文件放在target目录下用于调试 -->
+		<!-- 一个resource控制把配置文件放在target/config目录下用于部署生产环境 -->
+		<resources>
+			<!-- 配置文件复制到target目录下,不然开发调试的时候会报错 -->
+			<resource>
+				<!-- 配置文件复制到target目录下,不然开发调试的时候会报错 -->
+				<directory>src/main/resources</directory>
+				<!-- 是否对资源文件进行过滤 -->
+				<filtering>true</filtering>
+				<!-- 这里没有配置targetPath，默认复制到outputDirectory目录下  -->
+			</resource>
+			<!-- 配置文件放在target/config目录下 -->
+			<resource>
+				<directory>src/main/resources</directory>
+				<targetPath>${project.build.directory}/config</targetPath>
+			</resource>
+		</resources>
+		<!--2023/07/21  end-->
 		<plugins>
+			<!--2023/07/21  start-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+						<!-- 清单文件 -->
+						<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
+						<manifest>
+							<mainClass>com.xxl.job.admin.XxlJobAdminApplication</mainClass>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+						</manifest>
+						<!-- 配置文件外置,需要把配置文件目录加入到classpath -->
+						<manifestEntries>
+							<Class-Path>config/</Class-Path>
+						</manifestEntries>
+					</archive>
+					<!-- 指定需要把哪些文件打入到jar包中,  -->
+					<!-- ** 代表jar包根目录 -->
+					<!-- **/com/ 代表jar包根目录下仅包含com目录(我所有的程序都在com包下), 当然打好之后还会包含生成的manifest目录 -->
+					<!-- 注意com后面的/一定不要省去,不然maven会认为这是一个文件名 -->
+					<!-- includes或者excludes一定要指定,不然会把target下所有的文件都打进去 -->
+					<includes>
+						<include>**/com/</include>
+					</includes>
+					<excludes>
+						<exclude>**/mappings/</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<!-- 拷贝依赖的jar包到lib目录 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>copy</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<!-- 拷贝依赖的jar包到lib目录 -->
+							<outputDirectory>
+								${project.build.directory}/lib
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- 解决资源文件的编码问题 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<!--2023/07/21  end-->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>