Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java

@@ -1,5 +1,9 @@
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;
@@ -8,21 +12,18 @@
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;
@@ -30,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查询浪潮网格对应表数据出错");
        }
@@ -43,10 +41,9 @@
    @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查询浪潮网格对应表数据出错");
        }
@@ -55,6 +52,7 @@

    /**
     * 综治后台-查询所有市平台网格列表
     * 
     * @return  市平台网格列表
     */
    @Override