From daf86421621e50a3af692893cfed6f71121ff428 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 11 Sep 2023 10:10:22 +0800 Subject: [PATCH 1/3] update --- .../jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index e8a2a856b..404bc0f08 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -433,7 +433,7 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { if (merchant == null) { return null; } - return merchant.getAppId(); + return merchant.getDelayMode(); } @Override From 6d736cb2f24f221fbe8d3cb9a757ba78962019a3 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 11 Sep 2023 10:12:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=A0=E6=A1=A9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=20=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/pile/OrderPileOccupyMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index bf1a8166c..d76d1f7fe 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -962,5 +962,6 @@ and t1.pile_sn = #{pileSn} and t1.pile_connector_code = #{pileConnectorCode} + order by t1.create_time desc \ No newline at end of file From c8fc02ce0ab3da60323ea4eb419456b50b31ef9e Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 11 Sep 2023 10:19:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bugfix=20=20=E4=BF=AE=E6=94=B9sim=E5=8D=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/IPileBasicInfoService.java | 8 ++++++++ .../service/impl/PileBasicInfoServiceImpl.java | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java index b5353c21c..05d2a6d2b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java @@ -55,6 +55,14 @@ public interface IPileBasicInfoService { */ int updatePileBasicInfo(PileBasicInfo pileBasicInfo); + /** + * 修改设备sim卡信息 + * + * @param pileBasicInfo 设备管理 + * @return 结果 + */ + int updateSimInfo(PileBasicInfo pileBasicInfo); + /** * 批量删除设备管理 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index e5510917f..9695abc77 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -173,6 +173,22 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { return pileBasicInfoMapper.updatePileBasicInfo(pileBasicInfo); } + /** + * 修改设备sim卡信息 + * + * @param pileBasicInfo 设备管理 + * @return 结果 + */ + @Override + public int updateSimInfo(PileBasicInfo pileBasicInfo) { + Long stationId = pileBasicInfo.getStationId(); + // 清缓存 + cleanRedisCache(pileBasicInfo.getSn()); + pileBasicInfo.setUpdateTime(DateUtils.getNowDate()); + redisCache.deleteObject(CacheConstants.GET_PILE_LIST_BY_STATION_ID + stationId); + return pileBasicInfoMapper.updatePileBasicInfo(pileBasicInfo); + } + /** * 批量删除设备管理 * @@ -576,7 +592,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { // sim信息已经存库了 然后更新充电桩的sim卡 basicInfo.setSimId(simInfo.getId()); } - updatePileBasicInfo(basicInfo); + updateSimInfo(basicInfo); } /**