From 6525935588f4b9a06e08f91dfc9d2895e5ec2c38 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 11:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java
index 34df5fa..e90ac82 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java
@@ -4,9 +4,13 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.JkCustomer;
import com.doumee.dao.business.model.JkSketch;
+import com.doumee.dao.business.model.JkSketchLine;
import com.doumee.service.business.JkSketchService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
@@ -72,6 +76,34 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateSketchLine")
+ @CloudRequiredPermission("business:jksketch:update")
+ public ApiResponse updateSketchLine(@RequestBody JkSketch jkSketch, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jkSketch.setLoginUserInfo(this.getLoginUser(token));
+ JkSketch model = jkSketchService.updateSketchLine(jkSketch);
+ jkSketchService.startEditSketchLineAsync(model);//寮傛浼樺寲
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID閲嶆柊璁＄畻褰撳墠绾胯矾鐨勮窛绂�")
+ @PostMapping("/initOriginDistance")
+ @CloudRequiredPermission("business:jksketch:update")
+ public ApiResponse<JkSketch> initOriginDistance(@RequestBody JkSketch jkSketch, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jkSketch.setLoginUserInfo(this.getLoginUser(token));
+ JkSketch model = jkSketchService.initOriginDistance(jkSketch);
+ return ApiResponse.success(model);
+ }
+ @ApiOperation("涓荤嚎璺鎴疯窛绂昏绠�")
+ @PostMapping("/distanceCustomer")
+ @CloudRequiredPermission("business:jksketch:update")
+ public ApiResponse distanceCustomer(@RequestBody JkSketch model, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ model.setLoginUserInfo(this.getLoginUser(token));
+ Category category = jkSketchService.checkDataValid(model);
+ jkSketchService.distanceCustomer(category);//寮傛璁＄畻
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:jksketch:query")
@@ -102,6 +134,11 @@
@CloudRequiredPermission("business:jksketch:create")
public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, String dateInfo, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
List<JkSketch> list = jkSketchService.importBatch(file,dateInfo,this.getLoginUser(token));
+ if(list!=null){
+ for(JkSketch model :list){
+ jkSketchService.startInitOriginDistanceBatch(model);
+ }
+ }
return ApiResponse.success("瀵煎叆鎴愬姛");
}
}
--
Gitblit v1.9.3