From 050534263a52f93bfae660915764faa4aeff8c3a Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 25 Sep 2024 17:07:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=86=E6=88=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/dto/SplitConfigDTO.java | 11 + .../com/jsowell/pile/dto/SplitDetailDTO.java | 18 ++ .../pile/mapper/StationSplitConfigMapper.java | 10 + .../pile/service/PileSnGenerateService.java | 35 ++- .../service/StationSplitConfigService.java | 9 + .../impl/StationSplitConfigServiceImpl.java | 7 + .../mapper/pile/StationSplitConfigMapper.xml | 7 + jsowell-ui/src/api/pile/splitConfig.js | 44 +++ jsowell-ui/src/views/pile/station/detail.vue | 4 + .../src/views/pile/station/splitConfig.vue | 265 ++++++++++++++++++ 10 files changed, 403 insertions(+), 7 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java create mode 100644 jsowell-ui/src/api/pile/splitConfig.js create mode 100644 jsowell-ui/src/views/pile/station/splitConfig.vue diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java new file mode 100644 index 000000000..c59db06f4 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java @@ -0,0 +1,11 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +@Data +public class SplitConfigDTO { + private String merchantId; + + private String stationId; + +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java new file mode 100644 index 000000000..904edfa4d --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java @@ -0,0 +1,18 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +@Data +public class SplitDetailDTO { + // 汇付会员id + private String adapayMemberId; + + // 电量分成比例 + private String electricitySplitRatio; + + // 服务费分成比例 + private String serviceSplitRatio; + + // 是否承担手续费承担方 + private String isServiceCharge; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java index 1ecd097dc..1bc727d26 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java @@ -1,5 +1,15 @@ package com.jsowell.pile.mapper; +import com.jsowell.pile.domain.StationSplitConfig; + +import java.util.List; + public interface StationSplitConfigMapper { + /** + * 根据站点编号查询 + * @param stationId + * @return + */ + List queryByStationId(String stationId); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java index 6906bbc48..37cdea594 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java @@ -60,23 +60,44 @@ public class PileSnGenerateService { // 缓存中没有，从数据库中取 PileBasicInfo pileInfo = pileBasicInfoService.getMaxNumPileInfo(); String pileSn = pileInfo.getSn(); - // 将前四位截取，并将后面转为long - Long pileSnNum = Long.parseLong(StringUtils.substring(pileSn, 4, pileSn.length())); - // String pileSnNum = StringUtils.substring(pileSn, 4, pileSn.length()); + // 将前四位截取，并将后面转为int + pileNum = Integer.parseInt(StringUtils.substring(pileSn, 4, pileSn.length())); // 再将该值存入数据库 - redisCache.setCacheObject(key, pileSnNum.intValue()); + redisCache.setCacheObject(key, pileNum); } Long increNum = redisCache.increment(key, 1); // 年份 int year = LocalDate.now().getYear() - 2000; //不足补位 increResult = prefix + year + String.format("%1$010d", increNum); + + // 保存到字典中 + savePileSn2Dict(pileNum); } catch (Exception e) { logger.error("获取序列号失败", e); } return increResult; } + private void savePileSn2Dict(long pileSnNum) { + SysDictData queryData = new SysDictData(); + queryData.setDictType(pile_sn_generate_type); + queryData.setDictLabel(EV_PILE_SN_LABEL); + List sysDictData = dictDataService.selectDictDataList(queryData); + if (CollectionUtils.isNotEmpty(sysDictData)) { + SysDictData dictData = sysDictData.get(0); + dictData.setDictValue(pileSnNum + ""); + dictDataService.updateDictData(dictData); + } else { + SysDictData dictData = new SysDictData(); + dictData.setDictType(pile_sn_generate_type); + dictData.setDictLabel(EBIKE_PILE_SN_LABEL); + dictData.setDictValue(pileSnNum + ""); + dictData.setListClass(Constants.DEFAULT); + dictData.setCreateBy(Constants.SYSTEM); + dictDataService.insertDictData(dictData); + } + } /** * 批量生成sn号 @@ -131,18 +152,18 @@ public class PileSnGenerateService { pileSnNum += 1; // 再将该值存入数据库 increResult = prefix + year + String.format("%1$04d", pileSnNum); - save2Dict(year, pileSnNum); + saveEBikeSn2Dict(year, pileSnNum); } else { // 没有值, 从1开始, 并保存到字典中 Long pileSnNum = 1L; increResult = prefix + year + String.format("%1$04d", pileSnNum); - save2Dict(year, pileSnNum); + saveEBikeSn2Dict(year, pileSnNum); } return increResult; } - private void save2Dict(int year, long pileSnNum) { + private void saveEBikeSn2Dict(int year, long pileSnNum) { SysDictData queryData = new SysDictData(); queryData.setDictType(pile_sn_generate_type); queryData.setDictLabel(EBIKE_PILE_SN_LABEL + year); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java index b845bd0c3..b88bb6563 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java @@ -1,6 +1,15 @@ package com.jsowell.pile.service; +import com.jsowell.pile.domain.StationSplitConfig; + +import java.util.List; + public interface StationSplitConfigService{ + // 根据站点id查询站点分账配置信息 + List queryByStationId(String stationId); + + // 插入站点分账配置信息 + int insert(StationSplitConfig record); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java index dba96913d..c8b228449 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java @@ -1,14 +1,21 @@ package com.jsowell.pile.service.impl; +import com.jsowell.pile.domain.StationSplitConfig; import com.jsowell.pile.mapper.StationSplitConfigMapper; import com.jsowell.pile.service.StationSplitConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; + @Service public class StationSplitConfigServiceImpl implements StationSplitConfigService{ @Resource private StationSplitConfigMapper stationSplitConfigMapper; + @Override + public List queryByStationId(String stationId) { + return stationSplitConfigMapper.queryByStationId(stationId); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml index 719674868..30ed68cf8 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml @@ -22,4 +22,11 @@ create_by, create_time, update_by, update_time, del_flag + \ No newline at end of file diff --git a/jsowell-ui/src/api/pile/splitConfig.js b/jsowell-ui/src/api/pile/splitConfig.js new file mode 100644 index 000000000..291a99f90 --- /dev/null +++ b/jsowell-ui/src/api/pile/splitConfig.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询站点白名单列表 +export function listWhitelist(query) { + return request({ + url: '/pile/whitelist/list', + method: 'get', + params: query + }) +} + +// 查询站点白名单详细 +export function getWhitelist(id) { + return request({ + url: '/pile/whitelist/' + id, + method: 'get' + }) +} + +// 新增站点白名单 +export function addWhitelist(data) { + return request({ + url: '/pile/whitelist', + method: 'post', + data: data + }) +} + +// 修改站点白名单 +export function updateWhitelist(data) { + return request({ + url: '/pile/whitelist', + method: 'put', + data: data + }) +} + +// 删除站点白名单 +export function delWhitelist(id) { + return request({ + url: '/pile/whitelist/' + id, + method: 'delete' + }) +} diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue index 8a634a0fd..2c55b5e26 100644 --- a/jsowell-ui/src/views/pile/station/detail.vue +++ b/jsowell-ui/src/views/pile/station/detail.vue @@ -151,6 +151,10 @@ + + + + diff --git a/jsowell-ui/src/views/pile/station/splitConfig.vue b/jsowell-ui/src/views/pile/station/splitConfig.vue new file mode 100644 index 000000000..834b5665f --- /dev/null +++ b/jsowell-ui/src/views/pile/station/splitConfig.vue @@ -0,0 +1,265 @@ + + +