From 5726af81e3401c3805a4e50dbada5ffc6c34ef16 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 30 六月 2021 19:06:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/LcCompareCodeApi.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/LcCompareCodeApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/LcCompareCodeApi.java
index 0b4f68c..02c9b01 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/LcCompareCodeApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/LcCompareCodeApi.java
@@ -1,24 +1,21 @@
package com.panzhihua.service_grid.api;
-import com.panzhihua.common.model.dtos.grid.*;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
-import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.LcCompareCodeService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.util.List;
/**
- *
- * @author cedoo email:cedoo(a)qq.com
+ * @author manailin
* @version 1.0
- * @since 1.0
* @date 2021-05-26
- * */
+ * @since 1.0
+ */
@Slf4j
@RestController
@RequestMapping("/lc_compare")
@@ -30,26 +27,26 @@
/**
* description 根据本地网格ID，查询对于的浪潮市平台对应的ID
*
- * @param id 本地网格ID
+ * @param id 本地网格ID
* @return String 浪潮市平台对应的ID
* @author manailin
* @date 2021/6/10 17:00
*/
@GetMapping("/{id}")
- String getLcGridIdByLocal(@PathVariable("id") Long id){
+ String getLcGridIdByLocal(@PathVariable("id") Long id) {
return lcCompareCodeService.getLcGridIdByLocal(id);
}
/**
* description 根据本地网格ID，查询对于的浪潮市平台对应的ID
*
- * @param localUserId 本地网格员ID
+ * @param localUserId 本地网格员ID
* @return String 浪潮市平台对应的ID
* @author manailin
* @date 2021/6/10 17:00
*/
@GetMapping("/getLcUserId")
- String getLcUserIdByLocalUserId(String localUserId){
+ String getLcUserIdByLocalUserId(String localUserId) {
return lcCompareCodeService.getLcUserIdByLocal(localUserId);
}
}
--
Gitblit v1.7.1