From 894f9bef89fb6450899252ecc7b89dc2254e5be6 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 16 Jun 2025 09:11:48 +0800 Subject: [PATCH 01/10] =?UTF-8?q?update=20=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/feign/JsowellChargerController.java | 47 +++++++++++++++++++ .../test/java/SpringBootTestController.java | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 jsowell-admin/src/main/java/com/jsowell/api/feign/JsowellChargerController.java diff --git a/jsowell-admin/src/main/java/com/jsowell/api/feign/JsowellChargerController.java b/jsowell-admin/src/main/java/com/jsowell/api/feign/JsowellChargerController.java new file mode 100644 index 000000000..d1da33b83 --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/api/feign/JsowellChargerController.java @@ -0,0 +1,47 @@ +package com.jsowell.api.feign; + +import com.jsowell.common.annotation.Anonymous; +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileBillingTemplateService; +import com.jsowell.pile.vo.base.PileInfoVO; +import com.jsowell.pile.vo.web.BillingTemplateVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Anonymous +@RestController +@RequestMapping("/jsowellcharger") +public class JsowellChargerController extends BaseController { + + @Autowired + private PileBasicInfoService pileBasicInfoService; + + @Autowired + private PileBillingTemplateService pileBillingTemplateService; + + /** + * 获取桩基础信息 + * http://localhost:8080/jsowellcharger/getPileBasicInfo/88000000000126 + * @param pileSn + * @return + */ + @GetMapping("/getPileBasicInfo/{pileSn}") + public PileInfoVO getPileBasicInfo(@PathVariable("pileSn") String pileSn) { + logger.info("获取桩基础信息 pileSn:{}", pileSn); + return pileBasicInfoService.selectPileInfoBySn(pileSn); + } + + /** + * 根据桩编号查询计费模板 + * http://localhost:8080/jsowellcharger/getPileBasicInfo + */ + @GetMapping("/getPileBillingTemplate/{pileSn}") + public BillingTemplateVO getPileBasicInfoByPileSn(@PathVariable("pileSn") String pileSn) { + logger.info("根据桩编号查询计费模板 pileSn:{}", pileSn); + return pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn); + } +} diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index b6d6f025c..31c6214e3 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -805,7 +805,7 @@ public class SpringBootTestController { @Test public void selectBillingTemplateDetailByPileSnTest() { - String pileSn = "88000000000001"; + String pileSn = "88000000000126"; // 查询充电桩的计费模板 BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn); System.out.println(JSON.toJSONString(billingTemplateVO)); From a52f67638be468c81aa48a5b31a379060b4fdf94 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Mon, 16 Jun 2025 15:28:48 +0800 Subject: [PATCH 02/10] update --- .../api/thirdparty/WeiWangKuaiDianController.java | 2 +- .../service/impl/LianLianPlatformServiceImpl.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java index 76261d6f2..66a7dcbce 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java @@ -263,7 +263,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { */ @PostMapping("/v1/query_start_charge") public CommonResult query_start_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { -// logger.info("{}-请求启动充电 params:{}", platformName, JSON.toJSONString(dto)); + logger.info("{}-请求启动充电 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 if (!verifyToken(request.getHeader("Authorization"))) { 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 33fcd09af..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 @@ -636,6 +636,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { }*/ //正式环境站点149推送时报错,"Msg":"更新站点数据出错。站点ID:LC149,错误信息:站点的所属运营商不能修改", + // 正确运营商为"上海之禾"-057643496 if(StringUtils.equals("149", stationId)){ //使用EquipmentOwnerID = MA1JLFUU8 info.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); @@ -1069,6 +1070,13 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { 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)) { @@ -1594,6 +1602,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { succStat = 1; // 1- 此设备尚未插枪； failReason = 1; + failReasonMsg = "此设备尚未插枪"; } vo.setEquipAuthSeq(equipAuthSeq); vo.setConnectorID(pileConnectorCode); From 2a8081a726c124a797d651a2ea158a94d8cd6711 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 16 Jun 2025 16:29:30 +0800 Subject: [PATCH 03/10] =?UTF-8?q?update=20=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=AB=99=E7=82=B9id=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9E=AA=E5=8F=A3=E5=88=97=E8=A1=A8=E5=85=88=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=86=8D=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PileConnectorInfoServiceImpl.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 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 ccc90d453..20e75b2f0 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 @@ -435,8 +435,8 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { if (CollectionUtils.isEmpty(pileSns) && CollectionUtils.isEmpty(connectorIds) && CollectionUtils.isEmpty(connectorCodeList)) { return new PageResponse(); } - // 分页 - PageHelper.startPage(pageNum, pageSize); + // 分页 (2025.06.16 改为 先查询数据，再总体手动分页) + // PageHelper.startPage(pageNum, pageSize); List pileConnectorInfoList = pileConnectorInfoMapper.getPileConnectorInfoList(pileSns, connectorIds, connectorCodeList); @@ -450,11 +450,24 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { put(Integer.parseInt(PileConnectorDataBaseStatusEnum.OFF_NETWORK.getValue()), 5); // 离线 → 5 }}); pileConnectorInfoList.sort( - Comparator.comparingInt((PileConnectorInfoVO vo) -> priority.get(vo.getStatus())) - .thenComparing(PileConnectorInfoVO::getPileConnectorCode) // 状态相同则按枪口号排序 + Comparator.comparingInt((PileConnectorInfoVO vo) -> + priority.getOrDefault(vo.getStatus(), Integer.MAX_VALUE)) // 未定义状态排最后 + .thenComparing(PileConnectorInfoVO::getPileConnectorCode, + Comparator.nullsLast(Comparator.naturalOrder())) // 处理可能的null值 ); - PageInfo pageInfo = new PageInfo<>(pileConnectorInfoList); + // 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 = new PageInfo<>(pagedList); + pageInfo.setTotal(pileConnectorInfoList.size()); // 设置总记录数 + pageInfo.setPageNum(pageNum); // 设置当前页码 + pageInfo.setPageSize(pageSize); // 设置每页大小 // 查询枪口当前订单 for (PileConnectorInfoVO pileConnectorInfoVO : pageInfo.getList()) { 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 04/10] 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 05/10] 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 06/10] =?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 07/10] =?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 08/10] =?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 09/10] =?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 10/10] 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)) {