From 3c0ccc88ffa8a651ec78a611ffe75775222ebf07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 31 Jan 2024 17:05:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-job/src/main/resources/mapper/DeviceMapper.xml | 2 +-
screen-job/src/main/java/com/moral/api/service/DeviceService.java | 2 +-
screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java | 2 +-
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 4 ++--
screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java | 14 ++++++++++++--
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java
index 3b87ff3..2c4495d 100644
--- a/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java
+++ b/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -17,5 +17,5 @@
*/
public interface DeviceMapper extends BaseMapper<Device> {
- List<DeviceExcelDTO> ListDeviceExcel(@Param("startTime") String startTime,@Param("id") int id);
+ List<DeviceExcelDTO> ListDeviceExcel(@Param("startTime") String startTime,@Param("mon") String mon,@Param("id") int id);
}
diff --git a/screen-job/src/main/java/com/moral/api/service/DeviceService.java b/screen-job/src/main/java/com/moral/api/service/DeviceService.java
index afe166d..a9fef54 100644
--- a/screen-job/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-job/src/main/java/com/moral/api/service/DeviceService.java
@@ -32,6 +32,6 @@
List<Device> getDateByOrgId(int orgId);
- List<DeviceExcelDTO> ListDeviceExcel(String startTime,String endTime,int id);
+ List<DeviceExcelDTO> ListDeviceExcel(String startTime,String mon,int id);
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 8f258a8..b7b5c69 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -77,7 +77,7 @@
}
@Override
- public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String endTime, int id) {
- return this.baseMapper.ListDeviceExcel(startTime,id);
+ public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String mon, int id) {
+ return this.baseMapper.ListDeviceExcel(startTime,mon,id);
}
}
\ No newline at end of file
diff --git a/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java b/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
index d94153b..95e354b 100644
--- a/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
@@ -38,8 +38,10 @@
@XxlJob("emilTask")
public void emilTask()throws IOException {
- String startTime = DateUtils.dateToDateString(DateUtils.addDays(new Date(),-1),DateUtils.yyyy_MM_dd_EN);
- List<DeviceExcelDTO> list = deviceService.ListDeviceExcel(startTime,null,72);
+ Date date = DateUtils.addDays(new Date(),-1);
+ String startTime = DateUtils.dateToDateString(date,DateUtils.yyyy_MM_dd_EN);
+ String mon = DateUtils.dateToDateString(date,DateUtils.yyyyMM_EN);
+ List<DeviceExcelDTO> list = deviceService.ListDeviceExcel(startTime,mon,72);
String path = System.getProperty("user.dir")+"/";
String fileName = String.format("%s������������������-%s.xlsx",path,startTime);
ByteArrayOutputStream out = null;
@@ -64,4 +66,12 @@
}
log.info("������������������");
}
+
+ public static void main(String[] args) {
+ Date date = DateUtils.addDays(new Date(),+1);
+ String startTime = DateUtils.dateToDateString(date,DateUtils.yyyy_MM_dd_EN);
+ String mon = DateUtils.dateToDateString(date,DateUtils.yyyyMM_EN);
+ System.out.println(startTime);
+ System.out.println(mon);
+ }
}
diff --git a/screen-job/src/main/resources/mapper/DeviceMapper.xml b/screen-job/src/main/resources/mapper/DeviceMapper.xml
index 762cfa8..359ec1b 100644
--- a/screen-job/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-job/src/main/resources/mapper/DeviceMapper.xml
@@ -42,7 +42,7 @@
cast( t1.`value` -> '$.a99054' AS DOUBLE ) AS a99054
FROM
device t
- LEFT JOIN history_minutely_202401 t1 ON t1.mac = t.mac
+ LEFT JOIN history_minutely_${mon} t1 ON t1.mac = t.mac
WHERE
t.organization_id = #{id}
AND date(t1.time) <![CDATA[=]]> #{startTime}
--
Gitblit v1.8.0