fix

zhanzhiqin

2022-04-13 aee78de39e2d957a0c4a91f75ab9f77b03e46af3

fix

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

@@ -15,7 +15,7 @@
    List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);


    List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState);
    List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState, Long userid);

    List<String> listMonitorDeviceSerial();
}

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

@@ -71,6 +71,9 @@
            <if test="equipmentState != 2">
                AND t1.equipment_state = #{equipmentState}
            </if>
            <if test="userid != null">
                AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
            </if>
        </where>
    </select>
    <select id="listMonitorDeviceSerial" resultType="java.lang.String">

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

@@ -5,6 +5,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.RoleParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.RoleService;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleDetail;
@@ -23,7 +24,7 @@
@RestController
@RequestMapping("/v1/role")
public class RoleController {

    private PermissionConfig permissionConfig;
    private final RoleService roleService;

    /**
@@ -38,9 +39,14 @@

    @GetMapping("/list")
    public ResponseVO<Object> listRole(BaseConditionVO conditionVO) {
        if (!permissionConfig.check("角色管理")) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        List<RoleDetail> roleDetails = roleService.listRole(conditionVO.getPageNo(), conditionVO.getPageSize());
        return ResponseUtil.success(roleDetails);
    }

    @PostMapping("/add")
    public ResponseVO<Object> addRole(@Validated @RequestBody RoleParam param) {
        boolean result = roleService.addRole(param);

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

@@ -5,6 +5,7 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -67,7 +68,15 @@
            monitorParam.setEquipmentState(2);
        }

        monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());

        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), null);
        } else {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), SecurityUtils.getUserId());
        }

        return monitorList;
    }
@@ -115,7 +124,7 @@
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
        if(validateCode != null ){
        if (validateCode != null) {
            paramMap.put("validateCode", validateCode);
        }
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);