根据mac查询报警信息加上特殊设备

chen_xi

2022-10-19 1b693369a0855332084612ab5e2159e7cb9f681b

 screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java

@@ -32,7 +32,7 @@
    OrganizationService organizationService;

    @PostMapping("insert")
    public ResultMessage insert(@RequestBody OrganizationInsertForm form, HttpServletRequest request) {
    public ResultMessage insert(@RequestBody OrganizationInsertForm form) {

        //判断是否缺少参数
        if (!form.valid())
@@ -48,14 +48,11 @@
        //处理插入业务
        OrganizationDTO dto = organizationService.insertOrganization(form);

        //转换前端需要的参数
        OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }

    @PostMapping("update")
    public ResultMessage update(@RequestBody OrganizationUpdateForm form, HttpServletRequest request) {
    public ResultMessage update(@RequestBody OrganizationUpdateForm form) {

        //判断是否缺少参数
        if (!form.valid())
@@ -71,14 +68,11 @@
        //处理更新业务
        OrganizationDTO dto = organizationService.updateOrganization(form);

        //转换前端需要的参数
        OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }

    @PostMapping("delete")
    public ResultMessage delete(@RequestBody OrganizationDeleteForm form,HttpServletRequest request) {
    public ResultMessage delete(@RequestBody OrganizationDeleteForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -87,13 +81,10 @@
        //处理删除业务
        OrganizationDTO dto = organizationService.deleteOrganization(form);

        //转换前端需要的参数
        OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }

/*    @GetMapping("query")
    @GetMapping("query")
    public ResultMessage query(OrganizationQueryForm form) {
        //判断是否缺少参数
        if (!form.valid())
@@ -107,7 +98,7 @@
        OrganizationQueryVO vo = OrganizationQueryVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
    }*/
    }

    @GetMapping("queryNames")
    public ResultMessage queryNames(OrganizationQueryNamesForm form){