From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 26 八月 2024 18:11:07 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java index e4d6e8d..35c331f 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java @@ -2,17 +2,24 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.CloudRequiredPermission; +import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; 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.business.dto.ResetPasswordDTO; import com.doumee.dao.business.model.Visits; import com.doumee.service.business.VisitsService; import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl; +import com.doumee.service.system.SystemUserService; 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.*; @@ -32,6 +39,8 @@ private VisitsService visitsService; @Autowired private HkSyncVisitFromHKServiceImpl hkSyncVisitFromHKService; + @Autowired + private SystemUserService systemUserService; @PreventRepeat @ApiOperation("鏂板缓") @@ -89,6 +98,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:visits:query") public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId()); return ApiResponse.success(visitsService.findPage(pageWrap)); } @@ -103,7 +113,8 @@ @GetMapping("/{id}") @CloudRequiredPermission("business:visits:query") public ApiResponse<Visits> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - return ApiResponse.success(visitsService.findById(id)); + LoginUserInfo loginUserInfo = getLoginUser(token); + return ApiResponse.success(visitsService.findById(id,loginUserInfo.getMemberId())); } @ApiOperation("婊炵暀浜哄憳") @@ -113,4 +124,40 @@ pageWrap.getModel().setLevelStatus(Constants.ZERO); return ApiResponse.success(visitsService.retentionPage(pageWrap)); } + + @ApiOperation(value = "PC绔瀹㈣褰曟彁浜�", notes = "璁垮鎻愪氦") + @PostMapping("/createFk") + public ApiResponse createFk(@RequestBody Visits visits) { + visits.setSourceType(Constants.ZERO); + return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false,Constants.ONE)); + } + + + + @ApiOperation(value = "璁垮鎶ュ", notes = "璁垮鎶ュ") + @PostMapping("/createVisit") + public ApiResponse createVisit(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo loginUserInfo = getLoginUser(token); + visits.setMemberId(loginUserInfo.getMemberId()); + visits.setCreateMemberId(loginUserInfo.getMemberId()); + visits.setReceptMemberId(visits.getMemberId()); + return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.visitReporting(visits)); + } + + @LoginNoRequired + @ApiOperation("閲嶇疆瀵嗙爜") + @PostMapping("/resetPassword") + public ApiResponse resetPassword(@RequestBody ResetPasswordDTO resetPasswordDTO){ + visitsService.resetPassword(resetPasswordDTO); + return ApiResponse.success("閲嶇疆鎴愬姛"); + } + + @ApiOperation("閲嶆柊涓嬪彂澶辫触鐨勯绾�") + @GetMapping("/visitResend") + @CloudRequiredPermission("business:visits:update") + public ApiResponse visitResend(@RequestParam Integer visitId) { + visitsService.visitResend(visitId); + return ApiResponse.success(null); + } + } -- Gitblit v1.9.3