Commit d0cffb90 by Jbb

删除了一些多余的依赖 修改一下配置

parent e1d15369
...@@ -2,7 +2,6 @@ package com.founder.commonutils.viewEntity; ...@@ -2,7 +2,6 @@ package com.founder.commonutils.viewEntity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
......
...@@ -178,11 +178,6 @@ ...@@ -178,11 +178,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>2.2.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-zuul</artifactId> <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -12,6 +12,23 @@ ...@@ -12,6 +12,23 @@
<artifactId>view</artifactId> <artifactId>view</artifactId>
<build> <build>
<finalName>view</finalName> <finalName>view</finalName>
<!-- 项目打包时默认将.java的文件进行打包 不会将java目录中的*.xml文件也进行打包 -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</build> </build>
......
...@@ -43,6 +43,7 @@ public class TbStLayerDataController { ...@@ -43,6 +43,7 @@ public class TbStLayerDataController {
//获取excel有多少行 //获取excel有多少行
int lastRowNum = sheetAt.getLastRowNum(); int lastRowNum = sheetAt.getLastRowNum();
List<TbStLayerData> pointList = new ArrayList<>(); List<TbStLayerData> pointList = new ArrayList<>();
DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (int i = 1; i <= lastRowNum; i++) { for (int i = 1; i <= lastRowNum; i++) {
TbStLayerData point = new TbStLayerData(); TbStLayerData point = new TbStLayerData();
String id = KeyUtil.getUUIDKey("xy"); String id = KeyUtil.getUUIDKey("xy");
...@@ -53,7 +54,7 @@ public class TbStLayerDataController { ...@@ -53,7 +54,7 @@ public class TbStLayerDataController {
short lastCellNum = row.getLastCellNum(); short lastCellNum = row.getLastCellNum();
//判断经纬度是否符合要求 //判断经纬度是否符合要求
//检车一下数据是否能正常读取..... //检车一下数据是否能正常读取.....
double jd = 0.0; /*double jd = 0.0;
double wd = 0.0; double wd = 0.0;
String titleStr = ""; String titleStr = "";
String dateStr = ""; String dateStr = "";
...@@ -63,8 +64,7 @@ public class TbStLayerDataController { ...@@ -63,8 +64,7 @@ public class TbStLayerDataController {
titleStr = row.getCell(2).getStringCellValue(); titleStr = row.getCell(2).getStringCellValue();
dateStr = row.getCell(3).getStringCellValue(); dateStr = row.getCell(3).getStringCellValue();
System.out.println(jd + "==========" + wd + "=========" + titleStr + "=========" + dateStr); System.out.println(jd + "==========" + wd + "=========" + titleStr + "=========" + dateStr);
} }*/
DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try { try {
//验证经纬度是否是八位小数以内 //验证经纬度是否是八位小数以内
boolean isTrue = LngLonUtil.verifyLongAndLat(row.getCell(0).getNumericCellValue(), row.getCell(1).getNumericCellValue()); boolean isTrue = LngLonUtil.verifyLongAndLat(row.getCell(0).getNumericCellValue(), row.getCell(1).getNumericCellValue());
...@@ -143,11 +143,12 @@ public class TbStLayerDataController { ...@@ -143,11 +143,12 @@ public class TbStLayerDataController {
double lat = accidentPoint.getY(); double lat = accidentPoint.getY();
String title = accidentPoint.getTitle(); String title = accidentPoint.getTitle();
Date time = accidentPoint.getTime(); Date time = accidentPoint.getTime();
String timeFormat = df.format(time);
HSSFRow rowData = sheet.createRow(i + 1); HSSFRow rowData = sheet.createRow(i + 1);
rowData.createCell(0).setCellValue(lon); rowData.createCell(0).setCellValue(lon);
rowData.createCell(1).setCellValue(lat); rowData.createCell(1).setCellValue(lat);
rowData.createCell(2).setCellValue(title); rowData.createCell(2).setCellValue(title);
rowData.createCell(3).setCellValue(time); rowData.createCell(3).setCellValue(timeFormat);
} }
//通过输出流下载 //通过输出流下载
ServletOutputStream outputStream = response.getOutputStream(); ServletOutputStream outputStream = response.getOutputStream();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment