bug修改

xuhy

2025-09-02 26e10e787cdef67370ac1efc437126a27d02e757

bug修改

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java

@@ -317,7 +317,7 @@
        SysUser data = sysUserClient.getSysUser(site.getUserId()).getData();
        if (data!=null){
            res.setAccount(data.getUserName());
            res.setPassword("********");
//            res.setPassword("********");
        }
        BeanUtils.copyProperties(site, res);
        return R.ok(res);

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java

@@ -153,24 +153,16 @@
                return AjaxResult.error("账号已存在");
            }
            // 添加登录账号
            SysUser user = new SysUser();
            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);
            user.setSiteId(dto.getId());
            R<Long> r = sysUserClient.addSysUserSite(user);
            sysUser.setPhonenumber(dto.getAccount());
            sysUser.setUserName(dto.getAccount());
            sysUser.setNickName(dto.getName());
            sysUser.setPassword(dto.getPassword());
            R<Boolean> r = sysUserClient.updateUser(sysUser);
            if(200 != r.getCode()){
                throw new RuntimeException(r.getMsg());
            }
            dto.setUserId(r.getData());
            // 删除原有的登录账号
            R res = sysUserClient.delSysUserById(sysUser.getUserId());
        }
        if(Objects.nonNull(sysUser) && sysUser.getUserName().equals(dto.getAccount())) {
        if(Objects.nonNull(sysUser) && sysUser.getUserName().equals(dto.getAccount()) && StringUtils.isNotEmpty(dto.getPassword())) {
            // 修改密码
            sysUser.setPassword(dto.getPassword());
            R res = sysUserClient.siteResetPassword(sysUser);

 ruoyi-service/ruoyi-chargingPile/src/test/java/com/ruoyi/chargingPile/RuoYiChargingPileApplicationTests.java

@@ -1,21 +1,22 @@
//package com.ruoyi.chargingPile;
//
//import com.alibaba.fastjson2.JSON;
//import com.ruoyi.chargingPile.api.dto.GetPermissionConfigurationDTO;
//import com.ruoyi.chargingPile.service.IPartnerService;
//import org.junit.jupiter.api.Test;
//import org.springframework.boot.test.context.SpringBootTest;
//
//import javax.annotation.Resource;
//
//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RuoYiChargingPileApplication.class)
//public class RuoYiChargingPileApplicationTests {
//    @Resource
//    private IPartnerService partnerService;
//
//    @Test
//    public void test(){
//        GetPermissionConfigurationDTO permissionConfiguration = partnerService.getPermissionConfiguration(9, 15);
//        System.err.println(JSON.toJSONString(permissionConfiguration));
//    }
//}
package com.ruoyi.chargingPile;

import com.alibaba.fastjson2.JSON;
import com.ruoyi.chargingPile.api.dto.GetPermissionConfigurationDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.service.ISiteService;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

import javax.annotation.Resource;

@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RuoYiChargingPileApplication.class)
public class RuoYiChargingPileApplicationTests {
    @Resource
    private ISiteService siteService;

    @Test
    public void test(){
        Site site = siteService.getById(1);
        System.err.println(site);
    }
}