From 2dae4480e15fdcbab4d8773824d4aa92a79aa411 Mon Sep 17 00:00:00 2001 From: yangshaoping <123456> Date: Sat, 21 Mar 2020 09:27:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=89=8D=E6=AE=B5?= =?UTF-8?q?=E6=A0=87=E8=AF=86c.COMPONENT=5FFRONT=5FID,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerHomeDetailDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml index b5aac36854..2837805242 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml @@ -34,6 +34,7 @@ SELECT b.COMPONENT_ID, c.COMPONENT_NAME, + c.COMPONENT_FRONT_ID, b.REGION, b.CONFIGURATION, b.DEMO_DATA, From 33e3e6720716ffc5628bc117b3e2c79f0dfc67a3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 21 Mar 2020 10:32:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E5=AF=BC?= =?UTF-8?q?=E8=A7=88=20=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/constant/AppClientConstant.java | 28 +++++++++++++++++++ .../service/StrangerAccessRecordService.java | 2 +- .../impl/StrangerAccessRecordServiceImpl.java | 15 +++++++--- 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java new file mode 100644 index 0000000000..831d52bd91 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java @@ -0,0 +1,28 @@ +package com.epmet.commons.tools.constant; + +/** + * 公用参数常量 + */ +public interface AppClientConstant { + + /** + * app类型-居民端端 + */ + String APP_RESI = "resi"; + /** + * app类型-政府端 + */ + String APP_GOV = "gov"; + /** + * app类型-运营端 + */ + String APP_OPER = "oper"; + /** + * PC端:web + */ + String CLIENT_WEB = "web"; + /** + * 微信小程序:wxmp + */ + String CLIENT_WXMP = "wxmp"; +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java index c0c0824075..88c1d1d37d 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java @@ -106,5 +106,5 @@ public interface StrangerAccessRecordService extends BaseService getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO); + Result getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception; } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java index 5858a5b795..f65ec84d32 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java @@ -2,7 +2,9 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -178,7 +180,7 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) { + public Result getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception { //token里边有所属端 userId这些参数 前台传递customerID和gridId //1:调用epmet-user服务查询数据 新建网格记录数据 VisitedFormDTO vi = new VisitedFormDTO(); @@ -188,7 +190,7 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl res = getCustomerHomeData(formDTO.getCustomerId(),tokenDTO.getClient()); + Result res = getCustomerHomeData(formDTO.getCustomerId(),tokenDTO.getApp()); return res; } @@ -200,10 +202,15 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl getCustomerHomeData(String customerId,String clientType){ + public Result getCustomerHomeData(String customerId,String clientType) throws Exception { CustomerHomeFormDTO dto = new CustomerHomeFormDTO(); dto.setCustomerId(customerId); - dto.setClientType(clientType);//居民端 + //居民端 所以参数必须是居民端的参数 否则就是参数错误s + if (AppClientConstant.APP_RESI.equals(clientType)){//居民端 + dto.setClientType(NumConstant.ZERO_STR); + }else { + throw new Exception("参数异常，app端不是指定的居民端，请检查token信息！"); + } return operCustomizeFeignClient.getHomeReleaseByCustomer(dto); }