From c13d62bed986535319da834d64ce15e4ca13c396 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 四月 2023 16:37:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/entity/FeedbackDetail.java | 18 ++++
src/main/java/com/yssh/entity/vo/ForecastAnalyseVo.java | 10 ++
src/main/java/com/yssh/service/impl/ExpPointServerImpl.java | 5
src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java | 14 ++-
src/main/java/com/yssh/scheduled/ReadCsvTask.java | 2
src/main/resources/logback.xml | 159 ++++++++++++++++++++-------------------
src/main/java/com/yssh/config/DatFilePathConfig.java | 17 ++++
7 files changed, 133 insertions(+), 92 deletions(-)
diff --git a/src/main/java/com/yssh/config/DatFilePathConfig.java b/src/main/java/com/yssh/config/DatFilePathConfig.java
index 5d3c2b8..a422f6d 100644
--- a/src/main/java/com/yssh/config/DatFilePathConfig.java
+++ b/src/main/java/com/yssh/config/DatFilePathConfig.java
@@ -12,5 +12,20 @@
private String filePath2d;
private String filePath3d;
-
+
+ public String getFilePath2d() {
+ return filePath2d;
+ }
+
+ public void setFilePath2d(String filePath2d) {
+ this.filePath2d = filePath2d;
+ }
+
+ public String getFilePath3d() {
+ return filePath3d;
+ }
+
+ public void setFilePath3d(String filePath3d) {
+ this.filePath3d = filePath3d;
+ }
}
diff --git a/src/main/java/com/yssh/entity/FeedbackDetail.java b/src/main/java/com/yssh/entity/FeedbackDetail.java
index 910fdc4..a12a8bb 100644
--- a/src/main/java/com/yssh/entity/FeedbackDetail.java
+++ b/src/main/java/com/yssh/entity/FeedbackDetail.java
@@ -11,12 +11,26 @@
import lombok.NoArgsConstructor;
import lombok.ToString;
-@NoArgsConstructor
-@AllArgsConstructor
@ToString
@Data
@ApiModel(value = "婧簮鍙嶉",description = "婧簮鍙嶉")
public class FeedbackDetail implements Serializable{
+ public FeedbackDetail() {
+ }
+
+ public FeedbackDetail(Long id, String tableName, String locationName, String detectionId, String detectionVocsName, Double detectionValue, String practicalId, String practicalVocsName, Double practicalValue, Date createTime) {
+ this.id = id;
+ this.tableName = tableName;
+ this.locationName = locationName;
+ this.detectionId = detectionId;
+ this.detectionVocsName = detectionVocsName;
+ this.detectionValue = detectionValue;
+ this.practicalId = practicalId;
+ this.practicalVocsName = practicalVocsName;
+ this.practicalValue = practicalValue;
+ this.createTime = createTime;
+ }
+
private static final long serialVersionUID = 6877008992053903605L;
@ApiModelProperty(value = "涓婚敭")
diff --git a/src/main/java/com/yssh/entity/vo/ForecastAnalyseVo.java b/src/main/java/com/yssh/entity/vo/ForecastAnalyseVo.java
index 49d3d24..7f44557 100644
--- a/src/main/java/com/yssh/entity/vo/ForecastAnalyseVo.java
+++ b/src/main/java/com/yssh/entity/vo/ForecastAnalyseVo.java
@@ -7,12 +7,18 @@
import lombok.NoArgsConstructor;
import lombok.ToString;
-@NoArgsConstructor
-@AllArgsConstructor
@ToString
@ApiModel(value="棰勬祴鍒嗘瀽灞曠ず瀵硅薄", description="棰勬祴鍒嗘瀽灞曠ず瀵硅薄")
@Data
public class ForecastAnalyseVo {
+ public ForecastAnalyseVo() {
+ }
+
+ public ForecastAnalyseVo(Double forecastValue, Double practicalValue, Long time) {
+ this.forecastValue = forecastValue;
+ this.practicalValue = practicalValue;
+ this.time = time;
+ }
@ApiModelProperty(value = "棰勬祴鍊�")
private Double forecastValue;
diff --git a/src/main/java/com/yssh/scheduled/ReadCsvTask.java b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
index 4336ea1..f0f111c 100644
--- a/src/main/java/com/yssh/scheduled/ReadCsvTask.java
+++ b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
@@ -94,7 +94,7 @@
try {
// 璁＄畻棰勮/鎶ヨ,骞朵笖杩涜鍏ュ簱鎿嶄綔
- Thread.sleep(5000);
+ Thread.sleep(60000);
} catch (InterruptedException e) {
logger.error("鐫＄湢涓�鍒嗛挓鍚庢墽琛岄璀�/鎶ヨ璁＄畻,骞朵笖杩涜鍏ュ簱鎿嶄綔鍑虹幇寮傚父锛屽紓甯稿師鍥犳槸锛�", e);
e.printStackTrace();
diff --git a/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java b/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java
index fa3199e..e844a91 100644
--- a/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java
+++ b/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java
@@ -93,11 +93,12 @@
int numPoints = geo.getNumPoints();
- List<Coordinate> cs = new ArrayList<>(Arrays.asList(geo.getCoordinates()));
+ /*List<Coordinate> cs = new ArrayList<>(Arrays.asList(geo.getCoordinates()));
cs.forEach(c -> {
System.out.println(c.getY() + " " + c.getX() + " " + c.getZ());
- });
+ });*/
System.out.println(numPoints);
+
/*String text = union.toText();
System.out.println(text);*/
diff --git a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
index e3c8904..22f21ec 100644
--- a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
@@ -36,27 +36,29 @@
import com.yssh.utils.StringUtils;
import com.yssh.utils.TableStrategy;
+import javax.annotation.Resource;
+
@Service
public class SuYuanServiceImpl implements ISuYuanService {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
- @Autowired
+ @Resource
private SuYuanMapper suYuanMapper;
- @Autowired
+ @Resource
private IAsyncService asyncService;
- @Autowired
+ @Resource
private DictRecordMapper dictRecordMapper;
- @Autowired
+ @Resource
private ICommonService commonService;
- @Autowired
+ @Resource
private FeedbackMapper feedbackMapper;
- private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH");
+ private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH");
//@Transactional
@Override
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 4f4890a..0b7d4b3 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,53 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="D:/yssh_data/logs" />
- <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+<!-- scan 閰嶇疆鏂囦欢濡傛灉鍙戠敓鏀瑰彉锛屽皢浼氳閲嶆柊鍔犺浇 scanPeriod 妫�娴嬮棿闅旀椂闂�-->
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+ <contextName>LFServer</contextName>
- <!-- 鎺у埗鍙拌緭鍑� -->
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-debug.log</file>
+ <!-- 鏂囦欢鍚嶇О -->
+ <property name="log.name.info" value="info" />
+ <property name="log.name.error" value="error" />
+
+ <!-- info 鍦板潃 -->
+ <property name="log.path.info" value="logs/" />
+ <property name="log.file.info" value="logs/info.log" />
+
+ <!-- error,閿欒璺緞 -->
+ <property name="log.path.error" value="logs/" />
+ <property name="log.file.error" value="logs/error.log" />
+ <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+ <!-- 鏅�氭棩蹇� -->
+ <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.file.info}</file>
<!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-debug.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>DEBUG</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- 绯荤粺鏃ュ織杈撳嚭 -->
- <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-info.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏃ュ織鍛藉悕:鍗曚釜鏂囦欢澶т簬256MB 鎸夌収鏃堕棿+鑷i 鐢熸垚log鏂囦欢 -->
+ <fileNamePattern>${log.path.info}${log.name.info}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>256MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <!-- 鏈�澶т繚瀛樻椂闂达細30澶�-->
+ <maxHistory>30</maxHistory>
+ </rollingPolicy>
+ <append>true</append>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <!-- 鏃ュ織绾у埆杩囨护鍣� -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 杩囨护鐨勭骇鍒� -->
<level>INFO</level>
<!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
@@ -55,47 +43,62 @@
<!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
<onMismatch>DENY</onMismatch>
</filter>
- </appender>
-
- <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-error.log</file>
+ </appender>
+
+ <!-- 閿欒鏃ュ織 -->
+ <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.file.error}</file>
<!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
+ <!-- 鏃ュ織鍛藉悕:鍗曚釜鏂囦欢澶т簬128MB 鎸夌収鏃堕棿+鑷i 鐢熸垚log鏂囦欢 -->
+ <fileNamePattern>${log.path.error}${log.name.error}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>128MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <!-- 鏈�澶т繚瀛樻椂闂达細180澶�-->
+ <maxHistory>180</maxHistory>
</rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
+ <append>true</append>
+ <!-- 鏃ュ織鏍煎紡 -->
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
</encoder>
+ <!-- 鏃ュ織绾у埆杩囨护鍣� -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 杩囨护鐨勭骇鍒� -->
<level>ERROR</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
+ <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
<onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
+ <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${CONSOLE_LOG_PATTERN}</pattern>
- </encoder>
- </appender>
-
- <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
- <logger name="com.yssh.project" level="info" />
- <!-- Spring鏃ュ織绾у埆鎺у埗 -->
- <logger name="org.springframework" level="error" />
-
- <!--绯荤粺鎿嶄綔鏃ュ織-->
- <root level="info">
- <appender-ref ref="file_info" />
- <appender-ref ref="file_error" />
- <appender-ref ref="console" />
+ <!-- 鎺у埗鍙� -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- 鏃ュ織鏍煎紡 -->
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <!--姝ゆ棩蹇梐ppender鏄负寮�鍙戜娇鐢紝鍙厤缃渶搴曠骇鍒紝鎺у埗鍙拌緭鍑虹殑鏃ュ織绾у埆鏄ぇ浜庢垨绛変簬姝ょ骇鍒殑鏃ュ織淇℃伅-->
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <!-- 鍙湁杩欎釜鏃ュ織鏉冮檺鎵嶈兘鐪嬶紝sql璇彞 -->
+ <level>DEBUG</level>
+ </filter>
+ </appender>
+
+ <!-- 杈撳嚭sql鏃ュ織:ERROR,INFO,DEBUG -->
+ <logger name="com.apache.ibatis" level="INFO"/>
+
+ <!-- additivity:鏄惁鍦ㄧ埗(杩欓噷涓簉oot鑺傜偣)杈撳嚭, 榛樿 true; -->
+ <logger name="com.yssh" level="INFO" additivity="true">
+ <appender-ref ref="INFO_FILE"/>
+ <appender-ref ref="ERROR_FILE"/>
+ </logger>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
</root>
-
-</configuration>
\ No newline at end of file
+</configuration>
--
Gitblit v1.9.3