From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 16:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 5 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..af20c8f 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,15 +2,19 @@
 
 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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.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.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +36,8 @@
     private VisitsService visitsService;
     @Autowired
     private HkSyncVisitFromHKServiceImpl hkSyncVisitFromHKService;
+    @Autowired
+    private SystemUserService systemUserService;
 
     @PreventRepeat
     @ApiOperation("鏂板缓")
@@ -45,7 +51,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:visits:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        visitsService.deleteById(id);
+        visitsService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -89,6 +95,8 @@
     @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());
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(visitsService.findPage(pageWrap));
     }
 
@@ -96,6 +104,7 @@
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:visits:exportExcel")
     public void exportExcel (@RequestBody PageWrap<Visits> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(Visits.class).export(visitsService.findPage(pageWrap).getRecords(), "璁垮鐢宠淇℃伅琛�", response);
     }
 
@@ -103,7 +112,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 +123,41 @@
         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());
+        visits.setLoginUserInfo(loginUserInfo);
+        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