From 3132156c58a9775bde9b2b69155cb41daccbff55 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:41:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index 35189406b9..a4cd1d67cc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -148,9 +148,6 @@ AND CREATED_TIME <= #{endTime} - - AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') - order by CREATED_TIME desc From 271d931e8c1216cf4ed6369710900c922c9ef96a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:47:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B0=B1=E6=98=AF=E8=BF=99=E6=A0=B7?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml index a4cd1d67cc..35189406b9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml @@ -148,6 +148,9 @@ AND CREATED_TIME <= #{endTime} + + AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') + order by CREATED_TIME desc From 53f3030915812e8f13a7004a1cf5db144065f100 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 16:18:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=8F=AA=E4=B8=8B?= =?UTF-8?q?=E6=94=BE=E4=B8=80=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index 9d8d52149f..5e9a7442d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -707,7 +707,7 @@ public class DhDeviceUtil { cardFormDTO.setCategory("0"); cardFormDTO.setCardStatus("ACTIVE"); cardFormDTO.setStartDate(LocalDate.now().toString()); - cardFormDTO.setEndDate(LocalDate.now().plusDays(180L).toString()); + cardFormDTO.setEndDate(LocalDate.now().toString()); String pwd; try { pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456"); From 19a36dc873f29db622f8a74893c5dcd43c5b5c9a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 16:24:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=BD=E6=9D=BE=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/util/dh/DhDeviceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java index 5e9a7442d2..89cb0bf770 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java @@ -816,7 +816,7 @@ public class DhDeviceUtil { DataInputStream dataInputStream = new DataInputStream(url.openStream()); byte[] originBytes = toByteArray(dataInputStream); - fileBytes = compressPicCycle(originBytes, 100L, 0.1); + fileBytes = compressPicCycle(originBytes, 100L, 0.2); } catch (IOException e) { logger.error("图片上传异常", e); throw new RenException("图片上传异常");