系统用户绑定网格员功能 init

epdc-cloud-admin/pom.xml

@@ -97,6 +97,11 @@
             <artifactId>epdc-optimize-department</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-analysis-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysEpmetUserRelationController.java

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.SysEpmetUserRelationDTO;
+import com.elink.esua.epdc.service.SysEpmetUserRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 项目产品工作人员关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-07-08
+ */
+@RestController
+@RequestMapping("sysepmetuserrelation")
+public class SysEpmetUserRelationController {
+
+    @Autowired
+    private SysEpmetUserRelationService sysEpmetUserRelationService;
+
+    @GetMapping("page")
+    public Result<PageData<SysEpmetUserRelationDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<SysEpmetUserRelationDTO> page = sysEpmetUserRelationService.page(params);
+        return new Result<PageData<SysEpmetUserRelationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<SysEpmetUserRelationDTO> get(@PathVariable("id") String id){
+        SysEpmetUserRelationDTO data = sysEpmetUserRelationService.get(id);
+        return new Result<SysEpmetUserRelationDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody SysEpmetUserRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        sysEpmetUserRelationService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody SysEpmetUserRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        sysEpmetUserRelationService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        sysEpmetUserRelationService.delete(ids);
+        return new Result();
+    }
+
+    /**
+     * 根据手机号获取产品工作人员信息
+     *
+     * @param mobile 当前用户手机号
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO>
+     * @author liuchuang
+     * @since 2021/7/8 16:42
+     */
+    @GetMapping("getstaffuser/{mobile}")
+    public Result<SysEpmetUserRelationDTO> getStaffUserFromEpmet(@PathVariable("mobile") String mobile) {
+        return sysEpmetUserRelationService.getStaffUserFromEpmet(mobile);
+    }
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -64,6 +64,8 @@ public class SysUserController {
     private SysDeptService sysDeptService;
     @Autowired
     private OptSysDeptService optSysDeptService;
+    @Autowired
+    private SysEpmetUserRelationService sysEpmetUserRelationService;
 
     @GetMapping("page")
     @ApiOperation("分页")
@@ -89,6 +91,15 @@ public class SysUserController {
         List<Long> roleIdList = sysRoleUserService.getRoleIdList(id);
         data.setRoleIdList(roleIdList);
 
+        // 绑定的网格员信息
+        SysEpmetUserRelationDTO wgyInfo = sysEpmetUserRelationService.getSysUserRelationEpmetInfo(id);
+        if (null == wgyInfo) {
+            SysEpmetUserRelationDTO wgy = new SysEpmetUserRelationDTO();
+            data.setWgyInfo(wgy);
+        } else {
+            data.setWgyInfo(wgyInfo);
+        }
+
         return new Result<SysUserDTO>().ok(data);
     }
 

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysEpmetUserRelationDao.java

@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.SysEpmetUserRelationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目产品工作人员关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-07-08
+ */
+@Mapper
+public interface SysEpmetUserRelationDao extends BaseDao<SysEpmetUserRelationEntity> {
+
+    /**
+     * 获取当前用户已绑定的产品工作人员信息
+     *
+     * @param id 当前用户ID
+     * @return com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity
+     * @author liuchuang
+     * @since 2021/7/8 17:04
+     */
+    SysEpmetUserRelationEntity selectSysUserRelationEpmetInfo(Long id);
+
+    /**
+     * 删除已绑定网格员信息
+     *
+     * @param id 系统用户ID
+     * @return void
+     * @author liuchuang
+     * @since 2021/7/10 14:29
+     */
+    void deleteRelationInfoBySysUserId(Long id);
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysEpmetUserRelationEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 项目产品工作人员关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_epmet_user_relation")
+public class SysEpmetUserRelationEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目端用户ID
+     */
+	private Long sysUserId;
+
+    /**
+     * 产品端工作人员ID
+     */
+	private String staffId;
+
+    /**
+     * 产品端工作人员姓名
+     */
+	private String staffName;
+
+    /**
+     * 产品端工作人员手机号
+     */
+	private String mobile;
+
+    /**
+     * 产品端工作人员所属组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 产品端工作人员所属组织全路径名称
+     */
+	private String agencyAllName;
+
+    /**
+     * 产品端工作人员所属客户id
+     */
+	private String customerId;
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO;
+import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO;
+import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 数据分析模块调用
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/9 15:41
+ */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class)
+public interface AnalysisFeignClient {
+
+    /**
+     * 根据手机号获取产品工作人员信息
+     *
+     * @param formDto 入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO>
+     * @author liuchuang
+     * @since 2021/7/8 19:19
+     */
+    @GetMapping(value = "analysis/admin/getEpmetUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto);
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.admin.*;
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author：songyunpeg
+ * @Date：2020/9/9 15:42
+ */
+@Component
+public class AnalysisFeignClientFallback implements AnalysisFeignClient {
+
+    @Override
+    public Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getEpmetUserInfoByMobile",formDto);
+    }
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysEpmetUserRelationService.java

@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysEpmetUserRelationDTO;
+import com.elink.esua.epdc.entity.SysEpmetUserRelationEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目产品工作人员关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-07-08
+ */
+public interface SysEpmetUserRelationService extends BaseService<SysEpmetUserRelationEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<SysEpmetUserRelationDTO>
+     * @author generator
+     * @date 2021-07-08
+     */
+    PageData<SysEpmetUserRelationDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<SysEpmetUserRelationDTO>
+     * @author generator
+     * @date 2021-07-08
+     */
+    List<SysEpmetUserRelationDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return SysEpmetUserRelationDTO
+     * @author generator
+     * @date 2021-07-08
+     */
+    SysEpmetUserRelationDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-07-08
+     */
+    void save(SysEpmetUserRelationDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-07-08
+     */
+    void update(SysEpmetUserRelationDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-07-08
+     */
+    void delete(String[] ids);
+
+    /**
+     * 获取当前用户已绑定的产品工作人员信息
+     *
+     * @param id 当前用户ID
+     * @return com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO
+     * @author liuchuang
+     * @since 2021/7/8 17:02
+     */
+    SysEpmetUserRelationDTO getSysUserRelationEpmetInfo(Long id);
+
+    /**
+     * 根据手机号获取产品工作人员信息
+     *
+     * @param mobile 当前用户手机号
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO>
+     * @author liuchuang
+     * @since 2021/7/8 17:14
+     */
+    Result<SysEpmetUserRelationDTO> getStaffUserFromEpmet(String mobile);
+
+    /**
+     * 当前用户绑定产品工作人员信息
+     *
+     * @param id 系统用户ID
+     * @param wgyInfo 网格员信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2021/7/10 17:45
+     */
+    Result saveOrUpdateUserEpmetRelation(Long id, SysEpmetUserRelationDTO wgyInfo);
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysEpmetUserRelationServiceImpl.java

@@ -0,0 +1,138 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dao.SysEpmetUserRelationDao;
+import com.elink.esua.epdc.dto.SysEpmetUserRelationDTO;
+import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO;
+import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO;
+import com.elink.esua.epdc.entity.SysEpmetUserRelationEntity;
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
+import com.elink.esua.epdc.service.SysEpmetUserRelationService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目产品工作人员关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-07-08
+ */
+@Service
+public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl<SysEpmetUserRelationDao, SysEpmetUserRelationEntity> implements SysEpmetUserRelationService {
+
+    @Autowired
+    private AnalysisFeignClient analysisFeignClient;
+
+    @Override
+    public PageData<SysEpmetUserRelationDTO> page(Map<String, Object> params) {
+        IPage<SysEpmetUserRelationEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, SysEpmetUserRelationDTO.class);
+    }
+
+    @Override
+    public List<SysEpmetUserRelationDTO> list(Map<String, Object> params) {
+        List<SysEpmetUserRelationEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, SysEpmetUserRelationDTO.class);
+    }
+
+    private QueryWrapper<SysEpmetUserRelationEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<SysEpmetUserRelationEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public SysEpmetUserRelationDTO get(String id) {
+        SysEpmetUserRelationEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, SysEpmetUserRelationDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(SysEpmetUserRelationDTO dto) {
+        SysEpmetUserRelationEntity entity = ConvertUtils.sourceToTarget(dto, SysEpmetUserRelationEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(SysEpmetUserRelationDTO dto) {
+        SysEpmetUserRelationEntity entity = ConvertUtils.sourceToTarget(dto, SysEpmetUserRelationEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public SysEpmetUserRelationDTO getSysUserRelationEpmetInfo(Long id) {
+        SysEpmetUserRelationEntity entity = baseDao.selectSysUserRelationEpmetInfo(id);
+        return ConvertUtils.sourceToTarget(entity, SysEpmetUserRelationDTO.class);
+    }
+
+    @Override
+    public Result<SysEpmetUserRelationDTO> getStaffUserFromEpmet(String mobile) {
+        SysEpmetUserFormDTO formDto = new SysEpmetUserFormDTO();
+        formDto.setMobile(mobile);
+        Result<SysEpmetUserResultDTO> result = analysisFeignClient.getEpmetUserInfoByMobile(formDto);
+        if (result.success()) {
+            SysEpmetUserRelationDTO data = ConvertUtils.sourceToTarget(result.getData(), SysEpmetUserRelationDTO.class);
+            return new Result<SysEpmetUserRelationDTO>().ok(data);
+        }
+
+        return new Result<SysEpmetUserRelationDTO>().error(result.getMsg());
+    }
+
+    @Override
+    public Result saveOrUpdateUserEpmetRelation(Long id, SysEpmetUserRelationDTO wgyInfo) {
+        // 删除已绑定网格员信息
+        baseDao.deleteRelationInfoBySysUserId(id);
+        if (StringUtils.isNotEmpty(wgyInfo.getStaffId())) {
+            wgyInfo.setSysUserId(id);
+            insert(ConvertUtils.sourceToTarget(wgyInfo, SysEpmetUserRelationEntity.class));
+        }
+
+        return new Result();
+    }
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -30,6 +30,7 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.entity.SysUserEntity;
 import com.elink.esua.epdc.service.SysDeptService;
+import com.elink.esua.epdc.service.SysEpmetUserRelationService;
 import com.elink.esua.epdc.service.SysRoleUserService;
 import com.elink.esua.epdc.service.SysUserService;
 import org.apache.commons.lang3.StringUtils;
@@ -54,6 +55,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     @Autowired
     private SysDeptService sysDeptService;
 
+    @Autowired
+    private SysEpmetUserRelationService sysEpmetUserRelationService;
+
     @Override
     public PageData<SysUserDTO> page(Map<String, Object> params) {
         //转换成like
@@ -120,6 +124,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
         //保存角色用户关系
         sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList());
+
+        // 保存/更新网格员信息
+        sysEpmetUserRelationService.saveOrUpdateUserEpmetRelation(entity.getId(), dto.getWgyInfo());
     }
 
     @Override
@@ -143,6 +150,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
         //更新角色用户关系
         sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList());
+
+        // 保存/更新网格员信息
+        sysEpmetUserRelationService.saveOrUpdateUserEpmetRelation(entity.getId(), dto.getWgyInfo());
     }
 
     /**

epdc-cloud-admin/src/main/resources/mapper/SysEpmetUserRelationDao.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.SysEpmetUserRelationDao">
+
+    <select id="selectSysUserRelationEpmetInfo" resultType="com.elink.esua.epdc.entity.SysEpmetUserRelationEntity">
+        SELECT * FROM sys_epmet_user_relation WHERE DEL_FLAG = '0' AND SYS_USER_ID = #{id}
+    </select>
+
+    <delete id="deleteRelationInfoBySysUserId">
+        DELETE FROM sys_epmet_user_relation WHERE SYS_USER_ID = #{id}
+    </delete>
+
+</mapper>

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 80264ec0f84a8692e3d23254710bf6f987f126a9
+Subproject commit 982b1ff01e69e7cb48180e3d68c94664605ae73e