From 3d67e0a0a66f7e60a207d0b93595891798785c52 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Mon, 16 Jun 2025 18:03:02 +0800 Subject: [PATCH 1/7] update --- .../src/main/resources/application-pre.yml | 24 +++++++++---------- .../impl/LianLianPlatformServiceImpl.java | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 690bbf530..90f0eed99 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -8,17 +8,17 @@ spring: # redis 配置 redis: # 地址 - host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com -# host: 106.14.94.149 +# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com + host: 106.14.94.149 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 账号 - username: jsowell - # 密码 - password: js@160829 -# password: js160829 +# username: jsowell +# # 密码 +# password: js@160829 + password: js160829 # 连接超时时间 timeout: 10s lettuce: @@ -38,12 +38,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell - password: js@160829 -# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_pre -# password: Js@160829 +# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell +# password: js@160829 + url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_pre + password: Js@160829 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index b96843736..cfc300828 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -1066,15 +1066,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { orderInfo.setChargeDetails(chargeDetails); // 由于订单在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658 -/* if (orderInfo.getStationID().equals("LC149")){ + if (orderInfo.getStationID().equals("LC149")){ orderInfo.setStationID("LC658"); - }*/ + } // 正确运营商"之禾" - if(StringUtils.equals("149", orderInfo.getStationID())){ +/* if(StringUtils.equals("149", orderInfo.getStationID())){ //使用EquipmentOwnerID = MA1JLFUU8 orderInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); - } + }*/ // 获取令牌 From d3cdfe06ad419cc30d1f74abc4a9d8f63b94dfaf Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Mon, 16 Jun 2025 19:09:43 +0800 Subject: [PATCH 2/7] update --- .../src/main/resources/application-pre.yml | 24 +++++++++---------- .../impl/LianLianPlatformServiceImpl.java | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 90f0eed99..690bbf530 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -8,17 +8,17 @@ spring: # redis 配置 redis: # 地址 -# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com - host: 106.14.94.149 + host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com +# host: 106.14.94.149 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 账号 -# username: jsowell -# # 密码 -# password: js@160829 - password: js160829 + username: jsowell + # 密码 + password: js@160829 +# password: js160829 # 连接超时时间 timeout: 10s lettuce: @@ -38,12 +38,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell -# password: js@160829 - url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_pre - password: Js@160829 + url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell + password: js@160829 +# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell_pre +# password: Js@160829 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index cfc300828..b96843736 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -1066,15 +1066,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { orderInfo.setChargeDetails(chargeDetails); // 由于订单在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658 - if (orderInfo.getStationID().equals("LC149")){ +/* if (orderInfo.getStationID().equals("LC149")){ orderInfo.setStationID("LC658"); - } + }*/ // 正确运营商"之禾" -/* if(StringUtils.equals("149", orderInfo.getStationID())){ + if(StringUtils.equals("149", orderInfo.getStationID())){ //使用EquipmentOwnerID = MA1JLFUU8 orderInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); - }*/ + } // 获取令牌 From ec61e0123a6df2506b50953b21794712e5a3f172 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 17 Jun 2025 08:47:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?update=20=20=E7=99=BB=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/yunkuaichong/LoginRequestHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java index 437d40747..13148c6d0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java @@ -198,12 +198,12 @@ public class LoginRequestHandler extends AbstractYkcHandler { byte[] flag = Constants.oneByteArray; stopWatch.start("登录逻辑"); // 通过桩编码SN查询数据库，如果有数据，则登录成功，否则登录失败 - PileBasicInfo pileBasicInfo = null; - try { - pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn); - } catch (Exception e) { - log.error("selectPileBasicInfoBySN发生异常", e); - } + PileBasicInfo pileBasicInfo = new PileBasicInfo(); + // try { + // pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn); + // } catch (Exception e) { + // log.error("selectPileBasicInfoBySN发生异常", e); + // } if (pileBasicInfo != null) { flag = Constants.zeroByteArray; From 97fb52cd257ed128f59706d1f6f649e80eb48320 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 17 Jun 2025 10:29:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E7=89=8C=E5=8F=B7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileConnectorInfoServiceImpl.java | 4 ++-- .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 20e75b2f0..945554c51 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -456,14 +456,14 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { Comparator.nullsLast(Comparator.naturalOrder())) // 处理可能的null值 ); - // 4. 手动分页（取出当前页的数据） + // 手动分页（取出当前页的数据） int fromIndex = (pageNum - 1) * pageSize; int toIndex = Math.min(fromIndex + pageSize, pileConnectorInfoList.size()); List pagedList = pileConnectorInfoList.subList(fromIndex, toIndex); // PageInfo pageInfo = new PageInfo<>(pileConnectorInfoList); - // 5. 构造 PageInfo（注意：PageInfo 需要总记录数） + // 构造 PageInfo（注意：PageInfo 需要总记录数） PageInfo pageInfo = new PageInfo<>(pagedList); pageInfo.setTotal(pileConnectorInfoList.size()); // 设置总记录数 pageInfo.setPageNum(pageNum); // 设置当前页码 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index a60dc0f5f..ba473c02e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -1828,6 +1828,9 @@ and t1.vin_code = #{vinCode,jdbcType=VARCHAR} + + and t1.plate_number = #{plateNumber,jdbcType=VARCHAR} + and t3.dept_id in From 3c7e2c0cd3407e2878f21593f95d6f44a51bdc85 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 17 Jun 2025 10:31:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?update=20=20=E6=81=A2=E5=A4=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E6=96=87=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/yunkuaichong/LoginRequestHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java index 13148c6d0..437d40747 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java @@ -198,12 +198,12 @@ public class LoginRequestHandler extends AbstractYkcHandler { byte[] flag = Constants.oneByteArray; stopWatch.start("登录逻辑"); // 通过桩编码SN查询数据库，如果有数据，则登录成功，否则登录失败 - PileBasicInfo pileBasicInfo = new PileBasicInfo(); - // try { - // pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn); - // } catch (Exception e) { - // log.error("selectPileBasicInfoBySN发生异常", e); - // } + PileBasicInfo pileBasicInfo = null; + try { + pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn); + } catch (Exception e) { + log.error("selectPileBasicInfoBySN发生异常", e); + } if (pileBasicInfo != null) { flag = Constants.zeroByteArray; From 4d69f9e9b02f6c6a1ad1cfd68ac0cc3486841eb9 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 17 Jun 2025 10:32:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E7=89=8C=E5=8F=B7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index a1a467a59..a0b7afae7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -102,4 +102,9 @@ public class QueryOrderDTO extends BaseEntity { * 车辆vin编号 */ private String vinCode; + + /** + * 车牌号 + */ + private String plateNumber; } From feb927cc886e0a02d51d8f65f43e67ade927bd9e Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Tue, 17 Jun 2025 11:06:36 +0800 Subject: [PATCH 7/7] update --- .../impl/LianLianPlatformServiceImpl.java | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index b96843736..4643ed0dc 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -197,11 +197,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // throw new BusinessException("2", "密钥错误"); // } - String a = "146"; +/* String a = "146"; String s = String.valueOf(a); System.out.println(s); boolean zhiHeMerchant = MerchantUtils.isZhiHeMerchant(s); - System.out.println(zhiHeMerchant); + System.out.println(zhiHeMerchant);*/ + + String pn = "8823000000107601"; + String pileSn = YKCUtils.getPileSn(pn); + System.out.println(pileSn); } @@ -630,20 +634,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { info.setAccountNumber(pileStationInfo.getAccountNumber()); } - // 由于88250000005324在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658 -/* if (StringUtils.equals("149", stationId)) { - info.setStationID("LC658"); - }*/ - - //正式环境站点149推送时报错,"Msg":"更新站点数据出错。站点ID:LC149,错误信息:站点的所属运营商不能修改", - // 正确运营商为"上海之禾"-057643496 - if(StringUtils.equals("149", stationId)){ - //使用EquipmentOwnerID = MA1JLFUU8 - info.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); - } - - - // 容量 if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) { info.setCapacity(pileStationInfo.getCapacity().setScale(4, BigDecimal.ROUND_HALF_UP)); @@ -1065,18 +1055,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { } orderInfo.setChargeDetails(chargeDetails); - // 由于订单在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658 -/* if (orderInfo.getStationID().equals("LC149")){ - orderInfo.setStationID("LC658"); - }*/ - - // 正确运营商"之禾" - if(StringUtils.equals("149", orderInfo.getStationID())){ - //使用EquipmentOwnerID = MA1JLFUU8 - orderInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); - } - - // 获取令牌 String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); if (StringUtils.isBlank(token)) {