feiyu02
2023-10-19 f5d149a03739086d34c4dc2eb924bcf0e4330521
修改src文件下的文件路径名称
已修改2个文件
已删除5个文件
已添加5个文件
已重命名51个文件
489 ■■■■ 文件已修改
hs_err_pid13764.log 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/QianduanApplication.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/ServletInitializer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/controller/AnalysisDataController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/controller/LoginController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/controller/SqlController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/controller/dustexception/onlineAnalysisController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/ExceptionAnalysis.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/analysis/Exceeding.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/database/DustRepository.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/dataprocess/DataProcess.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/mapper/LoginMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/mapper/SqlMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/mapper/Vue3FumeMapper.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/mapper/dustexception/OnlineAnalysisMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/AnalysisData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/AnalysisDustData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/AuditInfo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/DeviceInfo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/DustDataAccessSetting.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/DustExceptionData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/DustExceptionSetting.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/DustExceptionType.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/FumeAbnormalData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/FumeHistoryData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/LoginUser.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/OriginalData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/PageBean.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/pojo/Result.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/scheduledtasks/BaseTimingTask.kt 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/scheduledtasks/ScheduledTaskController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/AnalysisDataService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/LoginService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/SqlService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/Vue3FumeService.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/dustexception/impl/onlineAnalysisServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/dustexception/onlineAnalysisService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/impl/AnalysisDataServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/impl/LoginServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/impl/SqlServiceImpl.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/impl/Vue3FumeServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/service/impl/dustexception/onlineAnalysisImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/utils/MD5Util.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/job/zsc/service/LoginService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/job/zsc/service/dustexception/impl/onlineAnalysisServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/job/zsc/service/impl/SqlServiceImpl.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/com/flightfeather/monitor/mapper/AnalysisDataMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/com/flightfeather/monitor/mapper/FugitiveDustMapper.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/com/flightfeather/monitor/mapper/SqlMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/com/flightfeather/monitor/mapper/Vue3FumeMapper.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/test/java/com/flightfeather/monitor/QianduanApplicationTests.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hs_err_pid13764.log
@@ -368,7 +368,7 @@
VM Arguments:
jvm_args: -XX:TieredStopAtLevel=1 -Xverify:none -Dspring.output.ansi.enabled=always -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -javaagent:E:\ruanjian\IntelliJ IDEA 2022.2.2\lib\idea_rt.jar=60341:E:\ruanjian\IntelliJ IDEA 2022.2.2\bin -Dfile.encoding=UTF-8 
java_command: com.job.zsc.QianduanApplication
java_command: QianduanApplication
java_class_path (initial): E:\ruanjian\JDK-1.8\jre\lib\charsets.jar;E:\ruanjian\JDK-1.8\jre\lib\deploy.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\access-bridge-64.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\cldrdata.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\dnsns.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\jaccess.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\jfxrt.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\localedata.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\nashorn.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunec.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunjce_provider.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunmscapi.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunpkcs11.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\zipfs.jar;E:\ruanjian\JDK-1.8\jre\lib\javaws.jar;E:\ruanjian\JDK-1.8\jre\lib\jce.jar;E:\ruanjian\JDK-1.8\jre\lib\jfr.jar;E:\ruanjian\JDK-1.8\jre\lib\jfxswt.jar;E:\ruanjian\JDK-1.8\jre\lib\jsse.jar;E:\ruanjian\JDK-1.8\jre\lib\management-agent.jar;E:\ruanjian\JDK-1.8\jre\lib\plugin.jar;E:\ruanjian\JDK-1.8\jre\lib\resources.jar;E:\ruanjian\JDK-1.8\jre\lib\rt.jar;D:\z\workplace\qianduan\target\classes;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-starter-web\2.5.15\spring-boot-starter-web-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-starter\2.5.15\spring-boot-starter-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot\2.5.15\spring-boot-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-autoconfigure\2.5.15\spring-boot-autoconfigure-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-starter-logging\2.5.15\spring-boot-starter-logging-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\ch\qos\logback\logback-classic\1.2.12\logback-classic-1.2.12.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\ch\qos\logback\logback-core\1.2.12\logback-core-1.2.12.jar;E:\ruanjian\maven-3.9.2\apache-m
Launcher Type: SUN_STANDARD
@@ -392,6 +392,6 @@
vm_info: Java HotSpot(TM) 64-Bit Server VM (25.251-b08) for windows-amd64 JRE (1.8.0_251-b08), built on Mar 12 2020 06:31:49 by "" with MS VC++ 10.0 (VS2010)
time: Fri Sep 01 16:09:54 2023
timezone: ä¸­å›½æ ‡å‡†æ—¶é—´
timezone: ï¿½Ð¹ï¿½ï¿½ï¿½×¼Ê±ï¿½ï¿½
elapsed time: 5369 seconds (0d 1h 29m 29s)
src/main/java/com/flightfeather/monitor/QianduanApplication.java
ÎļþÃû´Ó src/main/java/com/job/zsc/QianduanApplication.java ÐÞ¸Ä
@@ -1,8 +1,7 @@
package com.job.zsc;
package com.flightfeather.monitor;
import com.job.zsc.scheduledtasks.TaskController;
import com.flightfeather.monitor.scheduledtasks.TaskController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
src/main/java/com/flightfeather/monitor/ServletInitializer.java
ÎļþÃû´Ó src/main/java/com/job/zsc/ServletInitializer.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc;
package com.flightfeather.monitor;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
src/main/java/com/flightfeather/monitor/controller/AnalysisDataController.java
ÎļþÃû´Ó src/main/java/com/job/zsc/controller/AnalysisDataController.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package com.job.zsc.controller;
package com.flightfeather.monitor.controller;
import com.job.zsc.pojo.AnalysisData;
import com.job.zsc.pojo.Result;
import com.job.zsc.service.AnalysisDataService;
import com.flightfeather.monitor.pojo.AnalysisData;
import com.flightfeather.monitor.pojo.Result;
import com.flightfeather.monitor.service.AnalysisDataService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
ÎļþÃû´Ó src/main/java/com/job/zsc/controller/FugitiveDustController.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package com.job.zsc.controller;
package com.flightfeather.monitor.controller;
import com.job.zsc.pojo.*;
import com.job.zsc.service.FugitiveDustService;
import com.flightfeather.monitor.pojo.*;
import com.flightfeather.monitor.service.FugitiveDustService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -156,7 +156,7 @@
    /*根据异常类型和时段 è¿”回站点名字*/
    @GetMapping("/exceptionsSiteName")
    public Result getSiteNameByTimeAndExceptionType(String [] exceptionType,String beginTime, String endTime){
    public Result getSiteNameByTimeAndExceptionType(String [] exceptionType, String beginTime, String endTime){
        List<DustExceptionData> list = fugitiveDustService.getSiteNameByTimeAndExceptionType(exceptionType,beginTime,endTime);
        return Result.success(list);
    }
src/main/java/com/flightfeather/monitor/controller/LoginController.java
ÎļþÃû´Ó src/main/java/com/job/zsc/controller/LoginController.java ÐÞ¸Ä
@@ -1,14 +1,11 @@
package com.job.zsc.controller;
package com.flightfeather.monitor.controller;
import com.job.zsc.pojo.LoginUser;
import com.job.zsc.pojo.Result;
import com.job.zsc.service.LoginService;
import com.flightfeather.monitor.pojo.LoginUser;
import com.flightfeather.monitor.pojo.Result;
import com.flightfeather.monitor.service.LoginService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
@RequestMapping("/dust")
@CrossOrigin
src/main/java/com/flightfeather/monitor/controller/SqlController.java
ÎļþÃû´Ó src/main/java/com/job/zsc/controller/SqlController.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package com.job.zsc.controller;
package com.flightfeather.monitor.controller;
import com.job.zsc.pojo.PageBean;
import com.job.zsc.pojo.Result;
import com.job.zsc.pojo.OriginalData;
import com.job.zsc.service.SqlService;
import com.flightfeather.monitor.pojo.PageBean;
import com.flightfeather.monitor.pojo.Result;
import com.flightfeather.monitor.pojo.OriginalData;
import com.flightfeather.monitor.service.SqlService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java
ÎļþÃû´Ó src/main/java/com/job/zsc/controller/Vue3FumeController.java ÐÞ¸Ä
@@ -1,14 +1,11 @@
package com.job.zsc.controller;
package com.flightfeather.monitor.controller;
import com.job.zsc.pojo.*;
import com.job.zsc.service.Vue3FumeService;
import com.flightfeather.monitor.pojo.*;
import com.flightfeather.monitor.service.Vue3FumeService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.naming.InsufficientResourcesException;
import java.util.List;
@Slf4j
src/main/java/com/flightfeather/monitor/controller/dustexception/onlineAnalysisController.java
ÎļþÃû´Ó src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.controller.dustexception;
package com.flightfeather.monitor.controller.dustexception;
import lombok.extern.slf4j.Slf4j;
@@ -15,7 +15,7 @@
public class onlineAnalysisController {
    @Autowired
    private com.job.zsc.service.dustexception.onlineAnalysisService onlineAnalysisService;
    private com.flightfeather.monitor.service.dustexception.onlineAnalysisService onlineAnalysisService;
    @GetMapping("/analysisData")
    public void get(){
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/ExceptionAnalysis.java
ÎļþÃû´Ó src/main/java/com/job/zsc/dustexceptionanalysis/ExceptionAnalysis.java ÐÞ¸Ä
@@ -1,8 +1,7 @@
package com.job.zsc.dustexceptionanalysis;
package com.flightfeather.monitor.dustexceptionanalysis;
import com.job.zsc.pojo.DustExceptionSetting;
import com.job.zsc.pojo.DustSiteData;
import org.springframework.beans.factory.annotation.Autowired;
import com.flightfeather.monitor.pojo.DustExceptionSetting;
import com.flightfeather.monitor.pojo.DustSiteData;
import org.springframework.stereotype.Controller;
import java.util.ArrayList;
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/analysis/Exceeding.java
ÎļþÃû´Ó src/main/java/com/job/zsc/dustexceptionanalysis/analysis/Exceeding.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package com.job.zsc.dustexceptionanalysis.analysis;
package com.flightfeather.monitor.dustexceptionanalysis.analysis;
import com.job.zsc.pojo.DustExceptionSetting;
import com.job.zsc.pojo.DustSiteData;
import com.flightfeather.monitor.pojo.DustExceptionSetting;
import com.flightfeather.monitor.pojo.DustSiteData;
import java.util.ArrayList;
import java.util.List;
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/database/DustRepository.java
ÎļþÃû´Ó src/main/java/com/job/zsc/dustexceptionanalysis/database/DustRepository.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package com.job.zsc.dustexceptionanalysis.database;
package com.flightfeather.monitor.dustexceptionanalysis.database;
import com.job.zsc.pojo.DustExceptionSetting;
import com.job.zsc.pojo.DustSiteData;
import com.flightfeather.monitor.pojo.DustExceptionSetting;
import com.flightfeather.monitor.pojo.DustSiteData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
src/main/java/com/flightfeather/monitor/dustexceptionanalysis/dataprocess/DataProcess.java
ÎļþÃû´Ó src/main/java/com/job/zsc/dustexceptionanalysis/dataprocess/DataProcess.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.job.zsc.dustexceptionanalysis.dataprocess;
package com.flightfeather.monitor.dustexceptionanalysis.dataprocess;
import com.job.zsc.pojo.DustExceptionSetting;
import com.flightfeather.monitor.pojo.DustExceptionSetting;
import java.util.List;
src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java
ÎļþÃû´Ó src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.job.zsc.mapper;
package com.flightfeather.monitor.mapper;
import com.job.zsc.pojo.AnalysisData;
import com.flightfeather.monitor.pojo.AnalysisData;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
ÎļþÃû´Ó src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.job.zsc.mapper;
package com.flightfeather.monitor.mapper;
import com.job.zsc.pojo.*;
import com.flightfeather.monitor.pojo.*;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,7 +19,7 @@
    @Select("select DISTINCT name from ja_t_dust_site_info  ")
    List<DustSiteData> allSiteName();
    List<AnalysisDustData> analysisdata( String siteName,String beginTime, String endTime);
    List<AnalysisDustData> analysisdata(String siteName, String beginTime, String endTime);
    List<AnalysisDustData> analysisByTime(String siteName, String beginTime, String endTime);
src/main/java/com/flightfeather/monitor/mapper/LoginMapper.java
ÎļþÃû´Ó src/main/java/com/job/zsc/mapper/LoginMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.job.zsc.mapper;
package com.flightfeather.monitor.mapper;
import com.job.zsc.pojo.LoginUser;
import com.flightfeather.monitor.pojo.LoginUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
src/main/java/com/flightfeather/monitor/mapper/SqlMapper.java
ÎļþÃû´Ó src/main/java/com/job/zsc/mapper/SqlMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.job.zsc.mapper;
package com.flightfeather.monitor.mapper;
import com.job.zsc.pojo.OriginalData;
import com.flightfeather.monitor.pojo.OriginalData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
src/main/java/com/flightfeather/monitor/mapper/Vue3FumeMapper.java
ÎļþÃû´Ó src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package com.job.zsc.mapper;
package com.flightfeather.monitor.mapper;
import com.job.zsc.pojo.DeviceInfo;
import com.job.zsc.pojo.FumeAbnormalData;
import com.job.zsc.pojo.FumeHistoryData;
import com.flightfeather.monitor.pojo.DeviceInfo;
import com.flightfeather.monitor.pojo.FumeAbnormalData;
import com.flightfeather.monitor.pojo.FumeHistoryData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
src/main/java/com/flightfeather/monitor/mapper/dustexception/OnlineAnalysisMapper.java
ÎļþÃû´Ó src/main/java/com/job/zsc/mapper/dustexception/OnlineAnalysisMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package com.job.zsc.mapper.dustexception;
package com.flightfeather.monitor.mapper.dustexception;
import com.job.zsc.pojo.DustSiteData;
import com.flightfeather.monitor.pojo.DustSiteData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
src/main/java/com/flightfeather/monitor/pojo/AnalysisData.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/AnalysisData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/pojo/AnalysisDustData.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/AnalysisDustData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/pojo/AuditInfo.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/AuditInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/pojo/DeviceInfo.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/DeviceInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
src/main/java/com/flightfeather/monitor/pojo/DustDataAccessSetting.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
src/main/java/com/flightfeather/monitor/pojo/DustExceptionData.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/DustExceptionData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/pojo/DustExceptionSetting.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/DustExceptionSetting.java ÐÞ¸Ä
@@ -1,9 +1,8 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
src/main/java/com/flightfeather/monitor/pojo/DustExceptionType.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/DustExceptionType.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/DustSiteData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/pojo/FumeAbnormalData.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/FumeAbnormalData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
src/main/java/com/flightfeather/monitor/pojo/FumeHistoryData.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/FumeHistoryData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/pojo/LoginUser.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/LoginUser.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
src/main/java/com/flightfeather/monitor/pojo/OriginalData.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/OriginalData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/pojo/PageBean.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/PageBean.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
src/main/java/com/flightfeather/monitor/pojo/Result.java
ÎļþÃû´Ó src/main/java/com/job/zsc/pojo/Result.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.pojo;
package com.flightfeather.monitor.pojo;
import lombok.AllArgsConstructor;
src/main/java/com/flightfeather/monitor/scheduledtasks/BaseTimingTask.kt
src/main/java/com/flightfeather/monitor/scheduledtasks/ScheduledTaskController.java
ÎļþÃû´Ó src/main/java/com/job/zsc/scheduledtasks/ScheduledTaskController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.scheduledtasks;
package com.flightfeather.monitor.scheduledtasks;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt
ÎļþÃû´Ó src/main/java/com/job/zsc/scheduledtasks/TaskController.kt ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.scheduledtasks
package com.flightfeather.monitor.scheduledtasks
import cn.flightfeather.supervision.timingtask.BaseTimingTask
import org.slf4j.LoggerFactory
src/main/java/com/flightfeather/monitor/service/AnalysisDataService.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/AnalysisDataService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.job.zsc.service;
package com.flightfeather.monitor.service;
import com.job.zsc.pojo.AnalysisData;
import com.flightfeather.monitor.pojo.AnalysisData;
import java.util.List;
src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/FugitiveDustService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.job.zsc.service;
package com.flightfeather.monitor.service;
import com.job.zsc.pojo.*;
import com.flightfeather.monitor.pojo.*;
import java.util.List;
src/main/java/com/flightfeather/monitor/service/LoginService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.flightfeather.monitor.service;
import com.flightfeather.monitor.pojo.LoginUser;
public interface LoginService {
    LoginUser login(LoginUser loginUser);
}
src/main/java/com/flightfeather/monitor/service/SqlService.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/SqlService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package com.job.zsc.service;
package com.flightfeather.monitor.service;
import com.job.zsc.pojo.PageBean;
import com.job.zsc.pojo.OriginalData;
import com.flightfeather.monitor.pojo.PageBean;
import com.flightfeather.monitor.pojo.OriginalData;
import java.time.LocalDate;
import java.util.List;
src/main/java/com/flightfeather/monitor/service/Vue3FumeService.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/Vue3FumeService.java ÐÞ¸Ä
@@ -1,10 +1,9 @@
package com.job.zsc.service;
package com.flightfeather.monitor.service;
import com.job.zsc.pojo.DeviceInfo;
import com.job.zsc.pojo.FumeAbnormalData;
import com.job.zsc.pojo.FumeHistoryData;
import com.job.zsc.pojo.PageBean;
import org.springframework.stereotype.Service;
import com.flightfeather.monitor.pojo.DeviceInfo;
import com.flightfeather.monitor.pojo.FumeAbnormalData;
import com.flightfeather.monitor.pojo.FumeHistoryData;
import com.flightfeather.monitor.pojo.PageBean;
import java.util.List;
src/main/java/com/flightfeather/monitor/service/dustexception/impl/onlineAnalysisServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.flightfeather.monitor.service.dustexception.impl;
import com.flightfeather.monitor.service.dustexception.onlineAnalysisService;
public class onlineAnalysisServiceImpl implements onlineAnalysisService {
        /*逻辑处理*/
}
src/main/java/com/flightfeather/monitor/service/dustexception/onlineAnalysisService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
package com.flightfeather.monitor.service.dustexception;
public interface onlineAnalysisService {
}
src/main/java/com/flightfeather/monitor/service/impl/AnalysisDataServiceImpl.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package com.job.zsc.service.impl;
package com.flightfeather.monitor.service.impl;
import com.job.zsc.mapper.AnalysisDataMapper;
import com.job.zsc.pojo.AnalysisData;
import com.job.zsc.service.AnalysisDataService;
import com.flightfeather.monitor.mapper.AnalysisDataMapper;
import com.flightfeather.monitor.service.AnalysisDataService;
import com.flightfeather.monitor.pojo.AnalysisData;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package com.job.zsc.service.impl;
package com.flightfeather.monitor.service.impl;
import com.flightfeather.monitor.mapper.FugitiveDustMapper;
import com.flightfeather.monitor.pojo.*;
import com.flightfeather.monitor.service.FugitiveDustService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.job.zsc.mapper.FugitiveDustMapper;
import com.job.zsc.pojo.*;
import com.job.zsc.service.FugitiveDustService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -178,7 +178,7 @@
    }
    @Override
    public List<AnalysisDustData> analysisdataByType(String month,String type) {
    public List<AnalysisDustData> analysisdataByType(String month, String type) {
        List<AnalysisDustData> list = fugitiveDustMapper.analysisdataByType(month,type);
        return list;
    }
src/main/java/com/flightfeather/monitor/service/impl/LoginServiceImpl.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/impl/LoginServiceImpl.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package com.job.zsc.service.impl;
package com.flightfeather.monitor.service.impl;
import com.job.zsc.mapper.LoginMapper;
import com.job.zsc.pojo.LoginUser;
import com.job.zsc.service.LoginService;
import com.flightfeather.monitor.mapper.LoginMapper;
import com.flightfeather.monitor.pojo.LoginUser;
import com.flightfeather.monitor.service.LoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
src/main/java/com/flightfeather/monitor/service/impl/SqlServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package com.flightfeather.monitor.service.impl;
import com.flightfeather.monitor.mapper.SqlMapper;
import com.flightfeather.monitor.pojo.OriginalData;
import com.flightfeather.monitor.pojo.PageBean;
import com.flightfeather.monitor.service.SqlService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.util.List;
@Service
public class SqlServiceImpl implements SqlService {
    @Autowired
    private SqlMapper sqlMapper;
    @Override
    public PageBean page(Integer page, Integer pageSize, String shopname, LocalDate begin, LocalDate end) {
        /* //获取总记录数
        Long count=empMapper.count();
        //获取分页查询结果列表
        Integer start =(page-1)*pageSize;
        List<Emp> list=empMapper.list(start,pageSize);*/
        //设置分页参数
        PageHelper.startPage(page, pageSize);
        //执行查询
        List<OriginalData> infoList = sqlMapper.list(shopname, begin, end);
        //获取查询结果
        Page<OriginalData> p1 = (Page<OriginalData>) infoList;
        //封装PageBean对象*/
        PageBean pageBean = new PageBean(p1.getTotal(), p1.getResult());
        return pageBean;
    }
    @Override
    public List<OriginalData> show_all() {
        List<OriginalData> list_sql = sqlMapper.show_all();
        return list_sql;
    }
    @Override
    public List<OriginalData> findShop(String shopname) {
        List<OriginalData> shops = sqlMapper.findShop(shopname);
        return shops;
    }
    @Override
    public List<OriginalData> findDate(LocalDate begin, LocalDate end) {
        List<OriginalData> dates = sqlMapper.findDate(begin, end);
        return dates;
    }
    @Override
    public List<OriginalData> findByForm(String name, String number, String dname, String begin, String end) {
        List<OriginalData> form = sqlMapper.findByForm(name, number, dname, begin, end);
        return form;
    }
}
src/main/java/com/flightfeather/monitor/service/impl/Vue3FumeServiceImpl.java
ÎļþÃû´Ó src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java ÐÞ¸Ä
@@ -1,14 +1,17 @@
package com.job.zsc.service.impl;
package com.flightfeather.monitor.service.impl;
import com.flightfeather.monitor.mapper.Vue3FumeMapper;
import com.flightfeather.monitor.pojo.DeviceInfo;
import com.flightfeather.monitor.pojo.FumeAbnormalData;
import com.flightfeather.monitor.pojo.FumeHistoryData;
import com.flightfeather.monitor.pojo.PageBean;
import com.flightfeather.monitor.service.Vue3FumeService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.job.zsc.mapper.Vue3FumeMapper;
import com.job.zsc.pojo.*;
import com.job.zsc.service.Vue3FumeService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Slf4j
src/main/java/com/flightfeather/monitor/service/impl/dustexception/onlineAnalysisImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package com.flightfeather.monitor.service.impl.dustexception;
import com.flightfeather.monitor.service.dustexception.onlineAnalysisService;
import org.springframework.stereotype.Service;
@Service
public class onlineAnalysisImpl implements onlineAnalysisService {
}
src/main/java/com/flightfeather/monitor/utils/MD5Util.java
ÎļþÃû´Ó src/main/java/com/job/zsc/utils/MD5Util.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.utils;
package com.flightfeather.monitor.utils;
import java.math.BigInteger;
import java.security.MessageDigest;
src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt
ÎļþÃû´Ó src/main/java/com/job/zsc/utils/UUIDGenerator.kt ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.job.zsc.utils
package com.flightfeather.monitor.utils
import org.apache.commons.logging.LogFactory
import java.net.InetAddress
src/main/java/com/job/zsc/service/LoginService.java
ÎļþÒÑɾ³ý
src/main/java/com/job/zsc/service/dustexception/impl/onlineAnalysisServiceImpl.java
ÎļþÒÑɾ³ý
src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java
ÎļþÒÑɾ³ý
src/main/java/com/job/zsc/service/impl/SqlServiceImpl.java
ÎļþÒÑɾ³ý
src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java
ÎļþÒÑɾ³ý
src/main/resources/application.yml
@@ -1,13 +1,13 @@
spring:
  datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
#     url: jdbc:mysql://localhost:3306/fume
#     username: fume
#     password: fume_feiyu2023
    driver-class-name: com.mysql.cj.jdbc.Driver
   url: jdbc:mysql://localhost:3306/fume
   username: fume
   password: fume_feiyu2023
     url: jdbc:mysql://localhost:3306/qianduan_sql
     username: root
     password: 1234
    # url: jdbc:mysql://localhost:3306/qianduan_sql
    # username: root
    # password: 1234
mybatis:
  configuration:
src/main/resources/com/flightfeather/monitor/mapper/AnalysisDataMapper.xml
ÎļþÃû´Ó src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml ÐÞ¸Ä
@@ -2,10 +2,10 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.job.zsc.mapper.AnalysisDataMapper">
<mapper namespace="com.flightfeather.monitor.mapper.AnalysisDataMapper">
    <select id="findByDevId" resultType="com.job.zsc.pojo.AnalysisData">
    <select id="findByDevId" resultType="com.flightfeather.monitor.pojo.AnalysisData">
    select * from fm_web_analysis_data
    <where>
        <if test="devId != null and devId != '' ">
@@ -19,7 +19,7 @@
    </select>
<!--信息和数据未分开的数据表分析 ed_data-->
<!--    <select id="find" resultType="com.job.zsc.pojo.AnalysisData">-->
<!--    <select id="find" resultType="AnalysisData">-->
<!--        SELECT-->
<!--        equipment_number as fume_dev_id,-->
<!--        DATE(reporting_time) as fume_date,-->
@@ -67,7 +67,7 @@
<!--        limit 0,500-->
<!--    </select>-->
<!--新表-->
    <select id="find" resultType="com.job.zsc.pojo.AnalysisData">
    <select id="find" resultType="com.flightfeather.monitor.pojo.AnalysisData">
        SELECT
        a.MV_Stat_Code as fume_dev_id,
@@ -119,7 +119,7 @@
    <!-- åŽ»é‡-->
    <select id="search" resultType="com.job.zsc.pojo.AnalysisData">
    <select id="search" resultType="com.flightfeather.monitor.pojo.AnalysisData">
        select a.*,b.DI_Name,b.DI_Supplier
        from fm_web_analysis_data as a join ea_t_device_info as b on a.fume_dev_id = b.DI_Code
        <where>
src/main/resources/com/flightfeather/monitor/mapper/FugitiveDustMapper.xml
ÎļþÃû´Ó src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml ÐÞ¸Ä
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.job.zsc.mapper.FugitiveDustMapper">
<mapper namespace="com.flightfeather.monitor.mapper.FugitiveDustMapper">
    <update id="update">
        update audit_info
        <set>
@@ -30,7 +30,7 @@
        where exception_id = #{exceptionId}
    </update>
    <select id="conditonQueryDustHistoryData" resultType="com.job.zsc.pojo.DustSiteData">
    <select id="conditonQueryDustHistoryData" resultType="com.flightfeather.monitor.pojo.DustSiteData">
        select a.*,b.*
        from ja_t_dust_site_data_info as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
        <where>
@@ -55,7 +55,7 @@
    </select>
<!--分析数据-->
    <select id="analysisdata" resultType="com.job.zsc.pojo.AnalysisDustData">
    <select id="analysisdata" resultType="com.flightfeather.monitor.pojo.AnalysisDustData">
        select a.*,b.name,b.duty_company from dust_statistics_value as a join ja_t_dust_site_info as b on a.mn_code = b. mn_code
        <where>
            <if test="siteName !=null and siteName != ''">
@@ -70,7 +70,7 @@
    <!--    æ ¹æ®ç«™ç‚¹åå­—和时段进行统计分析-->
    <select id="analysisByTime" resultType="com.job.zsc.pojo.AnalysisDustData">
    <select id="analysisByTime" resultType="com.flightfeather.monitor.pojo.AnalysisDustData">
        select  c.name,d.*
        from ja_t_dust_site_info as c  join
        (
@@ -101,7 +101,7 @@
    <!--条件查询异常数据  åŠ ä¸Šäº†å®¡è®¡ä¿¡æ¯-->
    <select id="getExceptionData" resultType="com.job.zsc.pojo.DustExceptionData">
    <select id="getExceptionData" resultType="com.flightfeather.monitor.pojo.DustExceptionData">
        select *
        from (select a.* ,b.name,b.typename,b.address,b.duty_company
        from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
@@ -129,7 +129,7 @@
    <!--   æ ¹æ®æŸæ®µæ—¶é—´å†…某个异常类型查询对应的店铺名称和设备编号-->
    <select id="getExceptionSitenameAndCode" resultType="com.job.zsc.pojo.DustExceptionData">
    <select id="getExceptionSitenameAndCode" resultType="com.flightfeather.monitor.pojo.DustExceptionData">
        select DISTINCT b.name,a.mn_code
        from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
@@ -145,7 +145,7 @@
    </select>
<!--    æ¡ä»¶æŸ¥è¯¢åŽ†å²æ•°æ®-->
    <select id="conditonQueryHistoryData" resultType="com.job.zsc.pojo.DustSiteData">
    <select id="conditonQueryHistoryData" resultType="com.flightfeather.monitor.pojo.DustSiteData">
        select a.*,b.name,b.duty_Company
        from ja_t_dust_site_data_info as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
        <where>
@@ -160,7 +160,7 @@
        order by a.lst asc
    </select>
    <select id="getHasAuditedData" resultType="com.job.zsc.pojo.DustExceptionData">
    <select id="getHasAuditedData" resultType="com.flightfeather.monitor.pojo.DustExceptionData">
        select *
        from dust_exception_data as a left join audit_info as b on a.id = b.exception_id
        <where>
@@ -171,7 +171,7 @@
        </where>
    </select>
    <select id="getSiteNameByTimeAndExceptionType" resultType="com.job.zsc.pojo.DustExceptionData">
    <select id="getSiteNameByTimeAndExceptionType" resultType="com.flightfeather.monitor.pojo.DustExceptionData">
        select DISTINCT b.name
        from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
        <where>
@@ -188,7 +188,7 @@
        </where>
    </select>
    <select id="analysisdataByType" resultType="com.job.zsc.pojo.AnalysisDustData">
    <select id="analysisdataByType" resultType="com.flightfeather.monitor.pojo.AnalysisDustData">
        select a.*,b.name,b.duty_company from dust_statistics_value as a join ja_t_dust_site_info as b on a.mn_code = b. mn_code
        <where>
            <if test="month != null and month != null">
@@ -201,7 +201,7 @@
        </where>
    </select>
    <select id="analysisdataByTimeAndType" resultType="com.job.zsc.pojo.AnalysisDustData">
    <select id="analysisdataByTimeAndType" resultType="com.flightfeather.monitor.pojo.AnalysisDustData">
        select a.*,b.name,b.duty_company from dust_statistics_value as a join ja_t_dust_site_info as b on a.mn_code = b. mn_code
        <where>
            <if test="beginTime != null and endTime != null">
src/main/resources/com/flightfeather/monitor/mapper/SqlMapper.xml
ÎļþÃû´Ó src/main/resources/com/job/zsc/mapper/SqlMapper.xml ÐÞ¸Ä
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.job.zsc.mapper.SqlMapper">
<mapper namespace="com.flightfeather.monitor.mapper.SqlMapper">
    <select id="list" resultType="com.job.zsc.pojo.OriginalData">
    <select id="list" resultType="com.flightfeather.monitor.pojo.OriginalData">
        select * from ed_data
        <where>
            <if test="shopname != null and shopname != '' ">
@@ -20,7 +20,7 @@
    <select id="findByForm" resultType="com.job.zsc.pojo.OriginalData">
    <select id="findByForm" resultType="com.flightfeather.monitor.pojo.OriginalData">
        select * from ed_data
        <where>
            <if test="name != null and name != '' ">
src/main/resources/com/flightfeather/monitor/mapper/Vue3FumeMapper.xml
ÎļþÃû´Ó src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml ÐÞ¸Ä
@@ -2,10 +2,10 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.job.zsc.mapper.Vue3FumeMapper">
<mapper namespace="com.flightfeather.monitor.mapper.Vue3FumeMapper">
<!--   è¶…标油烟查询-->
    <select id="conditionQuery" resultType="com.job.zsc.pojo.FumeHistoryData">
    <select id="conditionQuery" resultType="com.flightfeather.monitor.pojo.FumeHistoryData">
        SELECT a1.MV_ID, a1.MV_Stat_Code, b.DI_Name,b.DI_Supplier, a1.MV_Create_Time, a1.MV_Data_Time, a1.MV_Fume_Concentration2
        FROM exceeding_st_data AS a1
        INNER JOIN ea_t_device_info AS b ON a1.MV_Stat_Code = b.DI_Code
@@ -22,7 +22,7 @@
    </select>
    <!--    åŽ†å²æ²¹çƒŸæŸ¥è¯¢-->
<!--    <select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">-->
<!--    <select id="conditionQueryHistory" resultType="FumeHistoryData">-->
<!--        SELECT d.DI_Name, c.*-->
<!--        FROM (-->
<!--        SELECT a.*-->
@@ -42,7 +42,7 @@
<!--        ORDER BY c.MV_Data_Time ASC;-->
<!--    </select>-->
    <!--    åŽ†å²æ²¹çƒŸæŸ¥è¯¢ ä¿®æ”¹äº†è¯­å¥-->
    <select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">
    <select id="conditionQueryHistory" resultType="com.flightfeather.monitor.pojo.FumeHistoryData">
        SELECT d.DI_Name, c.*
        FROM (
        SELECT a.*
@@ -70,7 +70,7 @@
<!--    æ¡ä»¶æŸ¥è¯¢å¼‚常表-->
    <select id="conditonQueryAbnormalData" resultType="com.job.zsc.pojo.FumeAbnormalData">
    <select id="conditonQueryAbnormalData" resultType="com.flightfeather.monitor.pojo.FumeAbnormalData">
        select a1.dev_id,b.DI_Name,a1.exception_type,a1.region,a1.begin_time,a1.end_time
        from abnormal_data as a1 join ea_t_device_info as b on  a1.dev_id =  b.DI_Code
        <where>
@@ -88,7 +88,7 @@
    </select>
    <!--    æ¡ä»¶æŸ¥è¯¢å¼‚常表 å¢žåŠ äº†å¼‚å¸¸ç±»åž‹é€‰é¡¹-->
    <select id="conditonQueryAbnormalData1" resultType="com.job.zsc.pojo.FumeAbnormalData">
    <select id="conditonQueryAbnormalData1" resultType="com.flightfeather.monitor.pojo.FumeAbnormalData">
        select a1.dev_id,b.DI_Name,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
        from abnormal_data as a1 join ea_t_device_info as b on a1.dev_id =  b.DI_Code
        <where>
@@ -108,7 +108,7 @@
    </select>
    <!--根据店铺名选择到处为Excel -->
    <select id="exportByShopName" resultType="com.job.zsc.pojo.FumeHistoryData">
    <select id="exportByShopName" resultType="com.flightfeather.monitor.pojo.FumeHistoryData">
        SELECT a.MV_Stat_Code, b.DI_Name, a.MV_Data_Time, a.MV_Fan_Electricity,a.MV_Purifier_Electricity,a.MV_Fume_Concentration2
        FROM fd_t_minutevalue AS a
        JOIN ea_t_device_info AS b ON a.MV_Stat_Code = b.DI_Code
@@ -126,7 +126,7 @@
    </select>
    <!-- å¤šé€‰åº—铺名 è¿”回多选店铺最新一条数据-->
    <select id="findLaststById" resultType="com.job.zsc.pojo.FumeHistoryData">
    <select id="findLaststById" resultType="com.flightfeather.monitor.pojo.FumeHistoryData">
        SELECT a.MV_Stat_Code, b.DI_Name, b.DI_Supplier, a.MV_Data_Time,a.MV_Fan_Electricity,a.MV_Purifier_Electricity,a.MV_Fume_Concentration2
        FROM fd_t_minutevalue as a
        JOIN ea_t_device_info  as b ON a.MV_Stat_Code = b.DI_Code
@@ -146,7 +146,7 @@
    </select>
    <!-- æ¡ä»¶ç»„合查询异常表  å¼‚常类型选项改为多选-->
    <select id="conditonQueryAbnormalData2" resultType="com.job.zsc.pojo.FumeAbnormalData">
    <select id="conditonQueryAbnormalData2" resultType="com.flightfeather.monitor.pojo.FumeAbnormalData">
        select a1.dev_id,b.DI_Name,b.DI_Supplier,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
        from abnormal_data as a1 join ea_t_device_info as b on  a1.dev_id =  b.DI_Code
        <where>
@@ -170,7 +170,7 @@
    <!-- æ¡ä»¶ç»„合查询异常表  å¼‚常类型选项改为多选-->
    <select id="conditonQueryAbnormalData3" resultType="com.job.zsc.pojo.FumeAbnormalData">
    <select id="conditonQueryAbnormalData3" resultType="com.flightfeather.monitor.pojo.FumeAbnormalData">
        select a1.dev_id,b.DI_Name,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
        from abnormal_data as a1 join ea_t_device_info as b on a1.dev_id =  b.DI_Code
        <where>
@@ -191,7 +191,7 @@
        </where>
    </select>
    <select id="findShopNameBYTime" resultType="com.job.zsc.pojo.FumeAbnormalData">
    <select id="findShopNameBYTime" resultType="com.flightfeather.monitor.pojo.FumeAbnormalData">
        SELECT DISTINCT b.DI_Name,a.dev_id
        FROM abnormal_data AS a
        JOIN ea_t_device_info AS b ON a.dev_id = b.DI_Code
src/test/java/com/flightfeather/monitor/QianduanApplicationTests.java
ÎļþÃû´Ó src/test/java/com/job/zsc/QianduanApplicationTests.java ÐÞ¸Ä
@@ -1,15 +1,11 @@
package com.job.zsc;
package com.flightfeather.monitor;
import com.job.zsc.dustexceptionanalysis.analysis.Exceeding;
import com.job.zsc.dustexceptionanalysis.database.DustRepository;
import com.job.zsc.mapper.dustexception.OnlineAnalysisMapper;
import com.job.zsc.pojo.DustExceptionSetting;
import com.job.zsc.pojo.DustSiteData;
import com.flightfeather.monitor.dustexceptionanalysis.database.DustRepository;
import com.flightfeather.monitor.pojo.DustExceptionSetting;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.sql.SQLOutput;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;