From 177dbd9091cf79b1e0ef2296e9b6fec4b1eba3d4 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 4 Aug 2023 14:32:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E5=88=9B=E5=BB=BA=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E5=95=86=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E7=AD=89?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/dto/CreateMerchantDTO.java | 10 +++ .../impl/PileMerchantInfoServiceImpl.java | 14 ++-- jsowell-ui/src/api/pile/merchant.js | 9 +++ jsowell-ui/src/views/pile/merchant/index.vue | 72 ++++++++++++------- 4 files changed, 75 insertions(+), 30 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java index a9548ca72..089f8e7e2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java @@ -16,6 +16,16 @@ public class CreateMerchantDTO { */ private String merchantName; + /** + * 运营商等级 + */ + private String merchantLevel; + + /** + * 父级id + */ + private String parentId; + /** * 地址 */ 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 d92ac4477..a14f5e341 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 @@ -121,10 +121,16 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { // dto.setId(deptId); dto.setDeptId(String.valueOf(deptId)); dto.setStatus(Constants.ONE); - // String appId = StringUtils.isBlank(dto.getAppId()) - // ? appid - // : dto.getAppId(); - dto.setAppId(dto.getAppId()); + + // 一级运营商取前端传来的appid，二级运营商取父级的appid + String appId; + if (StringUtils.equals(dto.getMerchantLevel(), Constants.TWO)) { + PileMerchantInfo firstLevelMerchant = selectPileMerchantInfoById(Long.parseLong(dto.getParentId())); + appId = firstLevelMerchant.getAppId(); + } else { + appId = dto.getAppId(); + } + dto.setAppId(appId); PileMerchantInfo pileMerchantInfo = new PileMerchantInfo(); BeanUtils.copyProperties(dto, pileMerchantInfo); diff --git a/jsowell-ui/src/api/pile/merchant.js b/jsowell-ui/src/api/pile/merchant.js index 37ef44884..00a21727c 100644 --- a/jsowell-ui/src/api/pile/merchant.js +++ b/jsowell-ui/src/api/pile/merchant.js @@ -9,6 +9,15 @@ export function listMerchant(query) { }) } +// 查询充电桩运营商信息列表 +export function queryFirstLevelMerchant(query) { + return request({ + url: '/pile/merchant/queryFirstLevelMerchant', + method: 'get', + params: query + }) +} + // 查询充电桩运营商信息详细 export function getMerchant(id) { return request({ diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index 4fef60e49..660cf3d71 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -193,6 +193,7 @@ @@ -205,24 +206,20 @@ - - - - @@ -234,27 +231,31 @@ - - - - - - - - - - + + + + + + + + + + + + + + + @@ -269,11 +270,11 @@ - + + + + + + + { + this.firstLevelMerchant = response.rows; + }); + }, // 取消按钮 cancel() { this.open = false; From b4906f3c6cf7c2ea9307e02e6c59831627ca3af7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 4 Aug 2023 15:51:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E8=AE=BE=E7=BD=AE=E4=B8=BA6?= =?UTF-8?q?=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application.yml | 2 +- .../jsowell/framework/web/service/TokenService.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index 30a3f3f6b..2929630f5 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -37,7 +37,7 @@ token: # 令牌密钥 secret: cdnflglzjoxjovuusklsqjtuup # 令牌有效期（默认300分钟） - expireTime: 300 + expireTime: 360 # 接口令牌有效期 一个月 serviceExpireTime: 43200 diff --git a/jsowell-framework/src/main/java/com/jsowell/framework/web/service/TokenService.java b/jsowell-framework/src/main/java/com/jsowell/framework/web/service/TokenService.java index d7f6ba6cc..c3adc39f7 100644 --- a/jsowell-framework/src/main/java/com/jsowell/framework/web/service/TokenService.java +++ b/jsowell-framework/src/main/java/com/jsowell/framework/web/service/TokenService.java @@ -37,19 +37,15 @@ public class TokenService { @Value("${token.secret}") private String secret; - // 令牌有效期（默认30分钟） + // 后管登录用户令牌有效期（默认30分钟） @Value("${token.expireTime}") private int expireTime; - // 接口服务 令牌有效期 - @Value("${token.serviceExpireTime}") - private int serviceExpireTime; - - protected static final long MILLIS_SECOND = 1000; + protected static final long MILLIS_SECOND = 1000L; protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; - private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L; + private static final Long MILLIS_MINUTE_TEN = 20 * MILLIS_MINUTE; @Autowired private RedisCache redisCache;