Home Explore Help
Sign In
hanzhengyi
/
usky-power
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

导出文档时间转换2

jichaobo 3 years ago
parent
d9f681ddf1
commit
6d620ac842
9 changed files with 25 additions and 10 deletions
Unified View Show Diff Stats
  1. 3 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java
  2. 3 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java
  3. 3 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java
  4. 2 2
      fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java
  5. 3 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsWorkOrderServiceImpl.java
  6. 3 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java
  7. 3 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/RtAnalogDataServiceImpl.java
  8. 4 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/SitedtlServiceImpl.java
  9. 1 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/WcBlackoutPlanServiceImpl.java

+ 3 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java
View File 

@@ -26,6 +26,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.io.File;
 
 import java.io.File;
 
 import java.io.FileOutputStream;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
+import java.text.DateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.util.*;
 
 import java.util.*;
 
 import java.util.concurrent.TimeUnit;
 
 import java.util.concurrent.TimeUnit;
 
@@ -209,6 +210,7 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
 
 
 
     @Override
 
     @Override
 
     public String export(Date startTime, Date endTime, Integer status, Integer siteId) {
 
     public String export(Date startTime, Date endTime, Integer status, Integer siteId) {
 
+        DateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
 
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
@@ -221,7 +223,7 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), AlarmPower.class, AlarmPowerExportVO.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), AlarmPower.class, AlarmPowerExportVO.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "电力告警", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "电力告警", dFormat.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 3 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java
View File 

@@ -34,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 
 import java.io.File;
 
 import java.io.FileOutputStream;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
+import java.text.SimpleDateFormat;
 
 import java.util.ArrayList;
 
 import java.util.ArrayList;
 
 import java.util.Date;
 
 import java.util.Date;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -123,6 +124,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
 
 
 
     @Override
 
     @Override
 
     public String variableListExport( Integer siteId,String variableName,Integer dataArea) {
 
     public String variableListExport( Integer siteId,String variableName,Integer dataArea) {
 
+        SimpleDateFormat longSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
         final String[] err1 = {"导出文件失败"};
 
         final String[] err1 = {"导出文件失败"};
 
@@ -143,7 +145,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), DeviceAnalogVariableListOneVo.class, DeviceAnalogVariableListExportVO.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), DeviceAnalogVariableListOneVo.class, DeviceAnalogVariableListExportVO.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "变量列表", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "变量列表", longSdf.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 3 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java
View File 

@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 
 import java.io.File;
 
 import java.io.FileOutputStream;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
+import java.text.SimpleDateFormat;
 
 import java.util.ArrayList;
 
 import java.util.ArrayList;
 
 import java.util.Date;
 
 import java.util.Date;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -117,6 +118,7 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
 
 
 
     @Override
 
     @Override
 
     public String deviceAttributeExport(Integer id, Integer siteId) {
 
     public String deviceAttributeExport(Integer id, Integer siteId) {
 
+        SimpleDateFormat longSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
 
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
@@ -135,7 +137,7 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), DeviceAttribute.class, DeviceAttributeExportVO.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), DeviceAttribute.class, DeviceAttributeExportVO.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "监控设备列表", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "监控设备列表", longSdf.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 2 - 2
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java
View File 

@@ -400,7 +400,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
 
                         return new ArrayList<>(BeanMapperUtils.mapList(Active, DeviceOne.class, DeviceExportVO.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(Active, DeviceOne.class, DeviceExportVO.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "通信设备列表", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "通信设备列表", longSdf.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);
 
@@ -454,7 +454,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
 
                         return new ArrayList<>(BeanMapperUtils.mapList(Active, CorrespondDeviceTwoVO.class, CorrespondDeviceExportVO.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(Active, CorrespondDeviceTwoVO.class, CorrespondDeviceExportVO.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "通信设备列表", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "通信设备列表", longSdf.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 3 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsWorkOrderServiceImpl.java
View File 

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 
 import java.io.File;
 
 import java.io.FileOutputStream;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
+import java.text.DateFormat;
 
 import java.text.ParseException;
 
 import java.text.ParseException;
 
 import java.text.SimpleDateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.util.*;
 
 import java.util.*;
 
@@ -711,6 +712,7 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
 
 
 
     @Override
 
     @Override
 
     public String workloadStatisticsExport(Integer siteId,String startTime,String endTime){
 
     public String workloadStatisticsExport(Integer siteId,String startTime,String endTime){
 
+        DateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
         try {
 
         try {
 
@@ -784,7 +786,7 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
 
                         return new ArrayList<>(BeanMapperUtils.mapList(Active1, ProcessingTimeVo.class, ProcessingTimeExportVO.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(Active1, ProcessingTimeVo.class, ProcessingTimeExportVO.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "工作量统计", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "工作量统计", dFormat.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 3 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java
View File 

@@ -30,6 +30,7 @@ import java.io.File;
 
 import java.io.FileOutputStream;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
 import java.math.BigDecimal;
 
 import java.math.BigDecimal;
 
+import java.text.DateFormat;
 
 import java.text.DecimalFormat;
 
 import java.text.DecimalFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.util.*;
 
 import java.util.*;
 
@@ -602,6 +603,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
 
 
 
     @Override
 
     @Override
 
     public String monthlyReportExport(String deviceCode, String startTime, String endTime, int cycle) {
 
     public String monthlyReportExport(String deviceCode, String startTime, String endTime, int cycle) {
 
+        DateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
         try {
 
         try {
 
@@ -613,7 +615,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
 
                         return new ArrayList<>(BeanMapperUtils.mapList(listOne, HtAnalogDataOneVo.class, HtAnalogDataTwoExportVo.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(listOne, HtAnalogDataOneVo.class, HtAnalogDataTwoExportVo.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "用能月报", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "用能月报", dFormat.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 3 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/RtAnalogDataServiceImpl.java
View File 

@@ -30,6 +30,7 @@ import java.io.File;
 
 import java.io.FileNotFoundException;
 
 import java.io.FileNotFoundException;
 
 import java.io.FileOutputStream;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
+import java.text.DateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.util.*;
 
 import java.util.*;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -840,6 +841,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
 
 
     @Override
 
     @Override
 
     public String DataReportExport(Integer siteId, Date startTime, Date endTime, String queryType) {
 
     public String DataReportExport(Integer siteId, Date startTime, Date endTime, String queryType) {
 
+        DateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
 
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
@@ -1083,7 +1085,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
             workbook = ExcelExportUtil.exportExcel(params, colList, list);
 
             workbook = ExcelExportUtil.exportExcel(params, colList, list);
 
 
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "数据报表", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "数据报表", dFormat.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 4 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/SitedtlServiceImpl.java
View File 

@@ -26,6 +26,8 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 
 import java.io.File;
 
 import java.io.FileOutputStream;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
+import java.text.DateFormat;
 
+import java.text.SimpleDateFormat;
 
 import java.util.ArrayList;
 
 import java.util.ArrayList;
 
 import java.util.Date;
 
 import java.util.Date;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -74,6 +76,7 @@ public class SitedtlServiceImpl extends AbstractCrudService<SitedtlMapper, Sited
 
 
 
     @Override
 
     @Override
 
     public String variableListExport(Integer siteId, String electricTestOverdue) {
 
     public String variableListExport(Integer siteId, String electricTestOverdue) {
 
+        DateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
         try {
 
         try {
 
@@ -85,7 +88,7 @@ public class SitedtlServiceImpl extends AbstractCrudService<SitedtlMapper, Sited
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), SitedtlVo.class, SitedtlExportVO.class));
 
                         return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), SitedtlVo.class, SitedtlExportVO.class));
 
                     }, null);
 
                     }, null);
 
             if (null != workbook) {
 
             if (null != workbook) {
 
-                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "现场档案", System.currentTimeMillis() + ""));
 
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "现场档案", dFormat.format(System.currentTimeMillis()) + ""));
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileUtils.createFile(file.getAbsolutePath());
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
 
                 workbook.write(allListingFileOutputStream);
 
                 workbook.write(allListingFileOutputStream);

+ 1 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/WcBlackoutPlanServiceImpl.java
View File 

@@ -100,7 +100,7 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
 
 
 
     @Override
 
     @Override
 
     public String outagePlanListExport(String startTime, String endTime, Integer type) {
 
     public String outagePlanListExport(String startTime, String endTime, Integer type) {
 
-        DateFormat dFormat = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");
 
+        DateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Workbook workbook = null;
 
         Workbook workbook = null;
 
         File file = null;
 
         File file = null;
 
         try {
 
         try {