From a7fb50c91e4932aa175be266fbdd42b2a70eba66 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 22 五月 2024 18:11:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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..39aa80b 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,16 +2,21 @@
 
 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.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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +37,8 @@
     private VisitsService visitsService;
     @Autowired
     private HkSyncVisitFromHKServiceImpl hkSyncVisitFromHKService;
+    @Autowired
+    private SystemUserService systemUserService;
 
     @PreventRepeat
     @ApiOperation("鏂板缓")
@@ -113,4 +120,27 @@
         pageWrap.getModel().setLevelStatus(Constants.ZERO);
         return ApiResponse.success(visitsService.retentionPage(pageWrap));
     }
+
+
+
+    @ApiOperation(value = "璁垮鎶ュ", notes = "璁垮鎶ュ")
+    @PostMapping("/createVisit")
+    public ApiResponse createVisit(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        visits.setMemberId(getLoginUser(token).getMemberId());
+        return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.visitReporting(visits));
+    }
+
+
+
+    @LoginNoRequired
+    @ApiOperation("閲嶇疆瀵嗙爜")
+    @PostMapping("/resetPassword")
+    public ApiResponse resetPassword(@RequestBody ResetPasswordDTO resetPasswordDTO){
+        visitsService.resetPassword(resetPasswordDTO);
+        return ApiResponse.success("閲嶇疆鎴愬姛");
+    }
+
+
+
+
 }

--
Gitblit v1.9.3