From 73af3ed9fbcc616cdecc739fc4307163c19c5764 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 14:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
index 4141bb9..4dddf78 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
@@ -1,18 +1,31 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.system.dto.NoticesDTO;
+import com.doumee.dao.system.model.Notices;
+import com.doumee.dao.web.response.InternalHomeVO;
+import com.doumee.service.business.ApproveService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.VisitsService;
+import com.doumee.service.system.NoticesService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -32,6 +45,11 @@
@Autowired
private VisitsService visitsService;
+ @Autowired
+ private NoticesService noticesService;
+
+ @Autowired
+ private ApproveService approveService;
@ApiOperation("澶撮儴鏁版嵁")
@@ -63,4 +81,39 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+
+ @ApiOperation(value = "浠诲姟涓績澶撮儴", notes = "H5")
+ @GetMapping("/taskCenterHead")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "isDetail", value = " 鏄惁鏌ヨ璇︾粏 1鏄紱0鍚�", required = true),
+ })
+ public ApiResponse<InternalHomeVO> taskCenterHead(@RequestParam Integer isDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeData(getLoginUser(token).getMemberId(),isDetail));
+ }
+
+
+ @ApiOperation("浠诲姟涓績鍒嗛〉")
+ @PostMapping("/taskPage")
+ public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ pageWrap.getModel().setMemberId(loginUserInfo.getMemberId());
+ return ApiResponse.success(noticesService.taskCanterPage(pageWrap));
+ }
+
+ @ApiOperation("鏍囪宸茶")
+ @GetMapping("/signRead")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "noticesId", value = "璁板綍涓婚敭", required = false),
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "signType", value = "鏍囪绫诲瀷锛�0=鍗曚釜鏍囪;1=鏍囪鍏ㄩ儴鏈", required = false),
+ })
+ public ApiResponse signRead (Integer noticesId,@RequestParam Integer signType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ if(Constants.equalsInteger(signType,Constants.ZERO)){
+ noticesService.signReadById(noticesId);
+ }else{
+ noticesService.signRead(loginUserInfo.getMemberId());
+ }
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3