dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportErrorMapper.java
@@ -19,7 +19,7 @@ * @param keyword 关键词 * @return 故障码列表 */ List<LightReportErrorBo> listReportError(String keyword, int error_code, Long userid); List<LightReportErrorBo> listReportError(String keyword, Integer error_code, Long userid); }
@@ -15,7 +15,7 @@ List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2); List<MonitorBo> listMonitorByIds(String keyword, int bindingState, int equipmentState, Long userid); List<MonitorBo> listMonitorByIds(List<String> list, String keyword, int bindingState, int equipmentState, Long userid); List<String> listMonitorDeviceSerial(); } dao/src/main/resources/mapper/MonitorMapper.xml
@@ -56,6 +56,12 @@ AND t2.device_type = 7 LEFT JOIN pole t3 ON t3.id = t2.pole_id <where> <if test="list != null"> t1.device_serial IN <foreach collection="list" open="(" close=")" separator="," item="deviceCode"> #{deviceCode} </foreach> </if> <if test="keyword != null and keyword != ''"> AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR t1.device_serial LIKE CONCAT(CONCAT('%', #{keyword}), '%') ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -87,7 +87,7 @@ @GetMapping("/error/list") public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword , @RequestParam(required = false) int errorCode) { , @RequestParam(required = false) Integer errorCode) { if (!permissionConfig.check(MenuEnum.LIGHT_ERROR_LIST.getCode())) { return ResponseUtil.fail("缺少对应用户权限"); } ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -47,16 +47,16 @@ return ResponseUtil.fail("缺少对应用户权限"); } List<String> list; list = monitorMapper.listMonitorDeviceSerial(); MonitorParam monitorParam1; for (String devices_serial : list) { monitorParam1 = new MonitorParam(); monitorParam1.setAccessToken(monitorService.getAccessToken()); monitorParam1.setDeviceSerial(devices_serial); getYSYMonitorInfoAndaddMonitorToTable(monitorParam1); } // List<String> list; // list = monitorMapper.listMonitorDeviceSerial(); // // MonitorParam monitorParam1; // for (String devices_serial : list) { // monitorParam1 = new MonitorParam(); // monitorParam1.setAccessToken(monitorService.getAccessToken()); // monitorParam1.setDeviceSerial(devices_serial); // getYSYMonitorInfoAndaddMonitorToTable(monitorParam1); // } //返回查询的摄像头信息列表 List<MonitorBo> listresult; if (monitorParam == null) { @@ -189,25 +189,8 @@ */ @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable") public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) { YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial()); if ("200".equals(getMonitorDto.getCode())) { Monitor monitor = new Monitor(); monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial()); if (monitorParam.getValidateCode() != null) { monitor.setDevicesCode(monitorParam.getValidateCode()); } monitor.setDeviceName(getMonitorDto.getData().getDeviceName()); monitor.setDeviceType(getMonitorDto.getData().getModel()); monitor.setEquipmentState(getMonitorDto.getData().getStatus()); monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt()); monitor.setAddTime(getMonitorDto.getData().getUpdateTime()); monitor.setNetAddress(getMonitorDto.getData().getNetAddress()); return monitorService.addMonitorInfoToTable(monitor); } else { throw new BusinessException(getMonitorDto.getMsg()); } Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam); return monitorService.addMonitorInfoToTable(monitor); } /** ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
@@ -26,7 +26,7 @@ save(lightReportError); } public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword, int error_code) { public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword, Integer error_code) { PageHelper.startPage(pageNo, pageSize); List<LightReportErrorBo> lightReportErrorBos; //为null的话是超管 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -54,6 +54,18 @@ * 模糊查询 */ public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) { List<String> list; list = monitorMapper.listMonitorDeviceSerial(); MonitorParam monitorParam1; for (String devices_serial : list) { monitorParam1 = new MonitorParam(); monitorParam1.setAccessToken(getAccessToken()); monitorParam1.setDeviceSerial(devices_serial); getYSYMonitorInfoAndaddMonitorToTable(monitorParam1); } Long clientId = SecurityUtils.getClientId(); if (baseConditionVO != null) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); @@ -69,11 +81,33 @@ monitorParam.setEquipmentState(2); } monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId); monitorList = monitorMapper.listMonitorByIds(list, monitorParam.getKeyword(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId); return monitorList; } public Monitor getYSYMonitorInfoAndaddMonitorToTable(MonitorParam monitorParam) { YSY_MonitorDto getMonitorDto = getYSYMonitorInfo(getAccessToken(), monitorParam.getDeviceSerial()); if ("200".equals(getMonitorDto.getCode())) { Monitor monitor = new Monitor(); monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial()); if (monitorParam.getValidateCode() != null) { monitor.setDevicesCode(monitorParam.getValidateCode()); } monitor.setDeviceName(getMonitorDto.getData().getDeviceName()); monitor.setDeviceType(getMonitorDto.getData().getModel()); monitor.setEquipmentState(getMonitorDto.getData().getStatus()); monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt()); monitor.setAddTime(getMonitorDto.getData().getUpdateTime()); monitor.setNetAddress(getMonitorDto.getData().getNetAddress()); return monitor; } else { throw new BusinessException(getMonitorDto.getMsg()); } } /** * 删除摄像头 * ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -33,6 +33,7 @@ import com.sandu.ximon.admin.vo.PoleBindVO; import com.sandu.ximon.dao.bo.*; import com.sandu.ximon.dao.domain.*; import com.sandu.ximon.dao.mapper.MonitorMapper; import com.sandu.ximon.dao.mapper.PoleMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -851,8 +852,8 @@ // } public boolean updateDeviceCode(Long poleId){ return poleMapper.updateDeviceCode(poleId); public boolean updateDeviceCode(Long poleId) { return poleMapper.updateDeviceCode(poleId); } }
