From 5eb4dc617a7db0afbc8beb025f6388f0482b87d1 Mon Sep 17 00:00:00 2001 From: admin-lmm <2497833386@QQ.com> Date: Wed, 28 Jun 2023 15:45:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8Alogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/public/{favicon.ico => favicon1.ico} | Bin jsowell-ui/public/index.html | 1 + jsowell-ui/src/layout/components/Sidebar/Logo.vue | 7 ++++--- 3 files changed, 5 insertions(+), 3 deletions(-) rename jsowell-ui/public/{favicon.ico => favicon1.ico} (100%) diff --git a/jsowell-ui/public/favicon.ico b/jsowell-ui/public/favicon1.ico similarity index 100% rename from jsowell-ui/public/favicon.ico rename to jsowell-ui/public/favicon1.ico diff --git a/jsowell-ui/public/index.html b/jsowell-ui/public/index.html index ae81878ef..d3029c30e 100644 --- a/jsowell-ui/public/index.html +++ b/jsowell-ui/public/index.html @@ -9,6 +9,7 @@ content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" /> + <%= webpackConfig.name %> + +

{{ title }}

- +

{{ title }}

From bea87e1d2e4c4b620e254a87c80e164ba6e14117 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 28 Jun 2023 15:50:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20sim=E5=8D=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/mapper/PileSimInfoMapper.java | 3 ++- .../pile/service/IPileSimInfoService.java | 1 + .../jsowell/pile/service/SimCardService.java | 22 +++++++++---------- .../impl/PileBasicInfoServiceImpl.java | 2 +- .../service/impl/PileSimInfoServiceImpl.java | 20 +++++++++++++++++ .../mapper/pile/PileSimInfoMapper.xml | 15 +++++++++++++ 6 files changed, 50 insertions(+), 13 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileSimInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileSimInfoMapper.java index 3a2d38e75..4a637db31 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileSimInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileSimInfoMapper.java @@ -3,6 +3,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.PileSimInfo; import com.jsowell.pile.dto.QuerySimInfoDTO; import com.jsowell.pile.vo.web.SimCardInfoVO; +import com.jsowell.pile.vo.web.SimCardVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -92,5 +93,5 @@ public interface PileSimInfoMapper { */ PileSimInfo getBasicInfoByIccId(@Param("iccId") String iccId); - + void updateSimCardInfoBatch(@Param("list") List list); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileSimInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileSimInfoService.java index ace0b4a0e..19ccad410 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileSimInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileSimInfoService.java @@ -3,6 +3,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.PileSimInfo; import com.jsowell.pile.dto.QuerySimInfoDTO; import com.jsowell.pile.vo.web.SimCardInfoVO; +import com.jsowell.pile.vo.web.SimCardVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java index be4436ba1..19b8d7e89 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java @@ -71,25 +71,25 @@ public class SimCardService { /** * 不知道iccid属于哪家供应商，就用这个方法查 - * @param iccid + * @param iccids * @return */ - public SimCardVO searchByLoop(String iccid) { - SimCardVO vo = null; + public List searchByLoop(List iccids) { + List resultList = Lists.newArrayList(); // 查XunZhong - List simCardVOS = XunZhongGetSimInfoByIccIds(Lists.newArrayList(iccid)); - if (CollectionUtils.isNotEmpty(simCardVOS)) { - vo = simCardVOS.get(0); + List xunZhongList = XunZhongGetSimInfoByIccIds(iccids); + if (CollectionUtils.isNotEmpty(xunZhongList)) { + resultList.addAll(xunZhongList); } // 查WuLian平台 - List wuLianSimData = WuLianGetSimInfoByIccIds(Lists.newArrayList(iccid)); + List wuLianSimData = WuLianGetSimInfoByIccIds(iccids); if (CollectionUtils.isNotEmpty(wuLianSimData)) { - vo = wuLianSimData.get(0); + resultList.addAll(xunZhongList); } // 第三个供应商 - logger.info("查询iccid:{}, 详情信息:{}", iccid, JSON.toJSONString(vo)); - return vo; + logger.info("查询iccid:{}, 详情信息:{}", iccids, JSON.toJSONString(resultList)); + return resultList; } /** @@ -110,7 +110,7 @@ public class SimCardService { ArrayList list = new ArrayList<>(); for (String iccId : iccIds) { // 查出此卡属于哪家公司(拿到code) - SimCardVO simCardVO = searchByLoop(iccId); + SimCardVO simCardVO = searchByLoop(Lists.newArrayList(iccId)).get(0); String simSupplierCode = simCardVO.getSimCardFactory(); // 根据不同的公司执行不同的续费方法 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 a72604d6c..3d6735f0a 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 @@ -533,7 +533,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { // 通过iccid查pile_sim_info PileSimInfo simInfo = pileSimInfoService.getBasicInfoByIccId(iccid); if (simInfo == null) { - SimCardVO simCardVO = simCardService.searchByLoop(iccid); + SimCardVO simCardVO = simCardService.searchByLoop(Lists.newArrayList(iccid)).get(0); // pile_sim_info 新增数据 if (simCardVO != null) { simInfo = PileSimInfo.builder() diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java index fcd6b5c67..e656dc461 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java @@ -7,7 +7,9 @@ import com.jsowell.pile.domain.PileSimInfo; import com.jsowell.pile.dto.QuerySimInfoDTO; import com.jsowell.pile.mapper.PileSimInfoMapper; import com.jsowell.pile.service.IPileSimInfoService; +import com.jsowell.pile.service.SimCardService; import com.jsowell.pile.vo.web.SimCardInfoVO; +import com.jsowell.pile.vo.web.SimCardVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +18,8 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 充电桩SIM卡信息Service业务层处理 @@ -29,6 +33,9 @@ public class PileSimInfoServiceImpl implements IPileSimInfoService { @Autowired private PileSimInfoMapper pileSimInfoMapper; + @Autowired + private SimCardService simCardService; + /** * 查询充电桩SIM卡信息 * @@ -67,6 +74,19 @@ public class PileSimInfoServiceImpl implements IPileSimInfoService { } dto.setExpiredTime(expiredTime); List simInfoList = pileSimInfoMapper.getSimInfoList(dto); + if (expiredTime == null) { + // 为空说明后管查询列表页没有选择筛选条件 + List iccids = simInfoList.stream() + .map(SimCardInfoVO::getIccId) + .collect(Collectors.toList()); + // 查出最新的卡信息 + List simCardList = simCardService.searchByLoop(iccids); + if (CollectionUtils.isNotEmpty(simCardList)) { + // 批量修改存库 + pileSimInfoMapper.updateSimCardInfoBatch(simCardList); + } + } + if (CollectionUtils.isEmpty(simInfoList)) { return new ArrayList<>(); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml index b0bc82bae..7614d62f0 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml @@ -188,4 +188,19 @@ + + + + update pile_sim_info + + name = #{simCardVO.name}, + status = #{simCardVO.simCardStatus}, + sim_supplier = #{simCardVO.simCardFactory}, + total_data = #{simCardVO.packageCapacity}, + surplus_data = #{simCardVO.residualFlowRate}, + expire_time = #{simCardVO.expiredTime}, + + where iccid = #{simCardVO.iccId} + + \ No newline at end of file From 1ae41ecd59a5d5ba705cc4ca79ab58fe0d6345c3 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 28 Jun 2023 15:56:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20sim=E5=8D=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java index e656dc461..7e92a9463 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java @@ -84,6 +84,8 @@ public class PileSimInfoServiceImpl implements IPileSimInfoService { if (CollectionUtils.isNotEmpty(simCardList)) { // 批量修改存库 pileSimInfoMapper.updateSimCardInfoBatch(simCardList); + + simInfoList = pileSimInfoMapper.getSimInfoList(dto); } }