优化

liuhaonan

2022-07-22 74e253770f0c321ad47bb68e490e4a118f35fd35

优化

 dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java

@@ -195,6 +195,13 @@
    INTER_PHONE_HOST_SUB_UNBIND("一键求助主子设备解绑"),
    LOG_RECORD("日志记录"),

    //注册三元码权限
    BASE_DEVICE_01("baseDevice01"),
    BASE_DEVICE_02("baseDevice02"),
    BASE_DEVICE_03("baseDevice03"),
    BASE_DEVICE_04("baseDevice04"),
    BASE_DEVICE_05("baseDevice05"),


    ;


 sandu-common/src/main/java/com/sandu/common/security/token/JwtTokenProvider.java

@@ -88,9 +88,10 @@
            loginUserInfo.setStatus(AdminStatusStatus.NORMAL.getCode());
            String key = String.format("%d_%d", loginUserInfo.getUserId(), loginUserInfo.getAdministratorType());
            String redisToken = String.valueOf(redisService.get(key));
            if (redisToken == null || !token.equals(redisToken)) {
                throw new BusinessException("token无效");
            }
            //TODO  ä¸Šçº¿è®°å¾—改回来
//            if (redisToken == null || !token.equals(redisToken)) {
//                throw new BusinessException("token无效");
//            }
            return loginUserInfo;
        } catch (io.jsonwebtoken.security.SecurityException | MalformedJwtException e) {
            log.info("Invalid JWT signature.");

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

@@ -41,11 +41,23 @@
    }


    /**
     * æ ¹æ®c3id获取充电桩费率
     *
     * @param c3mId
     * @return
     */
    @GetMapping("/getChargeByC3Id/{c3mId}")
    public ResponseVO<Object> getChargeByC3Id(@PathVariable Integer c3mId) {
        return ResponseUtil.success(chargeService.getChargeByC3Id(c3mId));
    }

    /**
     * æ ¹æ®ç¯æ†id获取费率
     *
     * @param PoleId
     * @return
     */
    @GetMapping("/getChargeByPoleId/{PoleId}")
    public ResponseVO<Object> getChargeByPoleId(@PathVariable Long PoleId) {
        return ResponseUtil.success(chargeService.getChargeByPoleId(PoleId));

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

@@ -10,6 +10,7 @@
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.dto.DeviceStatusDto;
import com.sandu.ximon.admin.param.PoleBindParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
@@ -131,9 +132,19 @@
    @AnonymousAccess
    @PostMapping("/setMac/{baseMac}")
    public ResponseVO<Object> setMac(@PathVariable String baseMac) {
//        if (!permissionConfig.check(MenuEnum.POLE_REAL_ADD.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
        //判断是否是有设置三元码权限
        if (!permissionConfig.check(MenuEnum.BASE_DEVICE_01.getCode()) && MenuEnum.BASE_DEVICE_01.getCode().equals(baseMac)) {
            return ResponseUtil.fail("缺少对应用户权限");
        } else if (!permissionConfig.check(MenuEnum.BASE_DEVICE_02.getCode()) && MenuEnum.BASE_DEVICE_02.getCode().equals(baseMac)) {
            return ResponseUtil.fail("缺少对应用户权限");
        } else if (!permissionConfig.check(MenuEnum.BASE_DEVICE_03.getCode()) && MenuEnum.BASE_DEVICE_03.getCode().equals(baseMac)) {
            return ResponseUtil.fail("缺少对应用户权限");
        } else if (!permissionConfig.check(MenuEnum.BASE_DEVICE_04.getCode()) && MenuEnum.BASE_DEVICE_04.getCode().equals(baseMac)) {
            return ResponseUtil.fail("缺少对应用户权限");
        } else if (!permissionConfig.check(MenuEnum.BASE_DEVICE_05.getCode()) && MenuEnum.BASE_DEVICE_05.getCode().equals(baseMac)) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        return ResponseUtil.success(poleService.setMac(baseMac));
    }

@@ -276,6 +287,62 @@
        return ResponseUtil.success(statusList);
    }


    /**
     * æŸ¥è¯¢æ˜¯å¦å­˜åœ¨å¯æ³¨å†Œè®¾å¤‡
     *
     * @param
     * @return
     */
    @AnonymousAccess
    @PostMapping("/isRegisterByCode")
    public ResponseVO<Object> getStatusByCode() {
//        if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
        ArrayList<String> deviceCodeList = new ArrayList<>();
        deviceCodeList.add("baseDevice01");
        deviceCodeList.add("baseDevice02");
        deviceCodeList.add("baseDevice03");
        deviceCodeList.add("baseDevice04");
        deviceCodeList.add("baseDevice05");
        for (String s : deviceCodeList) {
            if (s == null) {
                return ResponseUtil.fail("参数不能为空");
            }

        }
        if (ArrayUtil.isEmpty(deviceCodeList)) {
            return ResponseUtil.fail("参数不能为空");
        }
        List<DeviceStatus> statusList = poleService.listStatusByDeviceCode(deviceCodeList);
        List<DeviceStatusDto> list = new ArrayList<>();
        String s = "baseDevice0";
        for (int i = 0; i < deviceCodeList.size(); i++) {
            DeviceStatusDto dto = new DeviceStatusDto();
            dto.setDeviceCode(s + (i + 1));
            dto.setName(s + (i + 1));
            list.add(dto);
        }

        statusList.forEach(
                status -> {
                    list.forEach(
                            dto -> {
                                if (status.getDeviceCode().equals(dto.getDeviceCode())) {
                                    //status=1时  è®¾å¤‡å¯ä»¥æ³¨å†Œ
                                    if (status.getStatus() == 1) {
                                        dto.setStatus(1);
                                    }
                                }
                            }
                    );
                }
        );
        return ResponseUtil.success(list);
    }


    @PostMapping("/ClientBindingPole")
    public ResponseVO<Object> ClientBindingPole(@RequestBody PoleBindParam param) {
        if (!permissionConfig.check(MenuEnum.CLIENT_BINDING_POLE.getCode())) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/DeviceStatusDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.sandu.ximon.admin.dto;

import lombok.Data;

import java.time.LocalDateTime;

/**
 * @author LiuHaoNan
 * @date 2022/7/22
 * æ³¨å†Œä¸‰å…ƒç ç•Œé¢å‚æ•°
 */
@Data
public class DeviceStatusDto {

    private String name;

    private String deviceCode;

    /**
     * 0 ä¸å¯æ³¨å†Œ
     * 1 å¯æ³¨å†Œ
     */
    private Integer status = 0;

    private LocalDateTime now = LocalDateTime.now();
}

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

@@ -569,10 +569,10 @@
     */
    public boolean poleReset(Long id) {
        Pole byId = getById(id);
        String deviceName = byId.getDeviceCode();
        if (byId == null) {
            throw new BusinessException("未找到该灯杆");
        }
        String deviceName = byId.getDeviceCode();
        if (deviceName.isEmpty()) {
            throw new BusinessException("该灯杆Mca为空");
        }
@@ -708,8 +708,8 @@
        /**
         * å®žä½“灯杆注册日志记录开始
         */
//        String content = "{灯杆ID：" + pole.getId() + ",灯杆编号：" + pole.getPoleCode() + ",灯杆名称：" + pole.getPoleName() + ",灯杆类型：" + pole.getDeviceType() + ",灯杆MAC：" + pole.getDeviceCode() + " }";
//        StoreOperationRecordsUtils.storeOperationData(null, null, "实体灯杆注册", content);
        String content = "{灯杆ID：" + pole.getId() + ",灯杆编号：" + pole.getPoleCode() + ",灯杆名称：" + pole.getPoleName() + ",灯杆类型：" + pole.getDeviceType() + ",灯杆MAC：" + pole.getDeviceCode() + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "实体灯杆注册", content);
        /**
         * å®žä½“灯杆注册日志记录结束
         */