From f5d149a03739086d34c4dc2eb924bcf0e4330521 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 19 十月 2023 09:10:14 +0800 Subject: [PATCH] 修改src文件下的文件路径名称 --- src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java | 4 src/main/java/com/flightfeather/monitor/service/LoginService.java | 7 + src/main/java/com/flightfeather/monitor/service/impl/Vue3FumeServiceImpl.java | 13 + src/main/java/com/flightfeather/monitor/controller/dustexception/onlineAnalysisController.java | 4 src/main/java/com/flightfeather/monitor/pojo/AnalysisDustData.java | 2 src/main/java/com/flightfeather/monitor/pojo/LoginUser.java | 2 src/main/java/com/flightfeather/monitor/service/impl/AnalysisDataServiceImpl.java | 8 src/main/java/com/flightfeather/monitor/controller/LoginController.java | 11 - src/main/java/com/flightfeather/monitor/pojo/PageBean.java | 2 src/main/java/com/flightfeather/monitor/pojo/AnalysisData.java | 2 src/main/java/com/flightfeather/monitor/service/SqlService.java | 6 src/main/java/com/flightfeather/monitor/mapper/dustexception/OnlineAnalysisMapper.java | 4 src/main/resources/com/flightfeather/monitor/mapper/FugitiveDustMapper.xml | 22 +- src/test/java/com/flightfeather/monitor/QianduanApplicationTests.java | 10 - src/main/java/com/flightfeather/monitor/mapper/Vue3FumeMapper.java | 8 src/main/java/com/flightfeather/monitor/pojo/DustExceptionSetting.java | 3 src/main/java/com/flightfeather/monitor/service/Vue3FumeService.java | 11 src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java | 6 src/main/java/com/flightfeather/monitor/service/impl/dustexception/onlineAnalysisImpl.java | 10 + src/main/java/com/flightfeather/monitor/scheduledtasks/ScheduledTaskController.java | 2 src/main/java/com/flightfeather/monitor/dustexceptionanalysis/analysis/Exceeding.java | 6 src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java | 4 src/main/java/com/flightfeather/monitor/mapper/LoginMapper.java | 4 src/main/java/com/flightfeather/monitor/pojo/DeviceInfo.java | 2 src/main/resources/com/flightfeather/monitor/mapper/SqlMapper.xml | 6 src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java | 2 src/main/java/com/flightfeather/monitor/pojo/DustExceptionData.java | 2 src/main/java/com/flightfeather/monitor/service/AnalysisDataService.java | 4 src/main/resources/com/flightfeather/monitor/mapper/Vue3FumeMapper.xml | 22 +- src/main/java/com/flightfeather/monitor/pojo/FumeAbnormalData.java | 2 src/main/java/com/flightfeather/monitor/pojo/Result.java | 2 src/main/java/com/flightfeather/monitor/service/dustexception/impl/onlineAnalysisServiceImpl.java | 7 + src/main/java/com/flightfeather/monitor/pojo/FumeHistoryData.java | 2 src/main/java/com/flightfeather/monitor/pojo/DustExceptionType.java | 2 src/main/java/com/flightfeather/monitor/pojo/DustDataAccessSetting.java | 2 src/main/java/com/flightfeather/monitor/pojo/OriginalData.java | 2 src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt | 2 src/main/java/com/flightfeather/monitor/ServletInitializer.java | 2 src/main/java/com/flightfeather/monitor/dustexceptionanalysis/database/DustRepository.java | 6 src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt | 2 src/main/java/com/flightfeather/monitor/service/dustexception/onlineAnalysisService.java | 4 src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java | 8 src/main/java/com/flightfeather/monitor/dustexceptionanalysis/ExceptionAnalysis.java | 7 src/main/java/com/flightfeather/monitor/controller/AnalysisDataController.java | 8 src/main/java/com/flightfeather/monitor/controller/SqlController.java | 10 src/main/java/com/flightfeather/monitor/pojo/AuditInfo.java | 2 src/main/java/com/flightfeather/monitor/service/impl/SqlServiceImpl.java | 66 +++++++++ src/main/java/com/flightfeather/monitor/utils/MD5Util.java | 2 hs_err_pid13764.log | 4 src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java | 9 src/main/resources/com/flightfeather/monitor/mapper/AnalysisDataMapper.xml | 10 src/main/java/com/flightfeather/monitor/service/impl/LoginServiceImpl.java | 8 src/main/java/com/flightfeather/monitor/dustexceptionanalysis/dataprocess/DataProcess.java | 4 /dev/null | 10 - src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java | 10 src/main/java/com/flightfeather/monitor/QianduanApplication.java | 5 src/main/java/com/flightfeather/monitor/mapper/SqlMapper.java | 4 src/main/java/com/flightfeather/monitor/scheduledtasks/BaseTimingTask.kt | 0 src/main/resources/application.yml | 14 +- 59 files changed, 239 insertions(+), 166 deletions(-) diff --git a/hs_err_pid13764.log b/hs_err_pid13764.log index 600bd6f..c9d03aa 100644 --- a/hs_err_pid13764.log +++ b/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) diff --git a/src/main/java/com/job/zsc/QianduanApplication.java b/src/main/java/com/flightfeather/monitor/QianduanApplication.java similarity index 83% rename from src/main/java/com/job/zsc/QianduanApplication.java rename to src/main/java/com/flightfeather/monitor/QianduanApplication.java index 6a42320..2528537 100644 --- a/src/main/java/com/job/zsc/QianduanApplication.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/ServletInitializer.java b/src/main/java/com/flightfeather/monitor/ServletInitializer.java similarity index 91% rename from src/main/java/com/job/zsc/ServletInitializer.java rename to src/main/java/com/flightfeather/monitor/ServletInitializer.java index 0ee891d..8ed4aca 100644 --- a/src/main/java/com/job/zsc/ServletInitializer.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/controller/AnalysisDataController.java b/src/main/java/com/flightfeather/monitor/controller/AnalysisDataController.java similarity index 89% rename from src/main/java/com/job/zsc/controller/AnalysisDataController.java rename to src/main/java/com/flightfeather/monitor/controller/AnalysisDataController.java index 1e0d64f..fdec797 100644 --- a/src/main/java/com/job/zsc/controller/AnalysisDataController.java +++ b/src/main/java/com/flightfeather/monitor/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.*; diff --git a/src/main/java/com/job/zsc/controller/FugitiveDustController.java b/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java similarity index 96% rename from src/main/java/com/job/zsc/controller/FugitiveDustController.java rename to src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java index be2c7e6..c2d7cd6 100644 --- a/src/main/java/com/job/zsc/controller/FugitiveDustController.java +++ b/src/main/java/com/flightfeather/monitor/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); } diff --git a/src/main/java/com/job/zsc/controller/LoginController.java b/src/main/java/com/flightfeather/monitor/controller/LoginController.java similarity index 78% rename from src/main/java/com/job/zsc/controller/LoginController.java rename to src/main/java/com/flightfeather/monitor/controller/LoginController.java index 683354e..8210b10 100644 --- a/src/main/java/com/job/zsc/controller/LoginController.java +++ b/src/main/java/com/flightfeather/monitor/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 diff --git a/src/main/java/com/job/zsc/controller/SqlController.java b/src/main/java/com/flightfeather/monitor/controller/SqlController.java similarity index 89% rename from src/main/java/com/job/zsc/controller/SqlController.java rename to src/main/java/com/flightfeather/monitor/controller/SqlController.java index 83189ba..d177012 100644 --- a/src/main/java/com/job/zsc/controller/SqlController.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/controller/Vue3FumeController.java b/src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java similarity index 95% rename from src/main/java/com/job/zsc/controller/Vue3FumeController.java rename to src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java index cbc8bde..c641125 100644 --- a/src/main/java/com/job/zsc/controller/Vue3FumeController.java +++ b/src/main/java/com/flightfeather/monitor/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 diff --git a/src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java b/src/main/java/com/flightfeather/monitor/controller/dustexception/onlineAnalysisController.java similarity index 76% rename from src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java rename to src/main/java/com/flightfeather/monitor/controller/dustexception/onlineAnalysisController.java index 777a09c..a12bed5 100644 --- a/src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java +++ b/src/main/java/com/flightfeather/monitor/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(){ diff --git a/src/main/java/com/job/zsc/dustexceptionanalysis/ExceptionAnalysis.java b/src/main/java/com/flightfeather/monitor/dustexceptionanalysis/ExceptionAnalysis.java similarity index 83% rename from src/main/java/com/job/zsc/dustexceptionanalysis/ExceptionAnalysis.java rename to src/main/java/com/flightfeather/monitor/dustexceptionanalysis/ExceptionAnalysis.java index c1696bd..bc03e42 100644 --- a/src/main/java/com/job/zsc/dustexceptionanalysis/ExceptionAnalysis.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/dustexceptionanalysis/analysis/Exceeding.java b/src/main/java/com/flightfeather/monitor/dustexceptionanalysis/analysis/Exceeding.java similarity index 83% rename from src/main/java/com/job/zsc/dustexceptionanalysis/analysis/Exceeding.java rename to src/main/java/com/flightfeather/monitor/dustexceptionanalysis/analysis/Exceeding.java index 846d22f..b1e5564 100644 --- a/src/main/java/com/job/zsc/dustexceptionanalysis/analysis/Exceeding.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/dustexceptionanalysis/database/DustRepository.java b/src/main/java/com/flightfeather/monitor/dustexceptionanalysis/database/DustRepository.java similarity index 74% rename from src/main/java/com/job/zsc/dustexceptionanalysis/database/DustRepository.java rename to src/main/java/com/flightfeather/monitor/dustexceptionanalysis/database/DustRepository.java index 0ffd703..37dbec2 100644 --- a/src/main/java/com/job/zsc/dustexceptionanalysis/database/DustRepository.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/dustexceptionanalysis/dataprocess/DataProcess.java b/src/main/java/com/flightfeather/monitor/dustexceptionanalysis/dataprocess/DataProcess.java similarity index 61% rename from src/main/java/com/job/zsc/dustexceptionanalysis/dataprocess/DataProcess.java rename to src/main/java/com/flightfeather/monitor/dustexceptionanalysis/dataprocess/DataProcess.java index a50783c..cfbf602 100644 --- a/src/main/java/com/job/zsc/dustexceptionanalysis/dataprocess/DataProcess.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java b/src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java similarity index 91% rename from src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java rename to src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java index d48ec1e..9c8faa3 100644 --- a/src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java similarity index 94% rename from src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java rename to src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java index c06fd99..f0c95d9 100644 --- a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java +++ b/src/main/java/com/flightfeather/monitor/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); diff --git a/src/main/java/com/job/zsc/mapper/LoginMapper.java b/src/main/java/com/flightfeather/monitor/mapper/LoginMapper.java similarity index 77% rename from src/main/java/com/job/zsc/mapper/LoginMapper.java rename to src/main/java/com/flightfeather/monitor/mapper/LoginMapper.java index ec0d5e2..2b27616 100644 --- a/src/main/java/com/job/zsc/mapper/LoginMapper.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/mapper/SqlMapper.java b/src/main/java/com/flightfeather/monitor/mapper/SqlMapper.java similarity index 89% rename from src/main/java/com/job/zsc/mapper/SqlMapper.java rename to src/main/java/com/flightfeather/monitor/mapper/SqlMapper.java index 3af76b8..cde94a7 100644 --- a/src/main/java/com/job/zsc/mapper/SqlMapper.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java b/src/main/java/com/flightfeather/monitor/mapper/Vue3FumeMapper.java similarity index 93% rename from src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java rename to src/main/java/com/flightfeather/monitor/mapper/Vue3FumeMapper.java index fae3549..d5b4124 100644 --- a/src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/mapper/dustexception/OnlineAnalysisMapper.java b/src/main/java/com/flightfeather/monitor/mapper/dustexception/OnlineAnalysisMapper.java similarity index 77% rename from src/main/java/com/job/zsc/mapper/dustexception/OnlineAnalysisMapper.java rename to src/main/java/com/flightfeather/monitor/mapper/dustexception/OnlineAnalysisMapper.java index 8b2541a..dbf8a2e 100644 --- a/src/main/java/com/job/zsc/mapper/dustexception/OnlineAnalysisMapper.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/AnalysisData.java b/src/main/java/com/flightfeather/monitor/pojo/AnalysisData.java similarity index 96% rename from src/main/java/com/job/zsc/pojo/AnalysisData.java rename to src/main/java/com/flightfeather/monitor/pojo/AnalysisData.java index 5e296c6..04c3fe2 100644 --- a/src/main/java/com/job/zsc/pojo/AnalysisData.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/AnalysisDustData.java b/src/main/java/com/flightfeather/monitor/pojo/AnalysisDustData.java similarity index 93% rename from src/main/java/com/job/zsc/pojo/AnalysisDustData.java rename to src/main/java/com/flightfeather/monitor/pojo/AnalysisDustData.java index 6e6671b..c69dd89 100644 --- a/src/main/java/com/job/zsc/pojo/AnalysisDustData.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/AuditInfo.java b/src/main/java/com/flightfeather/monitor/pojo/AuditInfo.java similarity index 93% rename from src/main/java/com/job/zsc/pojo/AuditInfo.java rename to src/main/java/com/flightfeather/monitor/pojo/AuditInfo.java index 1ed0fc5..0cc2b8b 100644 --- a/src/main/java/com/job/zsc/pojo/AuditInfo.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/DeviceInfo.java b/src/main/java/com/flightfeather/monitor/pojo/DeviceInfo.java similarity index 88% rename from src/main/java/com/job/zsc/pojo/DeviceInfo.java rename to src/main/java/com/flightfeather/monitor/pojo/DeviceInfo.java index e8bb6c2..e19f0ca 100644 --- a/src/main/java/com/job/zsc/pojo/DeviceInfo.java +++ b/src/main/java/com/flightfeather/monitor/pojo/DeviceInfo.java @@ -1,4 +1,4 @@ -package com.job.zsc.pojo; +package com.flightfeather.monitor.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java b/src/main/java/com/flightfeather/monitor/pojo/DustDataAccessSetting.java similarity index 92% rename from src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java rename to src/main/java/com/flightfeather/monitor/pojo/DustDataAccessSetting.java index b09e72a..15e9f40 100644 --- a/src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java +++ b/src/main/java/com/flightfeather/monitor/pojo/DustDataAccessSetting.java @@ -1,4 +1,4 @@ -package com.job.zsc.pojo; +package com.flightfeather.monitor.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/job/zsc/pojo/DustExceptionData.java b/src/main/java/com/flightfeather/monitor/pojo/DustExceptionData.java similarity index 96% rename from src/main/java/com/job/zsc/pojo/DustExceptionData.java rename to src/main/java/com/flightfeather/monitor/pojo/DustExceptionData.java index 403b458..97bd4c9 100644 --- a/src/main/java/com/job/zsc/pojo/DustExceptionData.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/DustExceptionSetting.java b/src/main/java/com/flightfeather/monitor/pojo/DustExceptionSetting.java similarity index 95% rename from src/main/java/com/job/zsc/pojo/DustExceptionSetting.java rename to src/main/java/com/flightfeather/monitor/pojo/DustExceptionSetting.java index c1a8b1c..ba09edd 100644 --- a/src/main/java/com/job/zsc/pojo/DustExceptionSetting.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/DustExceptionType.java b/src/main/java/com/flightfeather/monitor/pojo/DustExceptionType.java similarity index 86% rename from src/main/java/com/job/zsc/pojo/DustExceptionType.java rename to src/main/java/com/flightfeather/monitor/pojo/DustExceptionType.java index 51e8b29..c177add 100644 --- a/src/main/java/com/job/zsc/pojo/DustExceptionType.java +++ b/src/main/java/com/flightfeather/monitor/pojo/DustExceptionType.java @@ -1,4 +1,4 @@ -package com.job.zsc.pojo; +package com.flightfeather.monitor.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/job/zsc/pojo/DustSiteData.java b/src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java similarity index 94% rename from src/main/java/com/job/zsc/pojo/DustSiteData.java rename to src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java index 7b338e0..87a4f6d 100644 --- a/src/main/java/com/job/zsc/pojo/DustSiteData.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/FumeAbnormalData.java b/src/main/java/com/flightfeather/monitor/pojo/FumeAbnormalData.java similarity index 94% rename from src/main/java/com/job/zsc/pojo/FumeAbnormalData.java rename to src/main/java/com/flightfeather/monitor/pojo/FumeAbnormalData.java index 11456f1..fbb5bd5 100644 --- a/src/main/java/com/job/zsc/pojo/FumeAbnormalData.java +++ b/src/main/java/com/flightfeather/monitor/pojo/FumeAbnormalData.java @@ -1,4 +1,4 @@ -package com.job.zsc.pojo; +package com.flightfeather.monitor.pojo; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/job/zsc/pojo/FumeHistoryData.java b/src/main/java/com/flightfeather/monitor/pojo/FumeHistoryData.java similarity index 95% rename from src/main/java/com/job/zsc/pojo/FumeHistoryData.java rename to src/main/java/com/flightfeather/monitor/pojo/FumeHistoryData.java index c22fbe2..08574ca 100644 --- a/src/main/java/com/job/zsc/pojo/FumeHistoryData.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/LoginUser.java b/src/main/java/com/flightfeather/monitor/pojo/LoginUser.java similarity index 95% rename from src/main/java/com/job/zsc/pojo/LoginUser.java rename to src/main/java/com/flightfeather/monitor/pojo/LoginUser.java index 41affa5..b29f0b3 100644 --- a/src/main/java/com/job/zsc/pojo/LoginUser.java +++ b/src/main/java/com/flightfeather/monitor/pojo/LoginUser.java @@ -1,4 +1,4 @@ -package com.job.zsc.pojo; +package com.flightfeather.monitor.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/job/zsc/pojo/OriginalData.java b/src/main/java/com/flightfeather/monitor/pojo/OriginalData.java similarity index 95% rename from src/main/java/com/job/zsc/pojo/OriginalData.java rename to src/main/java/com/flightfeather/monitor/pojo/OriginalData.java index 3c4d021..07ab741 100644 --- a/src/main/java/com/job/zsc/pojo/OriginalData.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/pojo/PageBean.java b/src/main/java/com/flightfeather/monitor/pojo/PageBean.java similarity index 87% rename from src/main/java/com/job/zsc/pojo/PageBean.java rename to src/main/java/com/flightfeather/monitor/pojo/PageBean.java index 1f415b2..f219da2 100644 --- a/src/main/java/com/job/zsc/pojo/PageBean.java +++ b/src/main/java/com/flightfeather/monitor/pojo/PageBean.java @@ -1,4 +1,4 @@ -package com.job.zsc.pojo; +package com.flightfeather.monitor.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/job/zsc/pojo/Result.java b/src/main/java/com/flightfeather/monitor/pojo/Result.java similarity index 94% rename from src/main/java/com/job/zsc/pojo/Result.java rename to src/main/java/com/flightfeather/monitor/pojo/Result.java index 7663c08..6809e86 100644 --- a/src/main/java/com/job/zsc/pojo/Result.java +++ b/src/main/java/com/flightfeather/monitor/pojo/Result.java @@ -1,4 +1,4 @@ -package com.job.zsc.pojo; +package com.flightfeather.monitor.pojo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/job/zsc/scheduledtasks/BaseTimingTask.kt b/src/main/java/com/flightfeather/monitor/scheduledtasks/BaseTimingTask.kt similarity index 100% rename from src/main/java/com/job/zsc/scheduledtasks/BaseTimingTask.kt rename to src/main/java/com/flightfeather/monitor/scheduledtasks/BaseTimingTask.kt diff --git a/src/main/java/com/job/zsc/scheduledtasks/ScheduledTaskController.java b/src/main/java/com/flightfeather/monitor/scheduledtasks/ScheduledTaskController.java similarity index 85% rename from src/main/java/com/job/zsc/scheduledtasks/ScheduledTaskController.java rename to src/main/java/com/flightfeather/monitor/scheduledtasks/ScheduledTaskController.java index 5af0520..0231169 100644 --- a/src/main/java/com/job/zsc/scheduledtasks/ScheduledTaskController.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/scheduledtasks/TaskController.kt b/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt similarity index 98% rename from src/main/java/com/job/zsc/scheduledtasks/TaskController.kt rename to src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt index dfed9a4..5839d7c 100644 --- a/src/main/java/com/job/zsc/scheduledtasks/TaskController.kt +++ b/src/main/java/com/flightfeather/monitor/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 diff --git a/src/main/java/com/job/zsc/service/AnalysisDataService.java b/src/main/java/com/flightfeather/monitor/service/AnalysisDataService.java similarity index 80% rename from src/main/java/com/job/zsc/service/AnalysisDataService.java rename to src/main/java/com/flightfeather/monitor/service/AnalysisDataService.java index 4a89a6e..c6ae0a6 100644 --- a/src/main/java/com/job/zsc/service/AnalysisDataService.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/service/FugitiveDustService.java b/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java similarity index 95% rename from src/main/java/com/job/zsc/service/FugitiveDustService.java rename to src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java index ec717d5..552c299 100644 --- a/src/main/java/com/job/zsc/service/FugitiveDustService.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/flightfeather/monitor/service/LoginService.java b/src/main/java/com/flightfeather/monitor/service/LoginService.java new file mode 100644 index 0000000..bd87872 --- /dev/null +++ b/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); +} diff --git a/src/main/java/com/job/zsc/service/SqlService.java b/src/main/java/com/flightfeather/monitor/service/SqlService.java similarity index 75% rename from src/main/java/com/job/zsc/service/SqlService.java rename to src/main/java/com/flightfeather/monitor/service/SqlService.java index e49972b..21b7d9a 100644 --- a/src/main/java/com/job/zsc/service/SqlService.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/service/Vue3FumeService.java b/src/main/java/com/flightfeather/monitor/service/Vue3FumeService.java similarity index 85% rename from src/main/java/com/job/zsc/service/Vue3FumeService.java rename to src/main/java/com/flightfeather/monitor/service/Vue3FumeService.java index a914637..8b305bb 100644 --- a/src/main/java/com/job/zsc/service/Vue3FumeService.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/flightfeather/monitor/service/dustexception/impl/onlineAnalysisServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/dustexception/impl/onlineAnalysisServiceImpl.java new file mode 100644 index 0000000..e247383 --- /dev/null +++ b/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 { + /*閫昏緫澶勭悊*/ +} diff --git a/src/main/java/com/flightfeather/monitor/service/dustexception/onlineAnalysisService.java b/src/main/java/com/flightfeather/monitor/service/dustexception/onlineAnalysisService.java new file mode 100644 index 0000000..70f3a4d --- /dev/null +++ b/src/main/java/com/flightfeather/monitor/service/dustexception/onlineAnalysisService.java @@ -0,0 +1,4 @@ +package com.flightfeather.monitor.service.dustexception; + +public interface onlineAnalysisService { +} diff --git a/src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/AnalysisDataServiceImpl.java similarity index 85% rename from src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java rename to src/main/java/com/flightfeather/monitor/service/impl/AnalysisDataServiceImpl.java index 4f13418..c964dbf 100644 --- a/src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java similarity index 96% rename from src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java rename to src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java index c3ca5c8..f1a6131 100644 --- a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java +++ b/src/main/java/com/flightfeather/monitor/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; } diff --git a/src/main/java/com/job/zsc/service/impl/LoginServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/LoginServiceImpl.java similarity index 65% rename from src/main/java/com/job/zsc/service/impl/LoginServiceImpl.java rename to src/main/java/com/flightfeather/monitor/service/impl/LoginServiceImpl.java index b4f4f71..eb41a9f 100644 --- a/src/main/java/com/job/zsc/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/flightfeather/monitor/service/impl/SqlServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/SqlServiceImpl.java new file mode 100644 index 0000000..7539e20 --- /dev/null +++ b/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; + } + + +} diff --git a/src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/Vue3FumeServiceImpl.java similarity index 92% rename from src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java rename to src/main/java/com/flightfeather/monitor/service/impl/Vue3FumeServiceImpl.java index 14229ed..73b74d5 100644 --- a/src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java +++ b/src/main/java/com/flightfeather/monitor/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 diff --git a/src/main/java/com/flightfeather/monitor/service/impl/dustexception/onlineAnalysisImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/dustexception/onlineAnalysisImpl.java new file mode 100644 index 0000000..06e5ec4 --- /dev/null +++ b/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 { + + +} diff --git a/src/main/java/com/job/zsc/utils/MD5Util.java b/src/main/java/com/flightfeather/monitor/utils/MD5Util.java similarity index 97% rename from src/main/java/com/job/zsc/utils/MD5Util.java rename to src/main/java/com/flightfeather/monitor/utils/MD5Util.java index 01f4d6d..ea9fcd7 100644 --- a/src/main/java/com/job/zsc/utils/MD5Util.java +++ b/src/main/java/com/flightfeather/monitor/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; diff --git a/src/main/java/com/job/zsc/utils/UUIDGenerator.kt b/src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt similarity index 99% rename from src/main/java/com/job/zsc/utils/UUIDGenerator.kt rename to src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt index 64b5fdb..dfa23f6 100644 --- a/src/main/java/com/job/zsc/utils/UUIDGenerator.kt +++ b/src/main/java/com/flightfeather/monitor/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 diff --git a/src/main/java/com/job/zsc/service/LoginService.java b/src/main/java/com/job/zsc/service/LoginService.java deleted file mode 100644 index 4dcdb90..0000000 --- a/src/main/java/com/job/zsc/service/LoginService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.job.zsc.service; - -import com.job.zsc.pojo.LoginUser; - -public interface LoginService { - LoginUser login(LoginUser loginUser); -} diff --git a/src/main/java/com/job/zsc/service/dustexception/impl/onlineAnalysisServiceImpl.java b/src/main/java/com/job/zsc/service/dustexception/impl/onlineAnalysisServiceImpl.java deleted file mode 100644 index b85dabd..0000000 --- a/src/main/java/com/job/zsc/service/dustexception/impl/onlineAnalysisServiceImpl.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.job.zsc.service.dustexception.impl; - -import com.job.zsc.service.dustexception.onlineAnalysisService; - -public class onlineAnalysisServiceImpl implements onlineAnalysisService { - /*閫昏緫澶勭悊*/ -} diff --git a/src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java b/src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java deleted file mode 100644 index a80acae..0000000 --- a/src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.job.zsc.service.dustexception; - -public interface onlineAnalysisService { -} diff --git a/src/main/java/com/job/zsc/service/impl/SqlServiceImpl.java b/src/main/java/com/job/zsc/service/impl/SqlServiceImpl.java deleted file mode 100644 index c8a7137..0000000 --- a/src/main/java/com/job/zsc/service/impl/SqlServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.job.zsc.service.impl; - -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.job.zsc.mapper.SqlMapper; -import com.job.zsc.pojo.PageBean; -import com.job.zsc.pojo.OriginalData; -import com.job.zsc.service.SqlService; -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; - } - - -} diff --git a/src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java b/src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java deleted file mode 100644 index e575f3f..0000000 --- a/src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.job.zsc.service.impl.dustexception; - -import com.job.zsc.service.dustexception.onlineAnalysisService; -import org.springframework.stereotype.Service; - -@Service -public class onlineAnalysisImpl implements onlineAnalysisService { - - -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b9c85fe..4146901 100644 --- a/src/main/resources/application.yml +++ b/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: diff --git a/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml b/src/main/resources/com/flightfeather/monitor/mapper/AnalysisDataMapper.xml similarity index 95% rename from src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml rename to src/main/resources/com/flightfeather/monitor/mapper/AnalysisDataMapper.xml index 6a602ed..02b073b 100644 --- a/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml +++ b/src/main/resources/com/flightfeather/monitor/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> diff --git a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml b/src/main/resources/com/flightfeather/monitor/mapper/FugitiveDustMapper.xml similarity index 87% rename from src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml rename to src/main/resources/com/flightfeather/monitor/mapper/FugitiveDustMapper.xml index 34bb6f7..de696eb 100644 --- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml +++ b/src/main/resources/com/flightfeather/monitor/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"> diff --git a/src/main/resources/com/job/zsc/mapper/SqlMapper.xml b/src/main/resources/com/flightfeather/monitor/mapper/SqlMapper.xml similarity index 82% rename from src/main/resources/com/job/zsc/mapper/SqlMapper.xml rename to src/main/resources/com/flightfeather/monitor/mapper/SqlMapper.xml index 925d2cd..679eb16 100644 --- a/src/main/resources/com/job/zsc/mapper/SqlMapper.xml +++ b/src/main/resources/com/flightfeather/monitor/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 != '' "> diff --git a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml b/src/main/resources/com/flightfeather/monitor/mapper/Vue3FumeMapper.xml similarity index 88% rename from src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml rename to src/main/resources/com/flightfeather/monitor/mapper/Vue3FumeMapper.xml index 73b4a99..51b8fee 100644 --- a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml +++ b/src/main/resources/com/flightfeather/monitor/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> <!--鏍规嵁搴楅摵鍚嶉�夋嫨鍒板涓篍xcel --> - <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 diff --git a/src/test/java/com/job/zsc/QianduanApplicationTests.java b/src/test/java/com/flightfeather/monitor/QianduanApplicationTests.java similarity index 84% rename from src/test/java/com/job/zsc/QianduanApplicationTests.java rename to src/test/java/com/flightfeather/monitor/QianduanApplicationTests.java index ea4cea2..a5f6be2 100644 --- a/src/test/java/com/job/zsc/QianduanApplicationTests.java +++ b/src/test/java/com/flightfeather/monitor/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.*; -- Gitblit v1.9.3