Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-14 96b35b89e061cc90cd6404fd9941102eedab36ab

Merge remote-tracking branch 'origin/master'

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java

@@ -10,6 +10,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
@@ -23,6 +24,7 @@
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.dao.domain.*;
@@ -223,14 +225,17 @@

    @Log("用户修改头像")
    @PostMapping("/updateIcon")
    public ResponseVO<Object> updateIcon(@RequestBody String IconUrl) {
    public ResponseVO<Object> updateIcon(@RequestBody ReceiveParam receiveParam) {
        if (receiveParam.getIconUrl().trim() == null) {
            throw new BusinessException("头像URL不能为空！");
        }
        boolean result;
        //普通用户修改头像
        if (SecurityUtils.getAdministratorIdentity().equals(AdministratorEnums.NORMAL.getCode())) {
            result= clientService.updateIcon(SecurityUtils.getUserId(), IconUrl);
        }else{
            result = clientService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
        } else {
            //超级管理员、管理员修改头像
            result= adminService.updateIcon(SecurityUtils.getUserId(), IconUrl);
            result = adminService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
        }

        if (result) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java

@@ -24,5 +24,7 @@

   private String groupName;

   private String iconUrl;


}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java

@@ -18,11 +18,13 @@
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
@@ -93,6 +95,15 @@
                c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
            }

            //添加绑定关系
            Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
            if(pole != null){
                PoleBindingParam poleBindingParam = new PoleBindingParam();
                poleBindingParam.setDeviceType(2);
                poleBindingParam.setDeviceCode(mcuUdid);
                bindingService.bindPole(pole.getId(), poleBindingParam);
            }

        } else {
            //将设备信息添加到充电桩设备表
            one.setPoleDevicesCode(deviceName);

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java

@@ -35,7 +35,7 @@
//        }
        LambdaQueryWrapper<PoleBinding> eq = Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId);
        List<PoleBinding> list = list(eq);
        if (list.size() != 0){
        if (list.size() != 0) {
            for (PoleBinding poleBinding : list) {
                if (poleBinding.getDeviceType().equals(deviceType)) {
                    throw new BusinessException("该灯杆已绑定过相同类型设备");
@@ -52,7 +52,9 @@
            poleBinding.setDeviceCode(param.getDeviceCode());
            return save(poleBinding);
        } else {
            throw new BusinessException("该设备已绑定过");
            one.setPoleId(poleId);
            one.setDeviceType(param.getDeviceType());
            return updateById(one);
        }
    }