From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/show/MarkController.java | 71 ++++++++++-------------------------
1 files changed, 21 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/MarkController.java b/src/main/java/com/lf/server/controller/show/MarkController.java
index 2ff0d1f..8d63273 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -1,14 +1,14 @@
package com.lf.server.controller.show;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
-import com.lf.server.entity.all.HttpStatus;
import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.WebHelper;
+import com.lf.server.service.all.BaseUploadService;
+import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.MarkService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -18,7 +18,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -34,6 +33,15 @@
@Autowired
TokenService tokenService;
+
+ @Autowired
+ BaseUploadService baseUploadService;
+
+ @Autowired
+ DownlogService downlogService;
+
+ @Autowired
+ DownloadService downloadService;
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@@ -61,7 +69,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -77,7 +85,7 @@
return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -98,7 +106,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -121,7 +129,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -137,7 +145,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -157,7 +165,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -179,7 +187,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -203,44 +211,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓婁紶ShapeFile鏂囦欢")
- @ResponseBody
- @PostMapping(value = "/uploadShp", produces = "application/json; charset=UTF-8")
- public ResponseMsg<List<MarkJsonEntity>> uploadShp(HttpServletRequest req, HttpServletResponse res) {
- try {
- List<MarkJsonEntity> list = null;
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓嬭浇ShapeFile鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "鏍囩粯JSON瀹炰綋绫婚泦鍚�", dataType = "MarkJsonEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/downloadShp", produces = "application/json; charset=UTF-8")
- public void downloadShp(@RequestBody List<MarkJsonEntity> list, HttpServletRequest req, HttpServletResponse res) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�"));
- }
- if (list == null || list.isEmpty()) {
- WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.BAD_REQUEST, "鎵句笉鍒版爣缁樺疄浣�"));
- }
-
- markService.downloadShp(ue, list, req, res);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
+ return fail(ex, -1);
}
}
}
--
Gitblit v1.9.3