From 79d5e91444eca538d523d3bd014528abd939da33 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 八月 2025 18:54:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index fbfafa5..ffb64af 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -64,10 +64,15 @@
return pageInfo.setRecords(list);
}
+ @Override
+ public List<GetSiteListDTO> getSiteListNolimit(GetSiteList siteList) {
+ Set<Integer> ids = null;
+ List<GetSiteListDTO> list = this.baseMapper.getSiteListNolimit( siteList, ids);
+ return list;
+ }
-
- @Override
+ @Override
public PageInfo<GetSiteListDTO> getSiteList1(Long userId) {
GetSiteList siteList = new GetSiteList();
siteList.setPageCurr(1);
@@ -100,17 +105,20 @@
this.save(dto);
// 添加登录账号
SysUser user = new SysUser();
- user.setPhonenumber(dto.getPhone());
+ user.setPhonenumber(dto.getAccount());
user.setUserName(dto.getAccount());
user.setNickName(dto.getName());
user.setPassword(dto.getPassword());
user.setStatus("0");
user.setDelFlag("0");
user.setRoleId(2L);
- R<Long> r = sysUserClient.addSysUser(user);
+ user.setSiteId(dto.getId());
+ R<Long> r = sysUserClient.addSysUserSite(user);
if(200 != r.getCode()){
throw new RuntimeException(r.getMsg());
}
+ dto.setUserId(r.getData());
+ this.updateById(dto);
return AjaxResult.success();
}
@@ -250,6 +258,8 @@
}
for (Integer id : ids) {
Site site = this.getById(id);
+ // 删除账号
+ sysUserClient.delSysUserById(site.getUserId());
this.removeById(site);
}
return AjaxResult.success();
--
Gitblit v1.7.1