From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java
index 0939398..c5c415e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java
@@ -1,27 +1,29 @@
package com.panzhihua.service_grid.service.impl;
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.dao.LcCompareCodeMapper;
import com.panzhihua.service_grid.dao.LcCompareMemberCodeMapper;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;
import com.panzhihua.service_grid.model.dos.LcCompareCodeMemberDO;
import com.panzhihua.service_grid.service.LcCompareCodeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
/**
- * program 攀枝花智慧社区项目
- * description 本地网格和浪潮的对码表管理API
+ * program 攀枝花智慧社区项目 description 本地网格和浪潮的对码表管理API
*
- * @author manailin
- * Date 2021-01-22 15:30
+ * @author manailin Date 2021-01-22 15:30
**/
@Slf4j
@Service
-public class LcCompareCodeServiceImpl extends ServiceImpl<LcCompareCodeMapper, LcCompareCodeDO> implements LcCompareCodeService {
+public class LcCompareCodeServiceImpl extends ServiceImpl<LcCompareCodeMapper, LcCompareCodeDO>
+ implements LcCompareCodeService {
@Resource
private LcCompareMemberCodeMapper compareMemberCodeMapper;
@@ -29,10 +31,7 @@
@Override
public String getLcGridIdByLocal(Long id) {
try {
- return baseMapper.selectOne(
- new QueryWrapper<LcCompareCodeDO>()
- .eq("local_grid_id", id)
- ).getLcGridId();
+ return baseMapper.selectOne(new QueryWrapper<LcCompareCodeDO>().eq("local_grid_id", id)).getLcGridId();
} catch (Exception e) {
log.error("根据本地GRID查询浪潮网格对应表数据出错");
}
@@ -42,13 +41,22 @@
@Override
public String getLcUserIdByLocal(String localUserId) {
try {
- return compareMemberCodeMapper.selectOne(
- new QueryWrapper<LcCompareCodeMemberDO>()
- .eq("local_grid_member_id", localUserId)
- ).getLcBindUserId();
+ return compareMemberCodeMapper
+ .selectOne(new QueryWrapper<LcCompareCodeMemberDO>().eq("local_grid_member_id", localUserId))
+ .getLcBindUserId();
} catch (Exception e) {
log.error("根据本地GRID查询浪潮网格对应表数据出错");
}
return null;
}
+
+ /**
+ * 综治后台-查询所有市平台网格列表
+ *
+ * @return 市平台网格列表
+ */
+ @Override
+ public R getLcGridLists() {
+ return R.ok(this.baseMapper.getLcGridLists());
+ }
}
--
Gitblit v1.7.1