From c2ca2f2fe19df586480e262c8a9d49a6f25f8482 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 May 2020 10:50:33 +0800 Subject: [PATCH 01/14] =?UTF-8?q?130=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=9Aopercustomize=E5=86=85=E5=AE=B9=EF=BC=9A=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=BB=84=E4=BB=B6=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml index 68c8c5089d..1fb2472591 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.19 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.20 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index dc07b4481f..2a176086d6 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.19 + 0.3.20 com.epmet oper-customize From 1b896130abcfb1f18622541094222eb74abc7dcb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 May 2020 10:53:31 +0800 Subject: [PATCH 02/14] =?UTF-8?q?130=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=9Agovissue=E5=86=85=E5=AE=B9=EF=BC=9A=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8A=98=E7=BA=BF=E5=9B=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index d73b60bc06..1e3f363dcd 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.37 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.38 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index ec71d9f02d..03ea9da1c4 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.37 + 0.3.38 gov-issue com.epmet From a78c21a4938c9935a2485fd64ee797e91ac0138c Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 28 May 2020 11:41:17 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E3=80=81=E8=AE=AE=E9=A2=98=E6=9C=8D=E5=8A=A1=E3=80=81=E5=85=9A?= =?UTF-8?q?=E5=91=98=E8=AE=A4=E8=AF=81=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index d73b60bc06..1e3f363dcd 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.37 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.38 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index ec71d9f02d..03ea9da1c4 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.37 + 0.3.38 gov-issue com.epmet diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index f820338531..10269ea017 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.46 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.47 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 9a12767061..0356c3aab3 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.46 + 0.3.47 com.epmet resi-group diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index dfadced3f4..b191a1409b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.39 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.40 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index e4d087564e..e89366c3fa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.39 + 0.3.40 com.epmet resi-partymember From 02accb0df559fad25ebf8826a0d2793543d06f2c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 May 2020 12:11:43 +0800 Subject: [PATCH 04/14] =?UTF-8?q?130=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=9Aresiparty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index b191a1409b..a6893c8b5a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.40 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.41 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index e89366c3fa..d9700f5d90 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.40 + 0.3.41 com.epmet resi-partymember From 90b7b473c8fa612691fd16992885f262f5e6df8a Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 28 May 2020 12:29:46 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index a6893c8b5a..aee72d5645 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.41 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.42 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index d9700f5d90..aca8ce68fa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.41 + 0.3.42 com.epmet resi-partymember From 40342103a0fea7316acfb0e0cfdf40de1209cee1 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 28 May 2020 12:39:30 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=BA=94=E8=A1=A8=E5=86=B3=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 192d643add..5b9c922520 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -313,7 +313,7 @@ From 9f1dc10166812a12fc20603a85ddc86b80754fe0 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 May 2020 15:41:30 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 1e38a0f82d..0045187e5c 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.48 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.49 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 4d26b50fcb..3e11f79724 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.48 + 0.3.49 com.epmet resi-group From 7e338326644a172988f809dc10d7fb3c81392e06 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 28 May 2020 16:38:06 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=BB=84=E5=91=98=E8=BF=9B=E7=BB=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/redis/ResiGroupRedis.java | 27 ------------------- .../impl/ResiGroupStatisticalServiceImpl.java | 4 +-- .../impl/ResiGroupMemberServiceImpl.java | 7 ++--- .../mapper/member/ResiGroupMemberDao.xml | 6 ++--- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java index e2d19f2a03..7f2442a8e7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java @@ -99,33 +99,6 @@ public class ResiGroupRedis { List statisticalMySql = statisticalService.list(param); if(null != statisticalMySql && statisticalMySql.size() >= 1){ if(statisticalMySql.size() > 1){ - /* - Collections.sort(statisticalMySql, new Comparator() { - @Override - public int compare(ResiGroupStatisticalDTO o1, ResiGroupStatisticalDTO o2) { - if(null != o1.getCreatedTime() && null != o2.getCreatedTime()){ - return - o1.getCreatedTime().getTime() > o2.getCreatedTime().getTime() ? - -1 : (o1.getCreatedTime().getTime() == o2.getCreatedTime().getTime() ? - 0: 1); - }else{ - return 0; - } - } - }); - - statisticalMySql.sort((ResiGroupStatisticalDTO o1, ResiGroupStatisticalDTO o2) -> - o1.getCreatedTime().compareTo(o2.getCreatedTime()) - ); - //升序 - statisticalMySql.sort(Comparator.comparing(e -> e.getCreatedTime())); - - statisticalMySql.sort(Comparator.comparing(ResiGroupStatisticalDTO :: getCreatedTime, - (o1 , o2) -> { - return o2.compareTo(o 1); - })); - */ - //按照createdTime降序排序 statisticalMySql.sort(Comparator.comparing(ResiGroupStatisticalDTO :: getCreatedTime, Collections.reverseOrder())); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java index 51712abbcf..7d66e78a9a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java @@ -97,8 +97,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - wrapper.eq(StringUtils.isNotBlank((String)params.get(ModuleConstant.RESI_GROUP_ID_CAMEL)),ModuleConstant.RESI_GROUP_ID,params.get(ModuleConstant.RESI_GROUP_ID_CAMEL)); - wrapper.eq(StringUtils.isNotBlank((String)params.get(FieldConstant.DEL_FLAG_HUMP)),FieldConstant.DEL_FLAG,params.get(FieldConstant.DEL_FLAG_HUMP)); + wrapper.eq(StringUtils.isNotBlank((String)params.get(ModuleConstant.RESI_GROUP_ID)),ModuleConstant.RESI_GROUP_ID,params.get(ModuleConstant.RESI_GROUP_ID)); + wrapper.eq(StringUtils.isNotBlank((String)params.get(FieldConstant.DEL_FLAG)),FieldConstant.DEL_FLAG,params.get(FieldConstant.DEL_FLAG)); return wrapper; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index b0a3192d2c..b5c544f012 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -400,8 +400,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl - + UPDATE resi_group_statistical rgs SET rgs.TOTAL_MEMBERS = rgs.TOTAL_MEMBERS + 1, rgs.TOTAL_NORMAL_MEMEBERS = rgs.TOTAL_NORMAL_MEMEBERS + 1 - + ,rgs.TOTAL_PARTY_MEMBERS = rgs.TOTAL_PARTY_MEMBERS + 1 - + ,rgs.TOTAL_EARNEST_MEMEBERS = rgs.TOTAL_EARNEST_MEMEBERS + 1 WHERE From 0de8677f0440fdbe046887c9c679a523f00d981c Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 28 May 2020 16:44:46 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 0045187e5c..aced345d78 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.49 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.50 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 3e11f79724..4a95c08678 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.49 + 0.3.50 com.epmet resi-group From 4d6f51294c63be0744cd22966e2a9f4b92d71068 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 28 May 2020 16:53:48 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IssueVoteStatisticalServiceImpl.java | 20 ++++--------------- .../mapper/IssueVoteStatisticalDao.xml | 4 ++-- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index bb94a9a620..8878391a99 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -187,27 +187,15 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl SELECT UNIX_TIMESTAMP(statistical_date) AS voteDate, - support_increment AS supportIncrement, - opposition_increment AS oppositionIncrement + support_count AS supportIncrement, + opposition_count AS oppositionIncrement FROM issue_vote_statistical_daily WHERE From 8513e069ead876a002a4a39693a501f9e59735d0 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 28 May 2020 17:00:54 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 1e3f363dcd..7793226035 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.38 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.39 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 03ea9da1c4..911e585db5 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.38 + 0.3.39 gov-issue com.epmet From a9b5d23d62ab8b76e68f30a1b1d37794c9c8de96 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 May 2020 17:15:20 +0800 Subject: [PATCH 14/14] =?UTF-8?q?resiMyselfMsg:=E6=94=B9=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/UserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 2ca7b26fc4..3909ab2c2a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -152,7 +152,7 @@ public class UserServiceImpl extends BaseServiceImpl implem result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()) ? true : false); result.setRegisterGridName(ModuleConstant.EMPTY_STR); if(StringUtils.isNotBlank(myselfMsg.getGridId())){ - //registerGridName 首次注册的网格 + //registerGridName 当前在哪个网格，显示哪个网格的名称 CustomerGridFormDTO gridId = new CustomerGridFormDTO(); gridId.setGridId(myResiUserInfoFormDTO.getGridId()); Result gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId);