From bc2ef24fd7dc27159c11fa5b6c4c0b670db7ddd9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:27:11 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 91b2143..e1ade6d 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
@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.system.dto.NoticesDTO;
@@ -16,6 +17,7 @@
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.VisitsService;
+import com.doumee.service.business.impl.hksync.HkSyncNoticeServiceImpl;
import com.doumee.service.system.NoticesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -45,6 +47,8 @@
@Autowired
private VisitsService visitsService;
+ @Autowired
+ private HkSyncNoticeServiceImpl hkSyncNoticeService;
@Autowired
private NoticesService noticesService;
@@ -89,6 +93,8 @@
@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) {
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ hkSyncNoticeService.syncHkNotices(loginUserInfo.getUsername());
return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataH5(getLoginUser(token).getMemberId(),isDetail));
}
@@ -96,17 +102,24 @@
@ApiOperation(value = "浠诲姟涓績澶撮儴 - PC", notes = "PC")
@PostMapping("/taskCenterHeadPC")
public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- noticesDTO.setMemberId(getLoginUser(token).getMemberId());
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ hkSyncNoticeService.syncHkNotices(loginUserInfo.getUsername());
+ noticesDTO.setMemberId(loginUserInfo.getMemberId());
+ noticesDTO.setUserId(loginUserInfo.getId());
return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataPC(noticesDTO));
}
+
@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());
+// pageWrap.getModel().setUserId(loginUserInfo.getId());
return ApiResponse.success(noticesService.taskCanterPage(pageWrap));
}
+
+
@ApiOperation("鏍囪宸茶")
@GetMapping("/signRead")
@@ -123,4 +136,19 @@
}
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+
+ @ApiOperation("PC宸ヤ綔鍙�")
+ @GetMapping("/pCWorkPlatformData")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "queryType", value = "鏌ヨ绫诲瀷锛�1=鍦ㄥ洯浜烘暟锛�2=鎶ヨ〃鏁版嵁锛�3=寰呭姙浜嬮」锛�4=瓒呮椂棰勮", required = true),
+ })
+ public ApiResponse<PCWorkPlatformDataVO> pCWorkPlatformData (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ if(queryType==Constants.THREE){
+ //鍚屾娴峰悍浠ｅ姙鏁版嵁
+ hkSyncNoticeService.syncHkNotices(this.getLoginUser(token).getUsername());
+ }
+ PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(queryType,getLoginUser(token));
+ return ApiResponse.success("鏌ヨ鎴愬姛",pcWorkPlatformDataVO);
+ }
}
--
Gitblit v1.9.3