From 52ee403187fa60f1e5e75b0c3d0b40321723f034 Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Thu, 21 Mar 2024 10:00:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=20=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=8F=9C=E5=8D=95119=E7=89=88=E6=9C=ACIOS=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=91=E7=A5=A8=E4=BB=A5=E5=8F=8A=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 8 +++++--- .../platform/mapper/BankCodeSxfMapper.java | 7 +++++++ .../src/main/resources/application-dev.yml | 20 +++++++++---------- .../platform/enums/DeviceOperateType.java | 2 +- .../platform/impl/AppMenuServiceImpl.java | 18 ++++++++--------- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/pluss-api-page/src/main/resources/application-dev.yml b/pluss-api-page/src/main/resources/application-dev.yml index bc09a82..3294d5f 100644 --- a/pluss-api-page/src/main/resources/application-dev.yml +++ b/pluss-api-page/src/main/resources/application-dev.yml @@ -9,11 +9,13 @@ spring: username: ysk_test password: mysqlroot@123 driver-class-name: com.mysql.jdbc.Driver + # datasource: -# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 -# username: ysk_test -# password: CZGmysqlroot@123 +# url: jdbc:mysql://101.37.12.135:3306/testchao?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# username: testchao +# password: 2HzbCB3SHM2pWXWT # driver-class-name: com.mysql.jdbc.Driver + parameter: ### 这个根据自己的情况配置 domain: https://admintestapi.sxczgkj.cn diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java index 5a69480..855ac01 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java @@ -1,8 +1,11 @@ package cn.pluss.platform.mapper; import cn.pluss.platform.entity.BankCodeSxf; +import cn.pluss.platform.entity.BankCodeYs; import cn.pluss.platform.leshua.BankNameVO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import lombok.val; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,4 +13,8 @@ import java.util.List; public interface BankCodeSxfMapper extends BaseMapper { List getBranchName(@Param(value="areaCode")String areaCode, @Param(value="provinceCode")String provinceCode, @Param(value="bankName")String bankName, @Param(value="branchName")String branchName); + default BankCodeSxf selectByContactLine(String contactLine) { + val qWrapper = new LambdaQueryWrapper().eq(BankCodeSxf::getCnapsCode, contactLine); + return selectOne(qWrapper); + } } diff --git a/pluss-manage-page/src/main/resources/application-dev.yml b/pluss-manage-page/src/main/resources/application-dev.yml index 6bc811b..ea7634b 100644 --- a/pluss-manage-page/src/main/resources/application-dev.yml +++ b/pluss-manage-page/src/main/resources/application-dev.yml @@ -12,16 +12,16 @@ spring: # password: prodCZGmysqlroot@123 # driver-class-name: com.mysql.jdbc.Driver # #新 - datasource: - url: jdbc:mysql://rm-bp1uo9iq250st2e691o.mysql.rds.aliyuncs.com.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: prodCZGmysqlroot@123 - driver-class-name: com.mysql.jdbc.Driver -# datasource: -# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 -# username: ysk_test -# password: CZGmysqlroot@123 -# driver-class-name: com.mysql.jdbc.Driver +# datasource: +# url: jdbc:mysql://rm-bp1uo9iq250st2e691o.mysql.rds.aliyuncs.com.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# username: root +# password: prodCZGmysqlroot@123 +# driver-class-name: com.mysql.jdbc.Driver + datasource: + url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + username: ysk_test + password: mysqlroot@123 + driver-class-name: com.mysql.jdbc.Driver logging: config: classpath:log4j2-dev.xml diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java index e94562c..0bdb659 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java @@ -42,6 +42,6 @@ public enum DeviceOperateType { return ot.getName(); } } - return ""; + return "virtual"; } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java index d73b81a..9e6ecad 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java @@ -49,8 +49,8 @@ public class AppMenuServiceImpl extends ServiceImpl impl @Override public List> getHomeMenu(HttpServletRequest request) { // 1、安卓; 2、iOS - //int clientType = HttpUtils.isIOS(request)? 2: 1; - int clientType = HttpUtils.phoneType(request)?2:1; + int clientType = HttpUtils.isIOS(request)? 2: 1; +// int clientType = HttpUtils.phoneType(request)?2:1; final String demoFlag = request.getHeader("demo"); List> result = new ArrayList<>(); @@ -71,13 +71,13 @@ public class AppMenuServiceImpl extends ServiceImpl impl Map map = null; for (AppMenu appMenu : appMenuList) { - if (StringUtils.isNotBlank(version)){ - if ("119".equals(version) && clientType==2){ - if (appMenu.getId()==62 || appMenu.getId()==18){ - break; - } - } - } +// if (StringUtils.isNotBlank(version)){ +// if ("119".equals(version) && clientType==2){ +// if (appMenu.getId()==62 || appMenu.getId()==18){ +// break; +// } +// } +// } AppMenu.wrapper(appMenu); menuPathConvert(appMenu, request); if (map == null || !map.get("type").equals(appMenu.getMenuGroupDesc())) {