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/LocateController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/LocateController.java b/src/main/java/com/lf/server/controller/show/LocateController.java
index d1de478..aa70c9d 100644
--- a/src/main/java/com/lf/server/controller/show/LocateController.java
+++ b/src/main/java/com/lf/server/controller/show/LocateController.java
@@ -1,11 +1,11 @@
package com.lf.server.controller.show;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.ResponseMsg;
-import com.lf.server.entity.bd.DlgAgnpEntity;
-import com.lf.server.service.data.UploaderService;
+import com.lf.server.entity.bd.DlgagnpEntity;
+import com.lf.server.service.data.UploadService;
import com.lf.server.service.show.LocateService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -29,7 +29,7 @@
TokenService tokenService;
@Autowired
- UploaderService uploaderService;
+ UploadService uploaderService;
@Autowired
LocateService locateService;
@@ -42,17 +42,17 @@
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectAddrByPage")
- public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<DlgagnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- Page<DlgAgnpEntity> paged = locateService.selectAddrByPage(name, pageSize, pageIndex);
+ Page<DlgagnpEntity> paged = locateService.selectAddrByPage(name, pageSize, pageIndex);
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -68,7 +68,7 @@
return success(wkt);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3