From 2f55cebbad3dea187a5f91d16ec80a9677dab699 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 十一月 2024 11:16:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/utils/SpringUtils.java | 6
src/main/java/com/yssh/utils/CacheUtils.java | 2
src/main/java/com/yssh/service/LocationService.java | 5
src/main/java/com/yssh/mapper/EmissionMapper.java | 7
src/main/java/com/yssh/mapper/CommonMapper.java | 7
src/main/java/com/yssh/service/CommonService.java | 3
src/main/java/com/yssh/entity/Report.java | 5
src/main/java/com/yssh/entity/Coordinate.java | 5
src/main/java/com/yssh/entity/SuYuan700.java | 5
src/main/java/com/yssh/config/ScheduleConfig.java | 17 -
src/main/java/com/yssh/utils/FileUtils.java | 19 -
src/main/java/com/yssh/mapper/QxshMapper.java | 5
src/main/java/com/yssh/utils/AjaxResult.java | 6
src/main/java/com/yssh/utils/StringUtils.java | 7
src/main/java/com/yssh/service/XlsReportService.java | 38 ---
src/main/java/com/yssh/controller/SuYuanController.java | 7
ys.sql | 6
src/main/java/com/yssh/entity/Qxsh.java | 5
src/main/java/com/yssh/mapper/XlsReportMapper.java | 5
src/main/java/com/yssh/service/SocketService.java | 27 --
src/main/java/com/yssh/entity/SuYuanFast.java | 5
src/main/java/com/yssh/mapper/VocValsMapper.java | 5
src/main/java/com/yssh/Application.java | 2
src/main/java/com/yssh/config/ThreadPoolConfig.java | 14 -
src/main/java/com/yssh/utils/DateUtils.java | 15 -
src/main/java/com/yssh/utils/HttpStatus.java | 7
src/main/java/com/yssh/utils/GisUtil.java | 12 -
src/main/java/com/yssh/config/WebSocketConfig.java | 7
src/main/java/com/yssh/entity/xls/WeekExcel.java | 20 -
src/main/java/com/yssh/entity/xls/XlsReport.java | 5
src/main/java/com/yssh/service/WeatherService.java | 7
src/main/java/com/yssh/service/DictRecordService.java | 5
src/main/java/com/yssh/entity/DictRecord.java | 7
src/main/java/com/yssh/entity/Weather.java | 7
src/main/java/com/yssh/mapper/DictRecordMapper.java | 7
src/main/java/com/yssh/utils/ServletInitializer.java | 8
src/main/java/com/yssh/controller/WarningAnalyseController.java | 1
src/main/java/com/yssh/utils/Result.java | 7
src/main/java/com/yssh/controller/LocationController.java | 7
src/main/java/com/yssh/entity/xls/DayExcel.java | 5
src/main/java/com/yssh/config/Knife4jConfig.java | 11
src/main/java/com/yssh/mapper/ThuAccuracyMapper.java | 1
src/main/java/com/yssh/service/EmailService.java | 21 -
src/main/java/com/yssh/entity/xls/ExcelHead.java | 9
src/main/java/com/yssh/utils/CalculateUtils.java | 108 --------
src/main/java/com/yssh/utils/WebUtils.java | 37 ---
src/main/java/com/yssh/utils/VocParser.java | 8
src/main/java/com/yssh/controller/EmissionController.java | 7
src/main/java/com/yssh/controller/WeatherController.java | 9
src/main/java/com/yssh/utils/ExcelUtils.java | 31 --
src/main/java/com/yssh/entity/Location.java | 6
src/main/java/com/yssh/mapper/LocationMapper.java | 5
src/main/java/com/yssh/service/EmissionService.java | 7
src/main/java/com/yssh/service/VocValsService.java | 2
src/main/java/com/yssh/config/CorsConfig.java | 10
src/main/java/com/yssh/utils/CommonConstant.java | 25 -
src/main/java/com/yssh/mapper/WeatherMapper.java | 7
src/main/java/com/yssh/service/SuYuanService.java | 4
src/main/java/com/yssh/entity/xls/MonthExcel.java | 20 -
59 files changed, 28 insertions(+), 640 deletions(-)
diff --git a/src/main/java/com/yssh/Application.java b/src/main/java/com/yssh/Application.java
index ac78571..4eaefa8 100644
--- a/src/main/java/com/yssh/Application.java
+++ b/src/main/java/com/yssh/Application.java
@@ -7,8 +7,6 @@
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
- * 搴旂敤绋嬪簭
- * @author WWW
* 鎺掗櫎Security锛�, exclude = {SecurityAutoConfiguration.class, SecurityFilterAutoConfiguration.class}
*
* jar -> war锛氱户鎵� SpringBootServletInitializer锛屽疄鐜� configure 鍑芥暟
diff --git a/src/main/java/com/yssh/config/CorsConfig.java b/src/main/java/com/yssh/config/CorsConfig.java
index 1145810..cc27443 100644
--- a/src/main/java/com/yssh/config/CorsConfig.java
+++ b/src/main/java/com/yssh/config/CorsConfig.java
@@ -11,20 +11,11 @@
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-/**
- * @author wMeng
- * @ClassName CorsConfig
- * @Description 璺ㄥ煙閰嶇疆
- * @date 2022/10/31 16:42
- * @Version 1.0
- */
@Configuration
public class CorsConfig extends WebMvcConfigurationSupport {
@Override
public void addViewControllers(ViewControllerRegistry registry) {
- // 璁剧疆璁块棶璺緞涓� 鈥�/鈥� 璺宠浆鍒版寚瀹氶〉闈�
registry.addViewController("/").setViewName("redirect:/doc.html");
- // 璁剧疆涓烘渶楂樹紭鍏堢骇
registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
}
@@ -40,7 +31,6 @@
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
- //璁剧疆闈欐�佽祫婧愭槧灏�
registry.addResourceHandler("/backend/**").addResourceLocations("classpath:/backend/");
registry.addResourceHandler("/front/**").addResourceLocations("classpath:/front/");
diff --git a/src/main/java/com/yssh/config/Knife4jConfig.java b/src/main/java/com/yssh/config/Knife4jConfig.java
index 86ae6a4..5977601 100644
--- a/src/main/java/com/yssh/config/Knife4jConfig.java
+++ b/src/main/java/com/yssh/config/Knife4jConfig.java
@@ -16,13 +16,6 @@
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-/**
- * @author wMeng
- * @ClassName SwaggerConfig
- * @Description TODO
- * @date 2022/10/31 18:55
- * @Version 1.0
- */
@Configuration
@EnableKnife4j
public class Knife4jConfig {
@@ -30,9 +23,6 @@
@Value("${knife4j.enabled}")
private boolean enabled;
- /**
- * 璁剧疆璇锋眰鐨勭粺涓�鍓嶇紑
- */
@Value("${knife4j.pathMapping}")
private String pathMapping;
@@ -61,7 +51,6 @@
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
- //鎻忚堪瀛楁鏀寔Markdown璇硶
.description("鎴戠殑鎺ュ彛娴嬭瘯鏂囨。")
.contact(new Contact("寮犺吘椋�", "http://127.0.0.1:9001/doc.html", "893732661@qq.com"))
.version("2.0.0")
diff --git a/src/main/java/com/yssh/config/ScheduleConfig.java b/src/main/java/com/yssh/config/ScheduleConfig.java
index a042af4..3d0f8cc 100644
--- a/src/main/java/com/yssh/config/ScheduleConfig.java
+++ b/src/main/java/com/yssh/config/ScheduleConfig.java
@@ -149,12 +149,12 @@
//String md5 = FileUtils.getFileMd5(filePath);
//if (null != md5 && md5List.contains(md5)) {
- // continue; // csv宸插叆搴�
+ // continue;
//}
int count = vocValsService.countByTime(time);
if (count > 0) {
- //vocValsService.deleteByTime(time); // 鍒犻櫎宸插叆搴�
+ //vocValsService.deleteByTime(time);
continue;
}
@@ -186,12 +186,12 @@
logger.info(file.getAbsolutePath() + " is not exist 锛�");
return;
}
- //鍒涘缓琛�
+
String newTableName = TableStrategy.getTableStrategy(time);
suYuanService.createNewTable(newTableName);
dictRecordService.insertDictRecord(new DictRecord(1L, newTableName, Long.parseLong(time), ""));
EasyCsv.read(filePath, SuYuan.class, new CsvParser(suYuanService, time)).doRead();
- //璁＄畻棰勮/鎶ヨ,骞朵笖杩涜鍏ュ簱鎿嶄綔
+
try {
Thread.sleep(60 * 1000);
} catch (InterruptedException e) {
@@ -201,9 +201,6 @@
warningAnalyseService.warningOperationStorage(date);
}
- /**
- * 鍒涘缓鏃ユ姤锛氭瘡鏃�0鏃�1鍒�
- */
@Scheduled(cron = "0 1 0 * * ?")
public void createDayReport() {
Calendar calendar = getCalendar(1);
@@ -218,9 +215,6 @@
}
}
- /**
- * 鍒涘缓鍛ㄦ姤锛氭瘡鍛ㄤ竴0鏃�5鍒�
- */
@Scheduled(cron = "0 5 0 ? * MON")
public void createWeekReport() {
Calendar calendar = getCalendar(7 * 24);
@@ -235,9 +229,6 @@
}
}
- /**
- * 鍒涘缓鏈堟姤锛氭瘡鏈�1鏃�0鏃�9鍒�
- */
@Scheduled(cron = "0 9 0 1 * ?")
public void createMonthReport() {
Calendar calendar = Calendar.getInstance();
diff --git a/src/main/java/com/yssh/config/ThreadPoolConfig.java b/src/main/java/com/yssh/config/ThreadPoolConfig.java
index 1a03fbf..ab44434 100644
--- a/src/main/java/com/yssh/config/ThreadPoolConfig.java
+++ b/src/main/java/com/yssh/config/ThreadPoolConfig.java
@@ -7,27 +7,17 @@
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-/**
- * 绾跨▼姹犻厤缃�
- *
- * @author tam
- **/
@Configuration
@EnableAsync
public class ThreadPoolConfig {
- // 鏍稿績绾跨▼姹犲ぇ灏�
private int corePoolSize = 50;
- // 鏈�澶у彲鍒涘缓鐨勭嚎绋嬫暟
private int maxPoolSize = 200;
- // 闃熷垪鏈�澶ч暱搴�
private int queueCapacity = 1000;
- // 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
private int keepAliveSeconds = 300;
-
- //閰嶇疆绾跨▼姹犱腑鐨勭嚎绋嬬殑鍚嶇О鍓嶇紑
+
private String threadNamePrefix = "async-importDB-";
@Bean(name = "threadPoolTaskExecutor")
@@ -38,9 +28,7 @@
executor.setQueueCapacity(queueCapacity);
executor.setKeepAliveSeconds(keepAliveSeconds);
executor.setThreadNamePrefix(threadNamePrefix);
- // 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
return executor;
}
-
}
diff --git a/src/main/java/com/yssh/config/WebSocketConfig.java b/src/main/java/com/yssh/config/WebSocketConfig.java
index dc02d2e..cc1a1f1 100644
--- a/src/main/java/com/yssh/config/WebSocketConfig.java
+++ b/src/main/java/com/yssh/config/WebSocketConfig.java
@@ -4,15 +4,8 @@
import org.springframework.stereotype.Component;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-/**
- * WebSocket閰嶇疆绫�
- * @author WWW
- */
@Component
public class WebSocketConfig {
- /**
- * 鑷姩娉ㄥ唽浣跨敤@ServerEndpoint
- */
@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
diff --git a/src/main/java/com/yssh/controller/EmissionController.java b/src/main/java/com/yssh/controller/EmissionController.java
index ce8242a..9514c7a 100644
--- a/src/main/java/com/yssh/controller/EmissionController.java
+++ b/src/main/java/com/yssh/controller/EmissionController.java
@@ -20,13 +20,6 @@
import javax.annotation.Resource;
-/**
- * @author lishijia
- * @ClassName YsshPfshController
- * @Description TODO
- * @date 2022/11/24 14:44
- * @Version 1.0
- */
@Api(tags="鎺掓斁鐐�")
@RestController
@RequestMapping("/emission")
diff --git a/src/main/java/com/yssh/controller/LocationController.java b/src/main/java/com/yssh/controller/LocationController.java
index ba91b0f..3d839ae 100644
--- a/src/main/java/com/yssh/controller/LocationController.java
+++ b/src/main/java/com/yssh/controller/LocationController.java
@@ -21,13 +21,6 @@
import javax.annotation.Resource;
-/**
- * @author wMeng
- * @ClassName YsshLocationController
- * @Description YsshLocationController
- * @date 2022/10/30 13:21
- * @Version 1.0
- */
@Api(tags="鍘傚尯鐑偣鐐逛綅")
@RestController
@RequestMapping("/location")
diff --git a/src/main/java/com/yssh/controller/SuYuanController.java b/src/main/java/com/yssh/controller/SuYuanController.java
index 0c9ebc6..7cb6246 100644
--- a/src/main/java/com/yssh/controller/SuYuanController.java
+++ b/src/main/java/com/yssh/controller/SuYuanController.java
@@ -27,13 +27,6 @@
import javax.annotation.Resource;
-/**
- * @author lishijia
- * @ClassName Yssh2dreliController
- * @Description Yssh2dreliController
- * @date 2022/12/3 21:21
- * @Version 1.0
- */
@Api(tags="婧簮淇℃伅")
@RestController
@RequestMapping("/suYuan")
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index 7b37a4b..cd189ee 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -1,6 +1,5 @@
package com.yssh.controller;
-import com.yssh.entity.Qxsh;
import com.yssh.entity.Report;
import com.yssh.utils.CacheUtils;
import com.yssh.utils.DateUtils;
diff --git a/src/main/java/com/yssh/controller/WeatherController.java b/src/main/java/com/yssh/controller/WeatherController.java
index 27a0a82..a6527e6 100644
--- a/src/main/java/com/yssh/controller/WeatherController.java
+++ b/src/main/java/com/yssh/controller/WeatherController.java
@@ -1,6 +1,5 @@
package com.yssh.controller;
-import com.yssh.entity.Location;
import com.yssh.entity.Weather;
import com.yssh.service.WeatherService;
import com.yssh.utils.CacheUtils;
@@ -15,18 +14,10 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
-/**
- * @author wMeng
- * @ClassName YsshWeatherController
- * @Description TODO
- * @date 2022/10/30 13:21
- * @Version 1.0
- */
@Api(tags="澶╂皵")
@RestController
@RequestMapping("/weather")
diff --git a/src/main/java/com/yssh/entity/Coordinate.java b/src/main/java/com/yssh/entity/Coordinate.java
index 988cf4d..e0ab3b6 100644
--- a/src/main/java/com/yssh/entity/Coordinate.java
+++ b/src/main/java/com/yssh/entity/Coordinate.java
@@ -1,10 +1,5 @@
package com.yssh.entity;
-/**
- * 鍧愭爣
- * @author WWW
- * @date 2023-06-18
- */
public class Coordinate {
private double x;
diff --git a/src/main/java/com/yssh/entity/DictRecord.java b/src/main/java/com/yssh/entity/DictRecord.java
index 9183124..0a4a471 100644
--- a/src/main/java/com/yssh/entity/DictRecord.java
+++ b/src/main/java/com/yssh/entity/DictRecord.java
@@ -8,13 +8,6 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-/**
- * 瀛楀吀璁板綍瀵硅薄 yssh_dict_record
- *
- * @author xingjinshuang@smartearth.cn
- * @date 2023-02-06
- */
-
@ToString
@Data
public class DictRecord implements Serializable {
diff --git a/src/main/java/com/yssh/entity/Location.java b/src/main/java/com/yssh/entity/Location.java
index ab5a31d..224f782 100644
--- a/src/main/java/com/yssh/entity/Location.java
+++ b/src/main/java/com/yssh/entity/Location.java
@@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * 鍘傚尯鐑偣鐐逛綅
- * @author wMeng
- * @date 2022/10/30 13:16
- * @version 1.0
- */
@Data
@ApiModel(value = "鍘傚尯鐑偣鐐逛綅",description = "鍘傚尯鐑偣鐐逛綅")
public class Location implements Serializable {
diff --git a/src/main/java/com/yssh/entity/Qxsh.java b/src/main/java/com/yssh/entity/Qxsh.java
index e4450b3..83245ba 100644
--- a/src/main/java/com/yssh/entity/Qxsh.java
+++ b/src/main/java/com/yssh/entity/Qxsh.java
@@ -4,11 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * @author WWW
- * @date 2023-05-18
- * qxsh
- */
@Data
@ApiModel(value = "Qxsh",description = "Qxsh")
public class Qxsh {
diff --git a/src/main/java/com/yssh/entity/Report.java b/src/main/java/com/yssh/entity/Report.java
index bff838d..a6850fa 100644
--- a/src/main/java/com/yssh/entity/Report.java
+++ b/src/main/java/com/yssh/entity/Report.java
@@ -3,11 +3,6 @@
import com.yssh.utils.CalculateUtils;
import io.swagger.annotations.ApiModelProperty;
-/**
- * 鎶ュ憡
- * @author WWW
- * @date 2023-06-18
- */
public class Report {
@ApiModelProperty(value = "婧簮ID")
private String id;
diff --git a/src/main/java/com/yssh/entity/SuYuan700.java b/src/main/java/com/yssh/entity/SuYuan700.java
index 4f1aa92..247881b 100644
--- a/src/main/java/com/yssh/entity/SuYuan700.java
+++ b/src/main/java/com/yssh/entity/SuYuan700.java
@@ -7,11 +7,6 @@
import java.io.Serializable;
import java.util.Date;
-/**
- * 婧簮700琛�
- * @author www
- * @date 2023-06-23
- */
@Data
public class SuYuan700 implements Serializable {
private static final long serialVersionUID = 2023062302487367361L;
diff --git a/src/main/java/com/yssh/entity/SuYuanFast.java b/src/main/java/com/yssh/entity/SuYuanFast.java
index 95a04f9..892c33f 100644
--- a/src/main/java/com/yssh/entity/SuYuanFast.java
+++ b/src/main/java/com/yssh/entity/SuYuanFast.java
@@ -6,11 +6,6 @@
import java.util.Date;
-/**
- * 蹇�熸函婧愯〃
- * @author WWW
- * @date 2023-11-05
- */
@Data
public class SuYuanFast {
private static final long serialVersionUID = 2023110510570000000L;
diff --git a/src/main/java/com/yssh/entity/Weather.java b/src/main/java/com/yssh/entity/Weather.java
index f433771..9734806 100644
--- a/src/main/java/com/yssh/entity/Weather.java
+++ b/src/main/java/com/yssh/entity/Weather.java
@@ -4,13 +4,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-/**
- * @author wMeng
- * @ClassName YsshWeather
- * @Description 澶╂皵鏁版嵁
- * @date 2022/10/30 13:18
- * @Version 1.0
- */
@Data
@ApiModel(value = "澶╂皵鏁版嵁",description = "澶╂皵鏁版嵁")
public class Weather {
diff --git a/src/main/java/com/yssh/entity/xls/DayExcel.java b/src/main/java/com/yssh/entity/xls/DayExcel.java
index 7b3a580..6645a99 100644
--- a/src/main/java/com/yssh/entity/xls/DayExcel.java
+++ b/src/main/java/com/yssh/entity/xls/DayExcel.java
@@ -1,10 +1,5 @@
package com.yssh.entity.xls;
-/**
- * 鏃ユ姤Excel
- * @author WWW
- * @date 2023-08-08
- */
public class DayExcel {
/**
* 鏃ュ潎鍊�
diff --git a/src/main/java/com/yssh/entity/xls/ExcelHead.java b/src/main/java/com/yssh/entity/xls/ExcelHead.java
index 9d5b392..aca8e1f 100644
--- a/src/main/java/com/yssh/entity/xls/ExcelHead.java
+++ b/src/main/java/com/yssh/entity/xls/ExcelHead.java
@@ -5,25 +5,16 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-/**
- * Excel鏍囬澶寸被
- * @author WWW
- * @date 2023-08-08
- */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface ExcelHead {
/**
* Excel澶磋鏁�
- *
- * @return 澶磋鏁�
*/
int headRows() default 1;
/**
* 鎺掗櫎鐨凷heet鍚嶇О锛堝涓敤閫楀彿闅斿紑锛�
- *
- * @return
*/
String excludeSheets() default "";
}
diff --git a/src/main/java/com/yssh/entity/xls/MonthExcel.java b/src/main/java/com/yssh/entity/xls/MonthExcel.java
index 2ab3667..39c664c 100644
--- a/src/main/java/com/yssh/entity/xls/MonthExcel.java
+++ b/src/main/java/com/yssh/entity/xls/MonthExcel.java
@@ -1,10 +1,5 @@
package com.yssh.entity.xls;
-/**
- * 鏈堟姤Excel
- * @author WWW
- * @date 2023-08-08
- */
public class MonthExcel {
/**
* 涓婃湀
@@ -64,21 +59,6 @@
public MonthExcel() {
}
- /**
- * 鏈堟姤Excel
- *
- * @param sy 涓婃湀
- * @param yhb 鏈堢幆姣�
- * @param ytq 鏈堝悓鏈�
- * @param ytb 鏈堝悓姣�
- * @param lj 绱
- * @param ljtb 绱鍚屾瘮
- * @param qyn 杈冨墠涓�骞村潎鍊煎彉鍖栧箙搴�
- * @param ys 鍙楀奖鍝嶅洜绱犲強鍘熷洜
- * @param fs 椋庨��
- * @param fx 椋庡悜
- * @param wd 娓╁害
- */
public MonthExcel(String sy, String yhb, String ytq, String ytb, String lj, String ljtb, String qyn, String ys, String fs, String fx, String wd) {
this.sy = sy;
this.yhb = yhb;
diff --git a/src/main/java/com/yssh/entity/xls/WeekExcel.java b/src/main/java/com/yssh/entity/xls/WeekExcel.java
index bb0646d..cd17a2f 100644
--- a/src/main/java/com/yssh/entity/xls/WeekExcel.java
+++ b/src/main/java/com/yssh/entity/xls/WeekExcel.java
@@ -1,10 +1,5 @@
package com.yssh.entity.xls;
-/**
- * 鍛ㄦ姤Excel
- * @author WWW
- * @date 2023-08-08
- */
public class WeekExcel {
/**
* 涓婂懆
@@ -64,21 +59,6 @@
public WeekExcel() {
}
- /**
- * 鍛ㄦ姤Excel
- *
- * @param sz 涓婂懆
- * @param zhb 鍛ㄧ幆姣�
- * @param ztq 鍛ㄥ悓鏈�
- * @param ztb 鍛ㄥ悓姣�
- * @param lj 绱
- * @param ljtb 绱鍚屾瘮
- * @param syn 杈冧笂涓�骞村害鍙樺寲骞呭害
- * @param ys 鍙楀奖鍝嶅洜绱犲強鍘熷洜
- * @param fs 椋庨��
- * @param fx 椋庡悜
- * @param wd 娓╁害
- */
public WeekExcel(String sz, String zhb, String ztq, String ztb, String lj, String ljtb, String syn, String ys, String fs, String fx, String wd) {
this.sz = sz;
this.zhb = zhb;
diff --git a/src/main/java/com/yssh/entity/xls/XlsReport.java b/src/main/java/com/yssh/entity/xls/XlsReport.java
index de8b727..bb62cc7 100644
--- a/src/main/java/com/yssh/entity/xls/XlsReport.java
+++ b/src/main/java/com/yssh/entity/xls/XlsReport.java
@@ -4,11 +4,6 @@
import java.util.Date;
-/**
- * Excel鎶ュ憡瀹炰綋绫�
- * @author WWW
- * @date 2023-08-09
- */
public class XlsReport {
@ApiModelProperty(value = "涓婚敭")
private Long id;
diff --git a/src/main/java/com/yssh/mapper/CommonMapper.java b/src/main/java/com/yssh/mapper/CommonMapper.java
index e10b16e..0d5b883 100644
--- a/src/main/java/com/yssh/mapper/CommonMapper.java
+++ b/src/main/java/com/yssh/mapper/CommonMapper.java
@@ -5,15 +5,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-/**
- * @ClassName: CommonMapper
- * @Description: 閫氱敤鐨刴apper
- * @author zhangtengfei
- * @date 2023骞�2鏈�27鏃ヤ笅鍗�2:27:55
- */
@Mapper
public interface CommonMapper{
-
/**
* 浣跨敤information_schema妫�鏌ヨ〃鏄惁瀛樺湪
* @param tableSchema
diff --git a/src/main/java/com/yssh/mapper/DictRecordMapper.java b/src/main/java/com/yssh/mapper/DictRecordMapper.java
index 2616b01..dd26f49 100644
--- a/src/main/java/com/yssh/mapper/DictRecordMapper.java
+++ b/src/main/java/com/yssh/mapper/DictRecordMapper.java
@@ -6,15 +6,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-/**
- * 瀛楀吀璁板綍Mapper鎺ュ彛
- *
- * @author xingjinshuang@smartearth.cn
- * @date 2023-02-06
- */
@Mapper
public interface DictRecordMapper {
-
/**
* 鏌ヨ瀛楀吀璁板綍鍒楄〃
* @param dictRecord 瀛楀吀璁板綍
diff --git a/src/main/java/com/yssh/mapper/EmissionMapper.java b/src/main/java/com/yssh/mapper/EmissionMapper.java
index e0b0769..cbc0031 100644
--- a/src/main/java/com/yssh/mapper/EmissionMapper.java
+++ b/src/main/java/com/yssh/mapper/EmissionMapper.java
@@ -6,13 +6,6 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-/**
- * @author wMeng
- * @ClassName YsshQxshMapper
- * @Description TODO
- * @date 2022/10/31 14:45
- * @Version 1.0
- */
@Mapper
public interface EmissionMapper {
List<Emission> query(@Param("name") String name);
diff --git a/src/main/java/com/yssh/mapper/LocationMapper.java b/src/main/java/com/yssh/mapper/LocationMapper.java
index f2ce02d..737c5bb 100644
--- a/src/main/java/com/yssh/mapper/LocationMapper.java
+++ b/src/main/java/com/yssh/mapper/LocationMapper.java
@@ -6,11 +6,6 @@
import java.util.List;
-/**
- * @author wMeng
- * @date 2022/10/30 13:37
- * @version 1.0
- */
@Mapper
public interface LocationMapper {
List<Location> query(@Param("name") String name, @Param("type") String type);
diff --git a/src/main/java/com/yssh/mapper/QxshMapper.java b/src/main/java/com/yssh/mapper/QxshMapper.java
index 3165e4f..75e7140 100644
--- a/src/main/java/com/yssh/mapper/QxshMapper.java
+++ b/src/main/java/com/yssh/mapper/QxshMapper.java
@@ -8,11 +8,6 @@
import java.util.List;
import java.util.Map;
-/**
- * @author WWW
- * @date 2023-05-18
- * QxshMapper
- */
@Mapper
public interface QxshMapper {
List<SuYuanMonitorData> getNewMonitorData(String name, String start, String end);
diff --git a/src/main/java/com/yssh/mapper/ThuAccuracyMapper.java b/src/main/java/com/yssh/mapper/ThuAccuracyMapper.java
index 1aac682..75990f7 100644
--- a/src/main/java/com/yssh/mapper/ThuAccuracyMapper.java
+++ b/src/main/java/com/yssh/mapper/ThuAccuracyMapper.java
@@ -9,7 +9,6 @@
@Mapper
public interface ThuAccuracyMapper {
-
//鏌ヨ杩囧幓涓冨ぉ绮剧‘骞冲潎鍊肩粺璁�
public Double selectSevenDayAccuracyAvg(Long beginTime);
diff --git a/src/main/java/com/yssh/mapper/VocValsMapper.java b/src/main/java/com/yssh/mapper/VocValsMapper.java
index 3878035..00db133 100644
--- a/src/main/java/com/yssh/mapper/VocValsMapper.java
+++ b/src/main/java/com/yssh/mapper/VocValsMapper.java
@@ -7,11 +7,6 @@
import java.util.List;
-/**
- * Voc鍊糓apper鎺ュ彛
- * @author WWW
- * @date 2023-06-05
- */
@Mapper
public interface VocValsMapper {
/**
diff --git a/src/main/java/com/yssh/mapper/WeatherMapper.java b/src/main/java/com/yssh/mapper/WeatherMapper.java
index 27736da..7bb2bca 100644
--- a/src/main/java/com/yssh/mapper/WeatherMapper.java
+++ b/src/main/java/com/yssh/mapper/WeatherMapper.java
@@ -6,13 +6,6 @@
import java.util.List;
-/**
- * @author wMeng
- * @ClassName YsshWeatherMapper
- * @Description TODO
- * @date 2022/10/30 14:16
- * @Version 1.0
- */
@Mapper
public interface WeatherMapper {
List<Weather> query(@Param("begin") String begin, @Param("end") String end);
diff --git a/src/main/java/com/yssh/mapper/XlsReportMapper.java b/src/main/java/com/yssh/mapper/XlsReportMapper.java
index 25b3d41..46a61df 100644
--- a/src/main/java/com/yssh/mapper/XlsReportMapper.java
+++ b/src/main/java/com/yssh/mapper/XlsReportMapper.java
@@ -7,11 +7,6 @@
import java.util.List;
-/**
- * XlsReportMapper
- * @author WWW
- * @date 2023-08-09
- */
@Mapper
public interface XlsReportMapper {
/**
diff --git a/src/main/java/com/yssh/service/CommonService.java b/src/main/java/com/yssh/service/CommonService.java
index 087dca6..aafffcf 100644
--- a/src/main/java/com/yssh/service/CommonService.java
+++ b/src/main/java/com/yssh/service/CommonService.java
@@ -37,9 +37,6 @@
@Resource
protected DatFilePathConfig datFilePathConfig;
- /**
- * 妫�鏌ヨ〃鏄惁瀛樺湪
- */
public boolean checkTableExists(String tableName) {
try {
Integer count = commonMapper.checkTableExistsWithSchema(TABLE_SCHEMA, tableName);
diff --git a/src/main/java/com/yssh/service/DictRecordService.java b/src/main/java/com/yssh/service/DictRecordService.java
index 7f836ab..2393e7b 100644
--- a/src/main/java/com/yssh/service/DictRecordService.java
+++ b/src/main/java/com/yssh/service/DictRecordService.java
@@ -12,11 +12,6 @@
import javax.annotation.Resource;
-/**
- * 瀛楀吀璁板綍Service涓氬姟灞傚鐞�
- * @author xingjinshuang@smartearth.cn
- * @date 2023-02-06
- */
@Service
public class DictRecordService {
@Resource
diff --git a/src/main/java/com/yssh/service/EmailService.java b/src/main/java/com/yssh/service/EmailService.java
index 642e271..2729437 100644
--- a/src/main/java/com/yssh/service/EmailService.java
+++ b/src/main/java/com/yssh/service/EmailService.java
@@ -15,12 +15,6 @@
import java.text.SimpleDateFormat;
import java.util.*;
-/**
- * 閭欢鏈嶅姟绫�
- *
- * @author www
- * @date 2024-03-21
- */
@Service
public class EmailService {
@Value("${email.userName}")
@@ -86,14 +80,13 @@
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
public Session createSession() {
- // 鍒涘缓涓�涓厤缃枃浠讹紝骞朵繚瀛�
Properties props = new Properties();
- // SMTP鏈嶅姟鍣ㄨ繛鎺ヤ俊鎭細126鈥攕mtp.126.com锛�163鈥攕mtp.163.com锛宷q-smtp.qq.com"
- props.put("mail.smtp.host", smtpHost); // SMTP涓绘満鍚�
- props.put("mail.smtp.port", smtpPort); // 涓绘満绔彛鍙凤細126鈥�25锛�163鈥�645锛宷q-587
- props.put("mail.smtp.auth", smtpAuth); // 鏄惁闇�瑕佺敤鎴疯璇�
- props.put("mail.smtp.starttls.enale", smtpTls); // 鍚敤TlS鍔犲瘑
+ // 126鈥攕mtp.126.com锛�163鈥攕mtp.163.com锛宷q-smtp.qq.com"
+ props.put("mail.smtp.host", smtpHost);
+ props.put("mail.smtp.port", smtpPort);
+ props.put("mail.smtp.auth", smtpAuth);
+ props.put("mail.smtp.starttls.enale", smtpTls);
Session session = Session.getInstance(props, new Authenticator() {
@Override
@@ -102,7 +95,6 @@
}
});
- // 鎺у埗鍙版墦鍗拌皟璇曚俊鎭�
session.setDebug(debug);
return session;
@@ -114,10 +106,8 @@
return null;
}
- // 鍒涘缓Session浼氳瘽
Session session = createSession();
- // 鍒涘缓閭欢瀵硅薄
MimeMessage message = new MimeMessage(session);
message.setSubject(title);
message.setText(text);
@@ -133,7 +123,6 @@
message.setRecipients(Message.RecipientType.CC, ias);
}
- // 鍙戦��
Transport.send(message);
return true;
diff --git a/src/main/java/com/yssh/service/EmissionService.java b/src/main/java/com/yssh/service/EmissionService.java
index 30afba8..6668929 100644
--- a/src/main/java/com/yssh/service/EmissionService.java
+++ b/src/main/java/com/yssh/service/EmissionService.java
@@ -9,13 +9,6 @@
import javax.annotation.Resource;
-/**
- * @author wMeng
- * @ClassName YsshQxshServiceImpl
- * @Description TODO
- * @date 2022/10/31 14:45
- * @Version 1.0
- */
@Service
public class EmissionService {
@Resource
diff --git a/src/main/java/com/yssh/service/LocationService.java b/src/main/java/com/yssh/service/LocationService.java
index 759d79e..9946d9f 100644
--- a/src/main/java/com/yssh/service/LocationService.java
+++ b/src/main/java/com/yssh/service/LocationService.java
@@ -9,11 +9,6 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * @author wMeng
- * @date 2022/10/30 13:25
- * @version 1.0
- */
@Service
public class LocationService {
@Resource
diff --git a/src/main/java/com/yssh/service/SocketService.java b/src/main/java/com/yssh/service/SocketService.java
index 1c15e63..9749f9a 100644
--- a/src/main/java/com/yssh/service/SocketService.java
+++ b/src/main/java/com/yssh/service/SocketService.java
@@ -10,54 +10,32 @@
import java.io.PrintWriter;
import java.net.Socket;
-/**
- * Socket鏈嶅姟绫�
- * @author WWW
- * @date 2023-11-06
- */
@Service
public class SocketService {
- /**
- * Socket鐨処P
- */
@Value("${socket.ip}")
private String ip;
- /**
- * Socket鐨勭鍙�
- */
@Value("${socket.port}")
private int port;
- /**
- * Socket鐨勭鍙�
- */
@Value("${cmd.runPy}")
private String runPy;
private final Logger logger = LoggerFactory.getLogger(this.getClass());
- /**
- * 鍙戦�佹秷鎭�
- */
public String sendMsg(String msg) throws Exception {
try {
- // 鍒涘缓Socket瀵硅薄锛屾寚瀹氭湇鍔＄鐨処P鍦板潃鍜岀鍙ｅ彿
Socket socket = new Socket(ip, port);
- // 鑾峰彇杈撳叆娴佸拰杈撳嚭娴� 杈撳叆娴佸拰杈撳嚭娴佹槸閫氳繃socket瀵硅薄鏉ヨ繘琛屾暟鎹紶杈撶殑銆�
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
- // 灏嗙敤鎴疯緭鍏ョ殑淇℃伅鍙戦�佺粰鏈嶅姟绔�
out.println(msg);
- // 鎺ユ敹鏈嶅姟绔殑鍝嶅簲骞舵墦鍗�
String rs = in.readLine();
socket.close();
- // 鎵цPython鑴氭湰
exec(runPy);
return rs;
@@ -67,11 +45,6 @@
}
}
- /**
- * 鎵ц鍛戒护
- *
- * @param cmd 鍛戒护
- */
public void exec(String cmd) {
try {
Process process = Runtime.getRuntime().exec(cmd);
diff --git a/src/main/java/com/yssh/service/SuYuanService.java b/src/main/java/com/yssh/service/SuYuanService.java
index 0ff00b8..e3bcddf 100644
--- a/src/main/java/com/yssh/service/SuYuanService.java
+++ b/src/main/java/com/yssh/service/SuYuanService.java
@@ -59,7 +59,6 @@
//@Transactional
@Async("threadPoolTaskExecutor")
public void insertSuYuanDatasAsync(List<SuYuan> lists, String time) throws Exception {
- //鎻掑叆鏁版嵁
List<List<SuYuan>> list = Lists.partition(lists, AsyncService.BATCH_INSERT_NUMBER);
CountDownLatch countDownLatch = new CountDownLatch(list.size());
for (List<SuYuan> corpReserveList : list) {
@@ -365,9 +364,6 @@
return suYuanId;
}
- /**
- * 鏍规嵁ID鏌ヨ蹇�熸函婧�
- */
public List<SuYuanFast> selectFastById(String id, Date date) {
String time = DateUtils.getYyyyMmDdHhMmSs(date);
diff --git a/src/main/java/com/yssh/service/VocValsService.java b/src/main/java/com/yssh/service/VocValsService.java
index c87adc1..fee8580 100644
--- a/src/main/java/com/yssh/service/VocValsService.java
+++ b/src/main/java/com/yssh/service/VocValsService.java
@@ -72,10 +72,8 @@
private void executeAsync(List<VocVals> corpList, CountDownLatch countDownLatch) {
try {
- // 寮傛绾跨▼瑕佸仛鐨勪簨鎯�
vocValsMapper.inserts(corpList);
} finally {
- // 寰堝叧閿�, 鏃犺涓婇潰绋嬪簭鏄惁寮傚父蹇呴』鎵цcountDown,鍚﹀垯await鏃犳硶閲婃斁
countDownLatch.countDown();
}
}
diff --git a/src/main/java/com/yssh/service/WeatherService.java b/src/main/java/com/yssh/service/WeatherService.java
index 8ffecb0..c2de71f 100644
--- a/src/main/java/com/yssh/service/WeatherService.java
+++ b/src/main/java/com/yssh/service/WeatherService.java
@@ -7,13 +7,6 @@
import javax.annotation.Resource;
import java.util.List;
-/**
- * @author wMeng
- * @ClassName YsshWeatherServiceImpl
- * @Description TODO
- * @date 2022/10/30 14:11
- * @Version 1.0
- */
@Service
public class WeatherService {
@Resource
diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java
index 7af4899..236cd7d 100644
--- a/src/main/java/com/yssh/service/XlsReportService.java
+++ b/src/main/java/com/yssh/service/XlsReportService.java
@@ -23,11 +23,6 @@
import java.io.IOException;
import java.util.*;
-/**
- * Excel瀵煎嚭鏈嶅姟绫�
- * @author WWW
- * @author 2023-08-05
- */
@Service
public class XlsReportService {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -62,9 +57,6 @@
@Value("${report.templates}")
private String templates;
- /**
- * 鑾峰彇瀵煎嚭璺緞
- */
private String getExpPath(String type) {
String path = reportPath + File.separator + type;
@@ -76,9 +68,6 @@
return path;
}
- /**
- * 鑾峰彇Excel妯℃澘
- */
private String getXslTemplate(String type) throws IOException {
//ClassPathResource resource = new ClassPathResource(String.format("templates/%s.xlsx", type));
//return resource.exists() ? resource.getFile().getPath() : null;
@@ -86,9 +75,6 @@
return String.format(templates + File.separator + type + ".xlsx");
}
- /**
- * 鍒涘缓Excel
- */
private <T> void createExcel(String source, String target, List<T> list) {
Map<String, List<T>> map = new HashMap<>();
map.put("data", list);
@@ -96,25 +82,16 @@
ExcelUtils.writeToTemplate(source, target, map);
}
- /**
- * 鑾峰彇瀛楃涓叉棩鏈�
- */
private String getStrDate(String type, Date date) {
return DateUtils.parseDateToStr("month".equals(type) ? DateUtils.YYYYMM : DateUtils.YYYYMMDD, date);
}
- /**
- * 鑾峰彇鐩爣鏂囦欢
- */
private String getTarget(String type, Date date) {
String strData = getStrDate(type, date);
return String.format("%s\\%s.xlsx", getExpPath(type), strData);
}
- /**
- * Excel鏄�/鍚﹀瓨鍦�
- */
private boolean xlsExists(String type, Date date) {
String target = getTarget(type, date);
File f = new File(target);
@@ -122,9 +99,6 @@
return f.exists() && !f.isDirectory();
}
- /**
- * 鍒涘缓Excel
- */
private <T> String createExcel(String type, Date date, List<T> list) throws Exception {
String source = getXslTemplate(type);
String strData = getStrDate(type, date);
@@ -137,9 +111,6 @@
return String.format("%s\\%s.xlsx", type, strData);
}
- /**
- * 璁板綍鏄�/鍚﹀瓨鍦�
- */
private boolean recordExists(String type, Date date) {
String name = String.format("%s.xlsx", getStrDate(type, date));
int rows = mapper.reportExists(type, name);
@@ -147,9 +118,6 @@
return rows > 0;
}
- /**
- * 淇濆瓨缁撴灉
- */
private <T> void saveResult(String type, Date date, List<T> list) throws Exception {
String filePath = createExcel(type, date, list);
if (recordExists(type, date)) return;
@@ -166,9 +134,6 @@
mapper.insertReport(xls);
}
- /**
- * 鑾峰彇鍙楀奖鍝嶅洜绱犲強鍘熷洜
- */
public String getYs(List<SuYuan700> suList) {
if (null == suList || 0 == suList.size()) return "";
@@ -353,9 +318,6 @@
}
}
- /**
- * 鏍规嵁ID涓嬭浇
- */
public void downloadById(Integer id, HttpServletResponse res) {
XlsReport xlsReport = mapper.selectById(id);
if (null == xlsReport) return;
diff --git a/src/main/java/com/yssh/utils/AjaxResult.java b/src/main/java/com/yssh/utils/AjaxResult.java
index 1d07640..ff1b82e 100644
--- a/src/main/java/com/yssh/utils/AjaxResult.java
+++ b/src/main/java/com/yssh/utils/AjaxResult.java
@@ -2,12 +2,6 @@
import java.util.HashMap;
-/**
- * 鎿嶄綔娑堟伅鎻愰啋
- *
- * @author xingjinshuang@smartearth.cn
- * @date 2023-02-06
- */
public class AjaxResult extends HashMap<String, Object> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/yssh/utils/CacheUtils.java b/src/main/java/com/yssh/utils/CacheUtils.java
index 1292f87..8404a46 100644
--- a/src/main/java/com/yssh/utils/CacheUtils.java
+++ b/src/main/java/com/yssh/utils/CacheUtils.java
@@ -63,10 +63,8 @@
BigInteger bigInt = new BigInteger(1, byteArray);
- // 鍙傛暟16琛ㄧず16杩涘埗
String result = bigInt.toString(16);
- // 涓嶈冻32浣嶉珮浣嶈ˉ闆�
while (result.length() < 32) {
result = "0" + result;
}
diff --git a/src/main/java/com/yssh/utils/CalculateUtils.java b/src/main/java/com/yssh/utils/CalculateUtils.java
index 6eefb01..530e1b4 100644
--- a/src/main/java/com/yssh/utils/CalculateUtils.java
+++ b/src/main/java/com/yssh/utils/CalculateUtils.java
@@ -12,22 +12,14 @@
import org.geotools.referencing.crs.DefaultGeographicCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+@SuppressWarnings("ALL")
public class CalculateUtils {
- /**
- * 榛樿鍦扮悆鍗婂緞,璧ら亾鍗婂緞(鍗曚綅m)
- */
private final static double EARTH_RADIUS1 = 6371000;
- /**
- * 杞寲涓哄姬搴�(rad)
- */
private static double rad(double d) {
return d * Math.PI / 180.0;
}
- /**
- * 璁＄畻璺濈1
- */
public static double getDistance1(double lon1, double lat1, double lon2, double lat2) {
double radLat1 = rad(lat1);
double radLat2 = rad(lat2);
@@ -40,9 +32,6 @@
return round2(s);
}
- /**
- * 璁＄畻璺濈2
- */
public static double getDistance2(double x1, double y1, double x2, double y2) {
// 84鍧愭爣绯绘瀯閫燝eodeticCalculator
GeodeticCalculator geodeticCalculator = new GeodeticCalculator(DefaultGeographicCRS.WGS84);
@@ -59,23 +48,14 @@
return round2(distance);
}
- /**
- * 淇濈暀2浣嶅皬鏁�
- */
public static double round2(double d) {
return ((long) (d * 100)) / 100D;
}
- /**
- * 淇濈暀6浣嶅皬鏁�
- */
public static double round6(double d) {
return ((long) (d * 1000000)) / 1000000D;
}
- /**
- * 璁＄畻瑙掑害
- */
public static double getAngle(double x1, double y1, double x2, double y2) {
try {
CoordinateReferenceSystem crs = CRS.decode("EPSG:4326");
@@ -94,9 +74,6 @@
}
}
- /**
- * 璁＄畻瑙掑害2
- */
public static double getAngle2(double x1, double y1, double x2, double y2) {
try {
DirectPosition2D p1 = new DirectPosition2D(x1, y1);
@@ -114,12 +91,6 @@
}
}
- /**
- * 鑾峰彇鍧愭爣
- *
- * @param su
- * @return
- */
public static Coordinate getCoordinate(DistanceSuYuan su) {
String[] sirs = su.getId().split("_");
@@ -131,17 +102,6 @@
return new Coordinate(lon, lat);
}
- /**
- * 璁＄畻缁忓害
- *
- * @param @param x
- * @param @param y
- * @param @return 鍙傛暟
- * @return double 杩斿洖绫诲瀷
- * @throws
- * @Title: getLon
- * @Description: 璁＄畻缁忓害
- */
public static double getLon(int x, int y) {
double lon = 115.9165227 + 0.000116732 * (x - 0.5) + 0.00000116862 * (y - 0.5);
if (lon < 115 || lon > 116) {
@@ -151,17 +111,6 @@
return round6(lon);
}
- /**
- * 璁＄畻缁村害
- *
- * @param @param x
- * @param @param y
- * @param @return 鍙傛暟
- * @return double 杩斿洖绫诲瀷
- * @throws
- * @Title: getLat
- * @Description: 璁＄畻缁村害
- */
public static double getLat(int x, int y) {
double lat = 39.77250000 + 0.000001000 * (x - 0.5) - 0.00009000000 * (y - 0.5);
if (lat < 39 || lat > 40) {
@@ -171,14 +120,6 @@
return round6(lat);
}
- /**
- * @param @param checkPoints
- * @param @return 鍙傛暟
- * @return List<String> 杩斿洖绫诲瀷
- * @throws
- * @Title: assembleId
- * @Description: 缁勮id
- */
public static List<String> assembleId(List<MonitorPointPosition> checkPoints) {
List<String> ids2d = new ArrayList<>();
for (MonitorPointPosition point : checkPoints) {
@@ -188,15 +129,6 @@
return ids2d;
}
- /**
- * @param @param checkPoint
- * @param @param range
- * @param @return 鍙傛暟
- * @return List<String> 杩斿洖绫诲瀷
- * @Title: aloneCrosswiseScope
- * @Description: 鍗曠嫭鐐逛綅妯悜鑼冨洿鎵╁睍
- * @backup 寮哄埗灏嗗眰绾ф敼涓� 0
- */
public static List<String> aloneCrosswiseExtend(MonitorPointPosition checkPoint, int range) {
List<String> ids = new ArrayList<>();
Integer x = checkPoint.getX();
@@ -210,9 +142,6 @@
return ids;
}
- /**
- * 鏍规嵁鑼冨洿鑾峰彇鏌ヨ鏉′欢
- */
public static String getFilterByExtend(MonitorPointPosition point, int range) {
Integer x = point.getX();
Integer y = point.getY();
@@ -235,9 +164,6 @@
return ids3d;
}
- /**
- * 鑾峰彇鏂瑰悜
- */
public static String getDir(double direction) {
if (direction < 0) {
direction = direction + 360;
@@ -264,9 +190,6 @@
return "鍖�";
}
- /**
- * 璁＄畻X銆乊鍊肩殑鐭╁舰妗�
- */
public static List<Coordinate> calcRect(double x, double y) {
double buffer = 10;
double dis = round6(Math.sqrt(Math.pow(buffer / 2, 2) * 2));
@@ -280,9 +203,6 @@
return list;
}
- /**
- * 鏍规嵁璺濈鍜岃搴﹁幏鍙栫洰鏍囩偣
- */
private static Coordinate getPointByDisAndAngle(double x, double y, double angle, double dis) {
try {
DirectPosition2D p1 = new DirectPosition2D(x, y);
@@ -301,26 +221,10 @@
}
}
- /**
- * @param @return 鍙傛暟
- * @return Double 杩斿洖绫诲瀷
- * @throws
- * @Title: getWindSpeed
- * @Description: 璁＄畻椋庨��
- */
public static Double getWindSpeed(double v, double u) {
return round6(Math.sqrt(v * v + u * u));
}
- /**
- * @param @param v
- * @param @param u
- * @param @return 鍙傛暟
- * @return double 杩斿洖绫诲瀷
- * @throws
- * @Title: getWindDirection
- * @Description: 璁＄畻椋庡悜
- */
public static double getWindDirection(double v, double u) {
double result = Math.atan(u / (v + Math.pow(10, -5))) / Math.PI * 180;
if (result < 0) {
@@ -332,16 +236,6 @@
return round6(result);
}
- /**
- * @param @param list 鎺掑簭瀵硅薄
- * @param @param property 鎺掑簭鍙傛暟
- * @param @param order 鎺掑簭椤哄簭
- * @param @return 鍙傛暟
- * @return List<Map < String, Object>> 杩斿洖绫诲瀷
- * @throws
- * @Title: sort
- * @Description: 鎺掑簭
- */
public static List<Map<String, Object>> sort(List<Map<String, Object>> list, final String property, final boolean order) {
if (list == null || property == null) {
return null;
diff --git a/src/main/java/com/yssh/utils/CommonConstant.java b/src/main/java/com/yssh/utils/CommonConstant.java
index b9eab01..1d2b55b 100644
--- a/src/main/java/com/yssh/utils/CommonConstant.java
+++ b/src/main/java/com/yssh/utils/CommonConstant.java
@@ -1,22 +1,17 @@
package com.yssh.utils;
-/**
- * @author wMeng
- * @ClassName CommonConstant
- * @Description TODO
- * @date 2022/10/30 13:30
- * @Version 1.0
- */
public interface CommonConstant {
-
- /** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */
+ /**
+ * {@code 500 Server Error} (HTTP/1.0 - RFC 1945)
+ */
public static final Integer SC_INTERNAL_SERVER_ERROR_500 = 500;
- /** {@code 200 OK} (HTTP/1.0 - RFC 1945) */
+ /**
+ * {@code 200 OK} (HTTP/1.0 - RFC 1945)
+ */
public static final Integer SC_OK_200 = 200;
- /**璁块棶鏉冮檺璁よ瘉鏈�氳繃 510*/
- public static final Integer SC_JEECG_NO_AUTHZ=510;
-
-
-
+ /**
+ * 璁块棶鏉冮檺璁よ瘉鏈�氳繃 510
+ */
+ public static final Integer SC_JEECG_NO_AUTHZ = 510;
}
diff --git a/src/main/java/com/yssh/utils/DateUtils.java b/src/main/java/com/yssh/utils/DateUtils.java
index e9b053d..838ce2b 100644
--- a/src/main/java/com/yssh/utils/DateUtils.java
+++ b/src/main/java/com/yssh/utils/DateUtils.java
@@ -7,11 +7,6 @@
import org.apache.commons.lang3.time.DateFormatUtils;
-/**
- * 鏃堕棿宸ュ叿绫�
- *
- * @author tam
- */
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY = "yyyy";
@@ -37,20 +32,10 @@
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss",
"yyyy.MM.dd HH:mm", "yyyy.MM"};
- /**
- * 鑾峰彇褰撳墠Date鍨嬫棩鏈�
- *
- * @return Date() 褰撳墠鏃ユ湡
- */
public static Date getNowDate() {
return new Date();
}
- /**
- * 鑾峰彇褰撳墠鏃ユ湡, 榛樿鏍煎紡涓簓yyy-MM-dd
- *
- * @return String
- */
public static String getDate() {
return dateTimeNow(YYYY_MM_DD);
}
diff --git a/src/main/java/com/yssh/utils/ExcelUtils.java b/src/main/java/com/yssh/utils/ExcelUtils.java
index b7cac0a..d18213b 100644
--- a/src/main/java/com/yssh/utils/ExcelUtils.java
+++ b/src/main/java/com/yssh/utils/ExcelUtils.java
@@ -14,19 +14,7 @@
import java.util.*;
-/**
- * Excel甯姪绫�
- * @author WWW
- * @date 2023-08-08
- */
public class ExcelUtils {
- /**
- * 璇诲彇Excel
- *
- * @param pathName 鏂囦欢璺緞
- * @param <T> 娉涘瀷绫�
- * @return 娉涘瀷绫婚泦鍚�
- */
public static <T> List<T> readExcel(Class<?> clazz, String pathName) {
ExcelHead head = getExcelHead(clazz);
int headRowNumber = head == null ? 1 : head.headRows();
@@ -59,40 +47,21 @@
return list;
}
- /**
- * 鑾峰彇Excel澶存敞瑙ｇ被
- *
- * @param clazz Class
- * @param <T> 娉涘瀷绫�
- * @return 澶磋鏁�
- */
public static <T> ExcelHead getExcelHead(Class<?> clazz) {
ExcelHead head = clazz.getAnnotation(ExcelHead.class);
return head;
}
- /**
- * 鍐欏叆Excel妯℃澘
- *
- * @param source 婧愭枃浠讹紙妯℃澘锛�
- * @param target 鐩綍鏂囦欢
- * @param map 鏁版嵁婧�
- */
public static <T> void writeToTemplate(String source, String target, Map<String, List<T>> map) {
- // 鏍规嵁妯℃澘鍐欏叆鏁版嵁锛屽鏋滅洰鏍囨枃浠朵笉瀛樺湪锛屽垯鑷姩鍒涘缓鏂囦欢
ExcelWriter excelWriter = EasyExcel.write(target).withTemplate(source).build();
- // 鍦ㄥ伐浣滅翱0涓啓鍏ユ暟鎹紝濡傛灉妯℃澘涓笉瀛樺湪缁冧範宸ヤ綔绨匡紝鍒欎細鍦ㄧ洰鏍囨枃浠朵腑鑷姩鍒涘缓
WriteSheet writeSheet = EasyExcel.writerSheet(0).build();
- // 鍨傜洿鍐欏叆鏁版嵁锛屽鏋滆姘村钩鍐欏叆锛屽皢VERTICAL鏇挎崲涓篐ORIZONTAL
FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
- // 鍐欏叆鏁版嵁
map.forEach((k, v) -> excelWriter.fill(new FillWrapper(k, v), fillConfig, writeSheet));
- // 缁撴潫鍐欏叆
excelWriter.finish();
}
}
diff --git a/src/main/java/com/yssh/utils/FileUtils.java b/src/main/java/com/yssh/utils/FileUtils.java
index aec2a29..9df4c55 100644
--- a/src/main/java/com/yssh/utils/FileUtils.java
+++ b/src/main/java/com/yssh/utils/FileUtils.java
@@ -7,19 +7,11 @@
import java.nio.channels.FileChannel;
import java.security.MessageDigest;
-/**
- * 鏂囦欢宸ュ叿绫�
- * @author WWW
- * @date 2023-06-06
- */
public class FileUtils {
public final static int SIXTEEN = 16;
public static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
- /**
- * 1.鑾峰彇鏂囦欢鐨凪D5
- */
@SuppressWarnings("unused")
public static String getFileMd5(String filePath) {
FileInputStream fis = null;
@@ -52,25 +44,16 @@
}
}
- /**
- * 瀛楄妭鐮佽浆16杩涘埗
- */
public static String byteToHexString(byte[] tmp) {
- // 姣忎釜瀛楄妭鐢� 16 杩涘埗琛ㄧず鐨勮瘽锛屼娇鐢ㄤ袱涓瓧绗︼紝
char[] str = new char[16 * 2];
- // 鎵�浠ヨ〃绀烘垚 16 杩涘埗闇�瑕� 32 涓瓧绗︼紝琛ㄧず杞崲缁撴灉涓搴旂殑瀛楃浣嶇疆
int k = 0;
- // 浠庣涓�涓瓧鑺傚紑濮嬶紝瀵� MD5 鐨勬瘡涓�涓瓧鑺�
for (int i = 0; i < SIXTEEN; i++) {
- // 杞崲鎴� 16 杩涘埗瀛楃鐨勮浆鎹�
byte byte0 = tmp[i];
- // 鍙栧瓧鑺備腑楂� 4 浣嶇殑鏁板瓧杞崲
str[k++] = HEX_DIGITS[byte0 >>> 4 & 0xf];
- // >>> 涓洪�昏緫鍙崇Щ锛屽皢绗﹀彿浣嶄竴璧峰彸绉伙紝 鍙栧瓧鑺備腑浣� 4 浣嶇殑鏁板瓧杞崲
str[k++] = HEX_DIGITS[byte0 & 0xf];
}
- // 鎹㈠悗鐨勭粨鏋滆浆鎹负瀛楃涓�
+
return new String(str);
}
}
diff --git a/src/main/java/com/yssh/utils/GisUtil.java b/src/main/java/com/yssh/utils/GisUtil.java
index eba5bd6..3768793 100644
--- a/src/main/java/com/yssh/utils/GisUtil.java
+++ b/src/main/java/com/yssh/utils/GisUtil.java
@@ -7,18 +7,6 @@
import org.opengis.referencing.operation.MathTransform;
public class GisUtil {
-
- /**
- * @param srcNo
- * 婧愬潗鏍囩郴EPSG浠ｅ彿
- * @param targetNo
- * 鐩爣鍧愭爣绯籈PSG浠ｅ彿
- * @param x
- * 婧愬潗鏍噚
- * @param y
- * 婧愬潗鏍噛
- * @Description: 鍧愭爣绯昏浆鎹�
- */
public static Coordinate coordinateTransform(String sourceCRS, String targetCRS,
double x, double y) {
Coordinate tar = new Coordinate();
diff --git a/src/main/java/com/yssh/utils/HttpStatus.java b/src/main/java/com/yssh/utils/HttpStatus.java
index ccf4476..6369fe0 100644
--- a/src/main/java/com/yssh/utils/HttpStatus.java
+++ b/src/main/java/com/yssh/utils/HttpStatus.java
@@ -1,12 +1,5 @@
package com.yssh.utils;
-
-/**
- * 杩斿洖鐘舵�佺爜
- *
- * @author xingjinshuang@smartearth.cn
- * @date 2023-02-06
- */
public class HttpStatus
{
/**
diff --git a/src/main/java/com/yssh/utils/Result.java b/src/main/java/com/yssh/utils/Result.java
index 7c60c37..4dc06ae 100644
--- a/src/main/java/com/yssh/utils/Result.java
+++ b/src/main/java/com/yssh/utils/Result.java
@@ -8,13 +8,6 @@
import java.io.Serializable;
-/**
- * @author wMeng
- * @ClassName Result
- * @Description TODO
- * @date 2022/10/30 13:29
- * @Version 1.0
- */
@Data
@ApiModel(value = "閫氱敤缁撴灉闆�",description = "閫氱敤缁撴灉闆�")
public class Result<T> implements Serializable {
diff --git a/src/main/java/com/yssh/utils/ServletInitializer.java b/src/main/java/com/yssh/utils/ServletInitializer.java
index 7bd4441..c3a6770 100644
--- a/src/main/java/com/yssh/utils/ServletInitializer.java
+++ b/src/main/java/com/yssh/utils/ServletInitializer.java
@@ -5,14 +5,6 @@
import com.yssh.Application;
-/**
- * @author wMeng
- * @ClassName ServletInitializer
- * @Description TODO
- * @date 2022/10/31 18:46
- * @Version 1.0
- */
-
public class ServletInitializer extends SpringBootServletInitializer {
@Override
diff --git a/src/main/java/com/yssh/utils/SpringUtils.java b/src/main/java/com/yssh/utils/SpringUtils.java
index 48d3a50..0ff5407 100644
--- a/src/main/java/com/yssh/utils/SpringUtils.java
+++ b/src/main/java/com/yssh/utils/SpringUtils.java
@@ -9,12 +9,6 @@
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
-
-/**
- * spring宸ュ叿绫� 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean
- *
- * @author tam
- */
@Component
public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware {
/** Spring搴旂敤涓婁笅鏂囩幆澧� */
diff --git a/src/main/java/com/yssh/utils/StringUtils.java b/src/main/java/com/yssh/utils/StringUtils.java
index 3aa0f64..739aec1 100644
--- a/src/main/java/com/yssh/utils/StringUtils.java
+++ b/src/main/java/com/yssh/utils/StringUtils.java
@@ -8,13 +8,6 @@
import java.util.Set;
import org.springframework.util.AntPathMatcher;
-/**
- * 瀛楃涓插伐鍏风被
- *
- * @author xingjinshuang@smartearth.cn
- * @date 2023-02-06
- */
-
public class StringUtils extends org.apache.commons.lang3.StringUtils {
/** 绌哄瓧绗︿覆 */
private static final String NULLSTR = "";
diff --git a/src/main/java/com/yssh/utils/VocParser.java b/src/main/java/com/yssh/utils/VocParser.java
index 85d9889..500bc18 100644
--- a/src/main/java/com/yssh/utils/VocParser.java
+++ b/src/main/java/com/yssh/utils/VocParser.java
@@ -12,19 +12,11 @@
import java.util.Date;
import java.util.List;
-/**
- * VOC杞崲绫�
- * @author WWW
- * @date 2023-06-05
- */
public class VocParser extends AbstractCsvFileParser<VocVals> {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
private final SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH0000");
- /**
- * 姣忛殧5000鏉″叆搴撲竴娆�
- */
public static final int BATCH_COUNT = 100000;
private BigInteger startId;
diff --git a/src/main/java/com/yssh/utils/WebUtils.java b/src/main/java/com/yssh/utils/WebUtils.java
index b5f8bff..1f74189 100644
--- a/src/main/java/com/yssh/utils/WebUtils.java
+++ b/src/main/java/com/yssh/utils/WebUtils.java
@@ -6,25 +6,9 @@
import java.net.URLEncoder;
import java.util.Date;
-/**
- * Web宸ュ叿绫�
- * @author WWW
- * @date 2023-08-09
- */
public class WebUtils {
- /**
- * 瀛楃鐐�
- */
public final static String POINT = ".";
- /**
- * 涓嬭浇鏂囦欢
- *
- * @param file 鏂囦欢
- * @param fileName 鏂囦欢鍚�
- * @param res 鍝嶅簲
- * @throws Exception 寮傚父
- */
public static void download(String file, String fileName, boolean inline, HttpServletResponse res) throws Exception {
if (StringUtils.isEmpty(fileName)) {
fileName = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date());
@@ -32,37 +16,27 @@
fileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20");
String dispose = inline ? "inline" : "attachment";
- // 璁剧疆鍝嶅簲澶翠腑鏂囦欢鐨勪笅杞芥柟寮忎负闄勪欢鏂瑰紡锛屼互鍙婅缃枃浠跺悕
res.setHeader("Content-Disposition", dispose + "; filename*=UTF-8''" + fileName);
- // 璁剧疆鍝嶅簲澶寸殑缂栫爜鏍煎紡涓� UTF-8
res.setCharacterEncoding("UTF-8");
- // 閫氳繃response瀵硅薄璁剧疆鍝嶅簲鏁版嵁鏍煎紡(濡傦細"text/plain; charset=utf-8")
String ext = getExtension(file);
String mime = getMime(ext);
res.setContentType(mime);
- // 閫氳繃response瀵硅薄锛岃幏鍙栧埌杈撳嚭娴�
ServletOutputStream outputStream = res.getOutputStream();
- // 瀹氫箟杈撳叆娴侊紝閫氳繃杈撳叆娴佽鍙栨枃浠跺唴瀹�
FileInputStream fileInputStream = new FileInputStream(file);
int len = 0;
byte[] bytes = new byte[1024];
while ((len = fileInputStream.read(bytes)) != -1) {
- // 閫氳繃杈撳叆娴佽鍙栨枃浠舵暟鎹紝鐒跺悗閫氳繃涓婅堪鐨勮緭鍑烘祦鍐欏洖娴忚鍣�
outputStream.write(bytes, 0, len);
outputStream.flush();
}
- // 鍏抽棴璧勬簮
fileInputStream.close();
outputStream.close();
}
- /**
- * 鑾峰彇鏂囦欢鎵╁睍鍚�
- */
public static String getExtension(String fileName) {
if (StringUtils.isEmpty(fileName)) {
return "";
@@ -76,15 +50,8 @@
return fileName.substring(idx).toLowerCase();
}
- /**
- * 鑾峰彇澶氱敤閫斾簰鑱旂綉閭欢鎵╁睍绫诲瀷
- *
- * @param ext 鏂囦欢鎵╁睍鍚�
- * @return MIME
- */
public static String getMime(String ext) {
switch (ext) {
- // 鍥剧墖
case ".tif":
case ".tiff":
return "image/tiff";
@@ -97,7 +64,6 @@
return "image/jpeg";
case ".png":
return "image/png";
- // 闊�/瑙嗛
case ".mp3":
return "audio/mp3";
case ".mp4":
@@ -119,7 +85,6 @@
return "application/vnd.rn-realmedia";
case ".rmvb":
return "application/vnd.rn-realmedia-vbr";
- // 缃戦〉
case ".js":
return "application/x-javascript";
case ".css":
@@ -136,7 +101,6 @@
case ".xml":
case ".svg":
return "text/xml";
- // 鏂囦欢
case ".txt":
return "text/plain";
case ".dbf":
@@ -160,7 +124,6 @@
return "application/x-dwg";
case ".ext":
return "application/x-msdownload";
- // 榛樿
default:
return "application/octet-stream";
}
diff --git a/ys.sql b/ys.sql
index 9328f2d..0b56c2e 100644
--- a/ys.sql
+++ b/ys.sql
@@ -4,6 +4,11 @@
SHOW BINARY LOGS;
RESET MASTER;
+
+create index index_yssh_gcsj_time on yssh_gcsj(time);
+drop index index_yssh_gcsj_time on yssh_gcsj;
+
+https://blog.csdn.net/qq_63161848/article/details/141591514
----------------------------------------------------------------------
create table voc_vals (
id bigint not null primary key comment '涓婚敭',
@@ -12,6 +17,7 @@
val double(25, 10) comment '鍊�',
create_time datetime comment '鍊�'
);
+
create index voc_vals_val on voc_vals (val);
create index voc_vals_time on voc_vals (create_time);
----------------------------------------------------------------------
--
Gitblit v1.9.3