diff --git a/jeecg-module-web-statistics/pom.xml b/jeecg-module-web-statistics/pom.xml
index 3ce55b2e..c0ea9bb1 100644
--- a/jeecg-module-web-statistics/pom.xml
+++ b/jeecg-module-web-statistics/pom.xml
@@ -22,6 +22,14 @@
org.jeecgframework.boot
jeecg-boot-starter-cloud
+
+
+
+ com.google.guava
+ guava
+ 32.1.2-jre
+
+
-
\ No newline at end of file
+
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/bo/StatDataNumber.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/bo/StatDataNumber.java
new file mode 100644
index 00000000..f19eeb42
--- /dev/null
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/bo/StatDataNumber.java
@@ -0,0 +1,21 @@
+package org.jeecg.modules.entity.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StatDataNumber implements Serializable {
+
+ private int originalDataNumber = 0;
+ private int anlyseDataNumber = 0;
+
+ public void addOriginalDataNumber(int incr) {
+ originalDataNumber += incr;
+ }
+
+ public void addAnlyseDataNumber(int incr) {
+ anlyseDataNumber += incr;
+ }
+
+}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/data/OriginalDataNumber.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/data/OriginalDataNumber.java
new file mode 100644
index 00000000..5ced4908
--- /dev/null
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/data/OriginalDataNumber.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.entity.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OriginalDataNumber implements Serializable {
+
+ private String siteCode;
+ private String dataType;
+ private Integer count;
+}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java
index b7ce9d90..18339bb1 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.entity.GardsAlertDataWeb;
import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
public interface IGardsAlertDataService extends IService {
@@ -11,4 +13,6 @@ public interface IGardsAlertDataService extends IService {
String startTime,
String endTime,
HttpServletResponse response);
+
+ List queryByTime(Date startTime, Date endTime);
}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
index 986adc22..619ef012 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
@@ -7,6 +7,7 @@ import org.jeecg.modules.entity.GardsMetDataWeb;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
+import java.util.List;
public interface IGardsMetDataService extends IService {
@@ -24,4 +25,6 @@ public interface IGardsMetDataService extends IService {
String startTime,
String endTime,
HttpServletResponse response);
+
+ List queryByModDate(Date startTime, Date endTime);
}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
index 24344b55..bfe900d6 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
@@ -48,4 +48,6 @@ public interface IGardsSampleDataWebService extends IService
String startTime,
String endTime,
List sampleIds);
+
+ List queryByModDate(Date startTime, Date endTime);
}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
index 11ab0ee1..03392863 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
@@ -7,6 +7,7 @@ import org.jeecg.modules.entity.GardsSohDataWeb;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
+import java.util.List;
public interface IGardsSohDataService extends IService {
@@ -41,4 +42,7 @@ public interface IGardsSohDataService extends IService {
String startTime,
String endTime,
HttpServletResponse response);
+
+
+ List queryByModDate(Date startTime, Date endTime);
}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java
index 8f31e2a7..cc1aa8f8 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java
@@ -73,4 +73,11 @@ public class GardsAlertDataServiceImpl extends ServiceImpl queryByTime(Date startTime, Date endTime) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.between(GardsAlertDataWeb::getTime, startTime, endTime);
+ return list(queryWrapper);
+ }
}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
index 3bed3945..e6f90467 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
@@ -112,4 +112,11 @@ public class GardsMetDataServiceImpl extends ServiceImpl queryByModDate(Date startTime, Date endTime) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.between(GardsMetDataWeb::getModdate, startTime ,endTime);
+ return list(queryWrapper);
+ }
+
}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
index 04e49b1d..b70f9c96 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
@@ -709,4 +709,12 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl queryByModDate(Date startTime, Date endTime) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.between(GardsSampleDataWeb::getModdate, startTime, endTime);
+ queryWrapper.orderByAsc(GardsSampleDataWeb::getSiteDetCode);
+ return list(queryWrapper);
+ }
}
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
index 3202a0d3..fa823cf0 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.codec.language.bm.Lang;
import org.apache.poi.ss.usermodel.Workbook;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
@@ -192,4 +193,11 @@ public class GardsSohDataServiceImpl extends ServiceImpl queryByModDate(Date startTime, Date endTime) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.between(GardsSohDataWeb::getModdate, startTime, endTime);
+ return list(queryWrapper);
+ }
}