Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java

@@ -6,6 +6,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.vo.HiddenDangerDataVO;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
@@ -51,7 +52,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:hiddendanger:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        hiddenDangerService.deleteById(id);
        hiddenDangerService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -117,4 +118,13 @@
        return ApiResponse.success("操作成功");
    }


    @ApiOperation("隐患数据统计")
    @PostMapping("/hiddenDangerData")
    public ApiResponse<HiddenDangerDataVO> hiddenDangerData (@RequestBody HiddenDanger hiddenDanger, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        hiddenDanger.setLoginUserInfo(getLoginUser(token));
        return ApiResponse.success("操作成功",hiddenDangerService.hiddenDangerData(hiddenDanger));
    }


}