From 8d0f3d3eeb27e045d179c26aa1bad1d48c6e9936 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Jul 2020 16:29:41 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E5=AF=BC?= =?UTF-8?q?=E8=A7=88=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=BD=91=E6=A0=BC=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0=E4=B8=BA=EF=BC=9A?= =?UTF-8?q?=E4=B8=8A=E4=B8=A4=E7=BA=A7=E6=9C=BA=E5=85=B3=E5=90=8D=E7=A7=B0?= =?UTF-8?q?-=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0=EF=BC=88=E8=8B=A5?= =?UTF-8?q?=E6=97=A0=E4=B8=8A=E4=B8=A4=E7=BA=A7=E5=8F=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=EF=BC=89=EF=BC=8C=E6=90=9C=E7=B4=A2=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=9F=8E=E5=B8=82=E6=8C=87=E5=AE=9A=E5=8C=BA=E7=9A=84?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E5=9F=8E=E5=B8=82=E4=B8=8B=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=BB=A5=E5=8F=8A=E8=BF=99=E4=B8=AA=E5=9F=8E?= =?UTF-8?q?=E5=B8=82=E6=89=80=E5=B1=9E=E7=9C=81=E4=BB=BD=E7=9A=84=E7=9B=B4?= =?UTF-8?q?=E5=B1=9E=E7=BD=91=E6=A0=BC=EF=BC=8C=E6=8E=92=E5=BA=8F=E4=B8=BA?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E7=9A=84=E5=9C=A8=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=9F=8E=E5=B8=82=E5=85=B6=E4=BB=96=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=9C=A8=E4=B8=8B=EF=BC=8C=E7=9C=81=E7=9B=B4?= =?UTF-8?q?=E5=B1=9E=E5=9C=A8=E6=9C=80=E4=B8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/ListCustomerGridFormDTO.java | 2 +- .../service/impl/CustomerGridServiceImpl.java | 8 +- .../main/resources/mapper/CustomerGridDao.xml | 151 ++++++++++++------ 3 files changed, 108 insertions(+), 53 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java index 78aa62fd80..21a790fe39 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java @@ -29,7 +29,7 @@ public class ListCustomerGridFormDTO implements Serializable{ * 当前页 * */ @Min(value = 1) - private Integer pageNo; + private Integer pageNo = 1; /** * 每页显示数量 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 00436e9b59..e88c1ebaa5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -149,9 +149,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl map = new HashMap<>(); - + //地区码格式 六位 [abcxyz] + //ab代表省 + //cx代表市 + //yz代表区 map.put("areaCode",areaCode); - map.put("cityCode",areaCode.substring(0,areaCode.length()-NumConstant.FOUR)); + map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR)); + map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO)); map.put("pageSize",listCustomerGridFormDTO.getPageSize()); map.put("pageNo",listCustomerGridFormDTO.getPageNo()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 11744f7f5a..5944b91291 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -30,69 +30,120 @@ + + + + ) - - From a64494b954509664ff2ed4feba92295441600f99 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Jul 2020 16:45:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?gov-org=20=E7=89=88=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 03baf78da2..78274f2513 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.69 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.70 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index bab4db384b..3f50796a77 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.69 + 0.3.70 com.epmet gov-org From 5b42fcb04d7aa31b20e2227a0513ec80ff508fe5 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Jul 2020 17:03:50 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BD=91=E6=A0=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 4 ++-- .../src/main/resources/mapper/CustomerGridDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index e88c1ebaa5..505114f8b0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -154,8 +154,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl #{areaCode} ]]> From 8c0419957972c580496e5a27c0604a105d67fad9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 17:06:04 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ProjectProcessServiceImpl.java | 2 +- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 35dd398187..a77a0e1b37 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -253,7 +253,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl{ if (ts.getAgencyId().equals(agency.getId())) { entity.setCustomerId(agency.getCustomerId()); - entity.setOrgIdPath(agency.getPids()+":"+agency.getId()); + entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId()); entity.setDepartmentName(agency.getOrganizationName()); } }); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 04b94c2676..28b2e71720 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -579,7 +579,7 @@ public class ProjectServiceImpl extends BaseServiceImpl { if (ts.getAgencyId().equals(agency.getId())) { entity.setCustomerId(agency.getCustomerId()); - entity.setOrgIdPath(agency.getPids() + ":" + agency.getId()); + entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId()); entity.setDepartmentName(agency.getOrganizationName()); } }); From 32710285a20975ab6b57c22745b6b13e6e8e1732 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Jul 2020 17:06:10 +0800 Subject: [PATCH 05/11] =?UTF-8?q?gov-org=E7=89=88=E6=9C=AC+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 78274f2513..9206f1eff0 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.70 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.71 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 3f50796a77..cb2f82b289 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.70 + 0.3.71 com.epmet gov-org From 8a7bce95e1298268636bdf16249aea5e4829e29c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 17:17:26 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=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-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 49618bb054..9507e5813b 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.34 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.35 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index c875f96cb2..08bbcf4174 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.34 + 0.3.35 gov-project com.epmet From 9820c353e90842ecf7a001d850f4b1ba8460fc51 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 17:47:19 +0800 Subject: [PATCH 07/11] =?UTF-8?q?auth=E7=89=88=E6=9C=AC=E5=8F=B7+1:?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3getresiwxphone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../src/main/java/com/epmet/controller/LoginController.java | 1 - .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index c3c7bc3879..77aaf19751 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.31 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.32 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index f838c1ed6a..a168410482 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.31 + 0.3.32 com.epmet epmet-cloud diff --git a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java index 46b9e6aedc..45c8950d9c 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java @@ -108,7 +108,6 @@ public class LoginController { **/ @PostMapping("getresiwxphone") public Result getResiWxPhone(@RequestBody ResiWxPhoneFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class); String phone = loginService.getResiWxPhone(formDTO); if (StringUtils.isNotBlank(phone) && !"null".equals(phone)) { return new Result().ok(phone); diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index 905061cf81..d9add0da70 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.*; @@ -135,6 +136,7 @@ public class LoginServiceImpl implements LoginService { public String getResiWxPhone(ResiWxPhoneFormDTO formDTO) { String phone=""; try { + ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class); WxMaService wxMaService = wxMaServiceUtils.resiWxMaService(); WxMaJscode2SessionResult wxMaJscode2SessionResult = wxMaService.jsCode2SessionInfo(formDTO.getWxCode()); WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(wxMaJscode2SessionResult.getSessionKey(), @@ -146,6 +148,9 @@ public class LoginServiceImpl implements LoginService { } catch (WxErrorException e) { e.printStackTrace(); log.error(String.format("获取用户微信绑定的手机号接口异常")); + } catch(Exception e){ + e.printStackTrace(); + log.error(String.format("获取用户微信绑定的手机号接口异常")); } return phone; } From 9902b132b2157df4b06cae726364d397a8f6f5f8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 18:21:14 +0800 Subject: [PATCH 08/11] =?UTF-8?q?auth=E7=89=88=E6=9C=AC=E5=8F=B7+1:getresi?= =?UTF-8?q?wxphone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 77aaf19751..6f73ac7c45 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.32 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.33 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index a168410482..5497f910ac 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.32 + 0.3.33 com.epmet epmet-cloud diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index d9add0da70..7376af2fd5 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -147,10 +147,10 @@ public class LoginServiceImpl implements LoginService { } } catch (WxErrorException e) { e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常")); + log.error(String.format("获取用户微信绑定的手机号接口异常",e)); } catch(Exception e){ e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常")); + log.error(String.format("获取用户微信绑定的手机号接口异常",e)); } return phone; } From 940a0b8e4dc52f19ab9c4911219113e8e079b94d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 18:30:08 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9C=8B=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=BC=95=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?= =?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/project/ProjectDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index 5f78474374..108f2add31 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -9,11 +9,11 @@ agency_id AS "agencyId", project_total AS "projectTotal", DATE_FORMAT(date_id, '%Y.%m.%d') AS "dateName", - pending_total AS "pendingTotal", + IFNULL(pending_total,0) AS "pendingTotal", /*CAST(pending_ratio AS DECIMAL (9, 2)) AS "pendingRatioInt",*/ - pending_ratio AS "pendingRatioInt", - closed_total AS "closedTotal", - closed_ratio AS "closedRatioInt" + IFNULL(pending_ratio,0) AS "pendingRatioInt", + IFNULL(closed_total,0) AS "closedTotal", + IFNULL(closed_ratio,0) AS "closedRatioInt" FROM fact_agency_project_daily WHERE From af5f1d0d638425be94435e31dcaf67b0b8cb5c41 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 18:30:36 +0800 Subject: [PATCH 10/11] =?UTF-8?q?auth=E7=89=88=E6=9C=AC=E5=8F=B7+1:getresi?= =?UTF-8?q?wxphone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 6f73ac7c45..e44f8aaed5 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.33 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.34 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 5497f910ac..c59ae27d7b 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.33 + 0.3.34 com.epmet epmet-cloud diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index 7376af2fd5..695c187105 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -147,10 +147,10 @@ public class LoginServiceImpl implements LoginService { } } catch (WxErrorException e) { e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常",e)); + log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage())); } catch(Exception e){ e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常",e)); + log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage())); } return phone; } From 655db7332c05790c77d5236cad66756047ec39eb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 18:33:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9C=8B=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=BC=95=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index 498f28a728..3d87107f55 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.22 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.23 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 2e9a82b4bd..b585d39d7a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.22 + 0.3.23 data-report-server