Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java

@@ -74,4 +74,37 @@
        return ResultMessage.ok(resultMap);
    }

    @RequestMapping(value = "alarmReminder2", method = RequestMethod.GET)
    @ResponseBody
    public ResultMessage alarmReminder2(HttpServletRequest request){
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
        Object monitorPointIds = parameters.get("monitorPointIds");
        Object size = parameters.get("size");
        if (ObjectUtils.isEmpty(monitorPointIds) || ObjectUtils.isEmpty(size)){
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> resultMap = alarmInfoService.alarmReminderByMonitorPointIds(parameters);
        return ResultMessage.ok(resultMap);
    }

    @RequestMapping(value = "getDataByConditionWithoutPage", method = RequestMethod.GET)
    @ResponseBody
    public ResultMessage getDataByConditionWithoutPage(HttpServletRequest request){
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
        Object orgid = parameters.get("organization_id");
        Object startTime = parameters.get("startTime");
        Object endTime = parameters.get("endTime");
        Object index = parameters.get("index");
        Object alarmType = parameters.get("alarmType");
        if (ObjectUtils.isEmpty(orgid) || ObjectUtils.isEmpty(startTime) || ObjectUtils.isEmpty(endTime) || ObjectUtils.isEmpty(index) || ObjectUtils.isEmpty(alarmType)){
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
        if (ObjectUtils.isEmpty(organization)){
            return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
        }
        Map<String, Object> resultMap = alarmInfoService.getDataByConditionWithoutPage(parameters);
        return ResultMessage.ok(resultMap);
    }

}