autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-17 21:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-09-15 10:46:54 +08:00
parent 595a03d0cc baadc30727
commit 77774f2895
2 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -563,23 +563,11 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
} }
// 去卡运营商查询流量等信息 // 去卡运营商查询流量等信息
List<SimCardVO> simCardVOS = simCardService.searchByLoop(Lists.newArrayList(iccid)); List<SimCardVO> simCardVOS = simCardService.searchByLoop(Lists.newArrayList(iccid));
// 查询数据库中是否有此卡 PileSimInfo simBasicInfo;
PileSimInfo simInfo = pileSimInfoService.getBasicInfoByIccId(iccid); if (CollectionUtils.isNotEmpty(simCardVOS)) {
SimCardVO simCardVO = null;
if (CollectionUtils.isEmpty(simCardVOS)) {
// 已对接的卡商没有信息
if (simInfo == null) {
// 数据库中也没有此卡信息，说明为新卡，新增一条卡数据
simInfo = PileSimInfo.builder()
.iccid(iccid)
.build();
pileSimInfoService.insertPileSimInfo(simInfo);
}
}else {
// 卡商有信息，先获取最新信息 // 卡商有信息，先获取最新信息
simCardVO = simCardVOS.get(0); SimCardVO simCardVO = simCardVOS.get(0);
PileSimInfo simBasicInfo = PileSimInfo.builder() simBasicInfo = PileSimInfo.builder()
.iccid(iccid) .iccid(iccid)
.name(simCardVO.getName()) .name(simCardVO.getName())
.simSupplier(simCardVO.getSimCardFactory()) .simSupplier(simCardVO.getSimCardFactory())
@@ -589,20 +577,27 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
.surplusData(String.valueOf(simCardVO.getResidualFlowRate())) .surplusData(String.valueOf(simCardVO.getResidualFlowRate()))
.totalData(String.valueOf(simCardVO.getPackageCapacity())) .totalData(String.valueOf(simCardVO.getPackageCapacity()))
.build(); .build();
} else {
// 数据库中也没有此卡信息，说明为新卡，新增一条卡数据
simBasicInfo = PileSimInfo.builder()
.iccid(iccid)
.build();
}
// 查询数据库中是否有此卡
PileSimInfo simInfo = pileSimInfoService.getBasicInfoByIccId(iccid);
if (simInfo == null) { if (simInfo == null) {
// 数据库中没有此卡，新增 // 数据库中没有此卡，新增
pileSimInfoService.insertPileSimInfo(simBasicInfo); pileSimInfoService.insertPileSimInfo(simBasicInfo);
}else { }else {
// 更新 // 更新
simBasicInfo.setId(simInfo.getId());
pileSimInfoService.updatePileSimInfo(simBasicInfo); pileSimInfoService.updatePileSimInfo(simBasicInfo);
} }
// 再根据iccid查询当前卡id
String simId = pileSimInfoMapper.selectIdByIccId(iccid);
basicInfo.setSimId(Long.parseLong(simId));
}
// 统一更新桩基本信息表
updateSimInfo(basicInfo);
// 统一更新桩基本信息表
basicInfo.setSimId(simBasicInfo.getId());
updateSimInfo(basicInfo);
} }
@Override @Override

2
jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml
View File

@@ -46,7 +46,7 @@
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertPileSimInfo" parameterType="com.jsowell.pile.domain.PileSimInfo"> <insert id="insertPileSimInfo" parameterType="com.jsowell.pile.domain.PileSimInfo" useGeneratedKeys="true" keyProperty="id">
insert into pile_sim_info insert into pile_sim_info
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>