Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-20 109af646c863e5c6a2ac2fa5eefdffa9fe86d252

Merge remote-tracking branch 'origin/master'

 dao/src/main/java/com/sandu/ximon/dao/bo/AdminBo.java

ÎļþÃû´Ó ximon-admin/src/main/java/com/sandu/ximon/admin/dto/AdminDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.sandu.ximon.admin.dto;
package com.sandu.ximon.dao.bo;

import com.sandu.ximon.dao.domain.Admin;
import lombok.Data;
@@ -8,7 +8,7 @@
 * @date 2022/3/31 9:48
 */
@Data
public class AdminDto extends Admin {
public class AdminBo extends Admin {
    /**
     * è§’色ID
     */

 dao/src/main/java/com/sandu/ximon/dao/mapper/AdminMapper.java

@@ -1,8 +1,11 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.domain.Admin;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @Entity com.sandu.ximon.dao.domain.Admin
@@ -10,6 +13,7 @@
@Mapper
public interface AdminMapper extends BaseMapper<Admin> {

    List<AdminBo> listAdmin(String keyword);
}



 dao/src/main/resources/mapper/AdminMapper.xml

@@ -5,18 +5,18 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AdminMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Admin">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="username" column="username" jdbcType="VARCHAR"/>
            <result property="password" column="password" jdbcType="VARCHAR"/>
            <result property="icon" column="icon" jdbcType="VARCHAR"/>
            <result property="email" column="email" jdbcType="VARCHAR"/>
            <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
            <result property="nickName" column="nick_name" jdbcType="VARCHAR"/>
            <result property="note" column="note" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="loginTime" column="login_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="INTEGER"/>
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="username" column="username" jdbcType="VARCHAR"/>
        <result property="password" column="password" jdbcType="VARCHAR"/>
        <result property="icon" column="icon" jdbcType="VARCHAR"/>
        <result property="email" column="email" jdbcType="VARCHAR"/>
        <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
        <result property="nickName" column="nick_name" jdbcType="VARCHAR"/>
        <result property="note" column="note" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="loginTime" column="login_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
    </resultMap>

    <sql id="Base_Column_List">
@@ -25,4 +25,17 @@
        nick_name,note,create_time,
        login_time,update_time,status
    </sql>
    <select id="listAdmin" resultType="com.sandu.ximon.dao.bo.AdminBo">
        SELECT
        t1.*,
        t2.role_id
        FROM
        admin t1
        LEFT JOIN admin_role_relation t2 ON t1.id = t2.admin_id
        <where>
            <if test="keyword != null and keyword != ''">
                AND t1.username LIKE CONCAT('%', #{keyword},'%')
            </if>
        </where>
    </select>
</mapper>

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

@@ -1,12 +1,9 @@
package com.sandu.ximon.admin.controller;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
@@ -19,8 +16,6 @@
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.AdminDto;
import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
@@ -165,30 +160,32 @@
        if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
        if (keyword != null) {
            wrapper.like(Admin::getNickName, keyword)
                    .or(adminLambdaQueryWrapper -> {
                        adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
                    });
        }
        List<Admin> list = adminService.list(wrapper);
        return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));

        List<AdminDto> adminDtoList = new ArrayList<>();
        for (Admin demo : list) {
            AdminDto adminDto = new AdminDto();
            BeanUtil.copyProperties(demo, adminDto);
            AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
                    .eq(AdminRoleRelation::getAdminId, demo.getId()));

            if (one != null) {
                adminDto.setRoleId(one.getRoleId());
            }
            adminDtoList.add(adminDto);

        }
        return ResponseUtil.successPage(adminDtoList);
//        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
//        LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
//        if (keyword != null) {
//            wrapper.like(Admin::getNickName, keyword)
//                    .or(adminLambdaQueryWrapper -> {
//                        adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
//                    });
//        }
//        List<Admin> list = adminService.list(wrapper);
//
//        List<AdminDto> adminDtoList = new ArrayList<>();
//        for (Admin demo : list) {
//            AdminDto adminDto = new AdminDto();
//            BeanUtil.copyProperties(demo, adminDto);
//            AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
//                    .eq(AdminRoleRelation::getAdminId, demo.getId()));
//
//            if (one != null) {
//                adminDto.setRoleId(one.getRoleId());
//            }
//            adminDtoList.add(adminDto);
//
//        }
//        return ResponseUtil.successPage(adminDtoList);
    }

    @Log("后台用户注册")

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

@@ -236,4 +236,21 @@
        return ResponseUtil.success(URL);
    }


    /**
     * ä¿®æ”¹å¤‡æ³¨
     *
     * @param monitorParam
     * @return
     */
    @PostMapping("/updateNotes")
    public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
        boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
        if (flag) {
            return ResponseUtil.success("修改备注成功！");
        } else {
            return ResponseUtil.fail("修改备注失败！");
        }
    }

}

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

@@ -2,6 +2,7 @@

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
@@ -23,6 +24,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.sql.Wrapper;
import java.util.List;

/**
@@ -121,6 +123,12 @@
            //设备类型，0路灯，1led屏幕，2充电桩，3大气监测，4水质监测，5ip音柱，6lcd广告机，7摄像头，8杆体倾测，9一键救助
            switch (param.getDeviceType()) {
                case 0:
                    Pole pole = poleService.getById(poleId);
                    if (!pole.getDeviceCode().equals(param.getDeviceCode())) {
                        pole.setPoleName(param.getDeviceName());
                        pole.setDeviceCode(param.getDeviceCode());
                        poleService.updateById(pole);
                    }
                    break;
                case 1:
                    break;

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

@@ -39,4 +39,9 @@
    /**
     * ç»“束萤石云摄像头播放地址相关参数
     */

    /**
     * ä¿®æ”¹å¤‡æ³¨
     */
    private String notes;
}

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

@@ -3,12 +3,15 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.AdminRoleRelation;
import com.sandu.ximon.dao.domain.Client;
@@ -34,6 +37,7 @@
    private final PasswordEncoder passwordEncoder;
    private final AdminRoleRelationService adminRoleRelationService;
    private final RoleService roleService;
    private AdminMapper adminMapper;

    public Admin findByUserName(String username) {
        return getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getUsername, username).last("limit 1"));
@@ -96,7 +100,7 @@
            throw new BusinessException("编辑管理员失败");
        }

        adminRoleRelationService.remove(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId,admin.getId()));
        adminRoleRelationService.remove(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, admin.getId()));
        AdminRoleRelation adminRoleRelation = new AdminRoleRelation();
        adminRoleRelation.setAdminId(adminId);
        adminRoleRelation.setRoleId(param.getRoleId());
@@ -137,7 +141,7 @@
        List<Integer> levels = roles.stream().map(Role::getLevel).collect(Collectors.toList());
        int min = Collections.min(levels);
        int maxLevel = roleService.assertLevels(min);
        if(!RoleLevelStatus.SUPER.getCode().equals(maxLevel)){
        if (!RoleLevelStatus.SUPER.getCode().equals(maxLevel)) {
            throw new BusinessException("只有超级管理员才能删除用户");
        }

@@ -159,4 +163,12 @@
        one.setIcon(IconUrl);
        return updateById(one);
    }

    public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword) {
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }

        return adminMapper.listAdmin(keyword);
    }
}

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

@@ -108,23 +108,23 @@
                c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
            }
        }
        /**
         * æ·»åŠ ç»‘定关系开始
         */
        Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
        if (pole == null) {
            Pole pole1 = new Pole();
            pole1.setDeviceCode(deviceName);
            pole1.setPoleName(deviceName);
            pole1.setPoleCode(poleService.generatePoleCode());
            poleService.save(pole1);
        }

        Long poleId = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName)).getId();
        PoleBindingParam poleBindingParam = new PoleBindingParam();
        poleBindingParam.setDeviceType(2);
        poleBindingParam.setDeviceCode(mcuUdid);
        bindingService.bindPole(poleId, poleBindingParam);
//        /**
//         * æ·»åŠ ç»‘定关系开始
//         */
//        Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
//        if (pole == null) {
//            Pole pole1 = new Pole();
//            pole1.setDeviceCode(deviceName);
//            pole1.setPoleName(deviceName);
//            pole1.setPoleCode(poleService.generatePoleCode());
//            poleService.save(pole1);
//        }
//
//        Long poleId = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName)).getId();
//        PoleBindingParam poleBindingParam = new PoleBindingParam();
//        poleBindingParam.setDeviceType(2);
//        poleBindingParam.setDeviceCode(mcuUdid);
//        bindingService.bindPole(poleId, poleBindingParam);

        /**
         * æ·»åŠ ç»‘定关系结束

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

@@ -266,4 +266,25 @@
    }


    /**
     * ä¿®æ”¹note
     *
     * @param deviceSerial
     * @param notes
     * @return
     */
    public boolean updateNotes(String deviceSerial, String notes) {
        if (deviceSerial == null || deviceSerial.trim().length() == 0 || notes == null) {
            throw new BusinessException("修改备注参数有误！");
        }
        Monitor one = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
        if (one != null) {
            one.setNote(notes);
            return updateById(one);
        } else {
            throw new BusinessException("摄像头设备不存在！");
        }
    }


}

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

@@ -62,6 +62,7 @@
        Pole pole = new Pole();
        BeanUtils.copyProperties(param, pole);
        pole.setPoleCode(generatePoleCode());
        pole.setDeviceType(-1);
        return save(pole);
    }