From c0d3be77cb5b6769986b1625644dbf3dc287a586 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 10 八月 2023 15:52:42 +0800
Subject: [PATCH] 优化自动推送查询
---
src/main/java/com/fzzy/push/impl/ComPushService12.java | 22 +++---
src/main/java/com/fzzy/api/view/repository/Api1201Rep.java | 6 +
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java | 7 +-
src/main/java/com/fzzy/api/view/repository/Api1210Rep.java | 7 +-
src/main/java/com/fzzy/api/view/repository/Api1204Rep.java | 6 +
src/main/java/com/fzzy/api/view/repository/Api1211Rep.java | 7 +
src/main/java/com/fzzy/api/view/repository/Api1303Rep.java | 5 +
src/main/java/com/fzzy/api/view/repository/Api1310Rep.java | 6 +
src/main/java/com/fzzy/api/view/repository/Api1208Rep.java | 7 +-
src/main/java/com/fzzy/push/impl/ComPushService13.java | 8 +-
src/main/java/com/fzzy/api/view/repository/Api1212Rep.java | 5 +
src/main/java/com/fzzy/api/view/repository/Api1209Rep.java | 7 +-
src/main/java/com/fzzy/api/view/repository/Api1203Rep.java | 7 +-
src/main/java/com/fzzy/api/view/repository/Api1302Rep.java | 6 +
src/main/java/com/fzzy/api/view/repository/Api1404Rep.java | 6 +
src/main/java/com/fzzy/api/view/repository/Api1205Rep.java | 8 +-
src/main/java/com/fzzy/api/view/repository/Api1304Rep.java | 6 +
src/main/java/com/fzzy/api/view/repository/Api1403Rep.java | 6 +
src/main/java/com/fzzy/push/impl/ComPushService14.java | 4
src/main/java/com/fzzy/api/view/repository/Api1207Rep.java | 6 +
src/main/resources/application-dev.yml | 8 +-
src/main/java/com/fzzy/api/view/repository/Api1206Rep.java | 7 +-
22 files changed, 93 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
index 68fe964..f53e26f 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
@@ -1,14 +1,13 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1201;
-import com.fzzy.api.entity.Api1202;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
@@ -25,4 +24,7 @@
@Query("from Api1201 where hth=:hth ")
List<Api1201> getDataById(@Param("hth") String hth);
+
+ @Query("from Api1201 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1201> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
index 1a0442a..00dcda7 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
@@ -1,16 +1,12 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1202;
-
-import com.fzzy.api.entity.Api1208;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
-import javax.xml.crypto.Data;
import java.util.Date;
import java.util.List;
@@ -30,4 +26,7 @@
@Query("from Api1202 where cmsj>:start and cmsj<:end")
List<Api1202> getDataByTime(@Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Api1202 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1202> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
index 2813adc..7148de2 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
@@ -1,15 +1,13 @@
package com.fzzy.api.view.repository;
-import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1203;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
-
import javax.transaction.Transactional;
+import java.util.Date;
import java.util.List;
@@ -25,4 +23,7 @@
@Query("from Api1203 where rkjydh=:rkjydh ")
List<Api1203> getDataById(@Param("rkjydh") String rkjydh);
+
+ @Query("from Api1203 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1203> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
index 0083510..f7eb291 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
@@ -1,14 +1,13 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1204;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
@@ -21,4 +20,7 @@
@Modifying
@Query("update Api1204 set czbz =:czbz where rkjsdh=:rkjsdh")
void updateStatus(@Param("rkjsdh") String rkjsdh, @Param("czbz") String czbz);
+
+ @Query("from Api1204 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1204> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
index 40e081f..f2e1b1e 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
@@ -1,16 +1,13 @@
package com.fzzy.api.view.repository;
-
-import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1205;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
@@ -26,4 +23,7 @@
@Query("from Api1205 where ckywdh=:ckywdh ")
List<Api1205> getDataById(@Param("ckywdh") String ckywdh);
+
+ @Query("from Api1205 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1205> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
index 5c82974..5f9b6b1 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
@@ -1,16 +1,14 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1206;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1206Rep extends JpaRepository<Api1206, String>, JpaSpecificationExecutor<Api1206> {
@@ -21,4 +19,7 @@
@Modifying
@Query("update Api1206 set czbz =:czbz where ckjsdh=:ckjsdh")
void updateStatus(@Param("ckjsdh") String ckjsdh, @Param("czbz") String czbz);
+
+ @Query("from Api1206 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1206> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1207Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1207Rep.java
index 38b1075..d78be5e 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1207Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1207Rep.java
@@ -1,14 +1,13 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1207;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
@@ -21,4 +20,7 @@
@Modifying
@Query("update Api1207 set czbz =:czbz where dcdh=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1207 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1207> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java
index d3e47e2..9a4d156 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java
@@ -1,16 +1,14 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1208;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1208Rep extends JpaRepository<Api1208, String>, JpaSpecificationExecutor<Api1208> {
@@ -27,4 +25,7 @@
@Query("from Api1208 where hwdm=:hwdm ")
List<Api1208> getDataByHwdm(@Param("hwdm") String hwdm);
+
+ @Query("from Api1208 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1208> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java
index 2beaeb9..2c1301b 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java
@@ -1,16 +1,14 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1209;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1209Rep extends JpaRepository<Api1209, String>, JpaSpecificationExecutor<Api1209> {
@@ -24,4 +22,7 @@
@Query("from Api1209 where sydh=:sydh ")
List<Api1209> getDataBySydh(@Param("sydh") String sydh);
+
+ @Query("from Api1209 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1209> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java
index 15045de..6cd45ab 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java
@@ -1,16 +1,14 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1210;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1210Rep extends JpaRepository<Api1210, String>, JpaSpecificationExecutor<Api1210> {
@@ -21,4 +19,7 @@
@Modifying
@Query("update Api1210 set czbz =:czbz where lsxzzbdh=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1210 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1210> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1211Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1211Rep.java
index 7e511b6..7b4a244 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1211Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1211Rep.java
@@ -1,18 +1,21 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1211;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
+import java.util.List;
public interface Api1211Rep extends JpaRepository<Api1211, Integer>, JpaSpecificationExecutor<Api1211> {
@Transactional
@Modifying
@Query("update Api1211 set czbz =:czbz where id=:id")
void updateStatus(@Param("id") Integer id, @Param("czbz") String czbz);
+
+ @Query("from Api1211 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1211> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1212Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1212Rep.java
index be14ba5..871d4fc 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1212Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1212Rep.java
@@ -7,8 +7,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
-
public interface Api1212Rep extends JpaRepository<Api1212, String>, JpaSpecificationExecutor<Api1212> {
@@ -19,4 +19,7 @@
@Query("from Api1212 where id=:id ")
List<Api1212> getDataById(@Param("id") String id);
+
+ @Query("from Api1212 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1212> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java
index 4131c9e..a394534 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java
@@ -7,9 +7,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1302Rep extends JpaRepository<Api1302, String>, JpaSpecificationExecutor<Api1302> {
@@ -24,4 +23,7 @@
@Query("from Api1302 where wsdjcdh=:wsdjcdh ")
List<Api1302> getDataByWsdjcdh(@Param("wsdjcdh") String wsdjcdh);
+
+ @Query("from Api1302 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1302> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
index 9426930..6933ba7 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
@@ -7,7 +7,7 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
@@ -23,4 +23,7 @@
@Query("from Api1303 where hcjcdh=:hcjcdh ")
List<Api1303> getDataByHcjcdh(@Param("hcjcdh") String hcjcdh);
+
+ @Query("from Api1303 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1303> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java
index b88879a..cf5177a 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java
@@ -7,9 +7,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1304Rep extends JpaRepository<Api1304, String>, JpaSpecificationExecutor<Api1304> {
@@ -24,4 +23,7 @@
@Query("from Api1304 where qtndjcdh=:qtndjcdh ")
List<Api1304> getDataByQtndjcdh(@Param("qtndjcdh") String qtndjcdh);
+
+ @Query("from Api1304 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1304> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
index 77397db..0ef3998 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
@@ -7,9 +7,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1310Rep extends JpaRepository<Api1310, String>, JpaSpecificationExecutor<Api1310> {
@@ -24,4 +23,7 @@
@Query("from Api1310 where zjbgdh=:zjbgdh ")
List<Api1310> getDataByZjbgdh(@Param("zjbgdh") String zjbgdh);
+
+ @Query("from Api1310 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1310> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java
index 66383b8..e6ccd3d 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java
@@ -7,9 +7,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1403Rep extends JpaRepository<Api1403, String>, JpaSpecificationExecutor<Api1403> {
@@ -23,4 +22,7 @@
@Query("from Api1403 where lhjhdh=:lhjhdh ")
List<Api1403> getDataByLhjhdh(@Param("lhjhdh") String lhjhdh);
+
+ @Query("from Api1403 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1403> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
index 1504874..28d1c37 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
@@ -7,9 +7,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
-
+import java.util.Date;
import java.util.List;
-
public interface Api1404Rep extends JpaRepository<Api1404, String>, JpaSpecificationExecutor<Api1404> {
@@ -27,4 +26,7 @@
@Query("from Api1404 where lhjhdh=:lhjhdh ")
List<Api1404> getDataByLhjhdh(@Param("lhjhdh") String lhjhdh);
+
+ @Query("from Api1404 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1404> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService12.java b/src/main/java/com/fzzy/push/impl/ComPushService12.java
index c4d8b12..f9e1555 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService12.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService12.java
@@ -8,7 +8,6 @@
import com.fzzy.api.view.repository.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
/**
@@ -76,7 +75,8 @@
* @param param
*/
public void pushData1201(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1201> items = api1201Rep.findPushData(param.getKqdm());
+ //鏍规嵁搴撳尯缂栫爜銆佹洿鏂版椂闂存煡璇㈠悎鍚屼俊鎭�
+ List<Api1201> items = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
@@ -105,7 +105,7 @@
* @param param
*/
public void pushData1202(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1202> items = api1202Rep.findPushData(param.getKqdm());
+ List<Api1202> items = api1202Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
}
@@ -131,7 +131,7 @@
* @param param
*/
public void pushData1203(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1203> items = api1203Rep.findPushData(param.getKqdm());
+ List<Api1203> items = api1203Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
@@ -159,7 +159,7 @@
* @param param
*/
public void pushData1204(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1204> items = api1204Rep.findPushData(param.getKqdm());
+ List<Api1204> items = api1204Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
@@ -187,7 +187,7 @@
* @param param
*/
public void pushData1205(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1205> items = api1205Rep.findPushData(param.getKqdm());
+ List<Api1205> items = api1205Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
@@ -216,7 +216,7 @@
* @param param
*/
public void pushData1206(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1206> items = api1206Rep.findPushData(param.getKqdm());
+ List<Api1206> items = api1206Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
@@ -244,7 +244,7 @@
* @param param
*/
public void pushData1207(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1207> items = api1207Rep.findPushData(param.getKqdm());
+ List<Api1207> items = api1207Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
@@ -276,7 +276,7 @@
public void pushData1208(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇鏁版嵁
- List<Api1208> items = api1208Rep.findPushData(param.getKqdm());
+ List<Api1208> items = api1208Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
@@ -305,7 +305,7 @@
* @param param
*/
public void pushData1209(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1209> items = api1209Rep.findPushData(param.getKqdm());
+ List<Api1209> items = api1209Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
}
@@ -332,7 +332,7 @@
* @param param
*/
public void pushData1210(ApiRemoteService apiRemoteService, ApiParam param) {
- List<Api1210> items = api1210Rep.findPushData(param.getKqdm());
+ List<Api1210> items = api1210Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
return;
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService13.java b/src/main/java/com/fzzy/push/impl/ComPushService13.java
index 5180e54..5301a70 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService13.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService13.java
@@ -38,7 +38,7 @@
public void pushData1302(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
- List<Api1302> items = apiRep1302.findPushData(param.getKqdm());
+ List<Api1302> items = apiRep1302.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
log.info("-------------娌℃湁绮儏鏁版嵁闇�瑕佹帹閫�-----------");
@@ -65,7 +65,7 @@
public void pushData1304(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
- List<Api1304> items = apiRep1304.findPushData(param.getKqdm());
+ List<Api1304> items = apiRep1304.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
log.info("-------------娌℃湁姘斾綋妫�娴嬫暟鎹〃闇�瑕佹帹閫�-----------");
@@ -92,7 +92,7 @@
public void pushData1303(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
- List<Api1303> items = apiRep1303.findPushData(param.getKqdm());
+ List<Api1303> items = apiRep1303.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
log.info("-------------娌℃湁铏妫�娴嬫暟鎹〃琛ㄩ渶瑕佹帹閫�-----------");
@@ -118,7 +118,7 @@
public void pushData1310(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
- List<Api1310> items = apiRep1310.findPushData(param.getKqdm());
+ List<Api1310> items = apiRep1310.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
log.info("-------------娌℃湁璐ㄦ鏁版嵁闇�瑕佹帹閫�-----------");
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService14.java b/src/main/java/com/fzzy/push/impl/ComPushService14.java
index 8195e5a..fa33ede 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService14.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService14.java
@@ -34,7 +34,7 @@
public void pushData1403(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
- List<Api1403> items = api1403Rep.findPushData(param.getKqdm());
+ List<Api1403> items = api1403Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
@@ -60,7 +60,7 @@
public void pushData1404(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
- List<Api1404> items = api1404Rep.findPushData(param.getKqdm());
+ List<Api1404> items = api1404Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
log.info("-------------娌℃湁杞崲璁″垝鏄庣粏淇℃伅闇�瑕佹帹閫�-----------");
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a98e364..cb7b865 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
datasource:
#涓绘暟鎹簮
primary:
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
@@ -23,20 +23,20 @@
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢闊跺叧
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
-# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
- url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
--
Gitblit v1.9.3