From 512dd406585d97fc63bbfb4a476d5d279cf2898c Mon Sep 17 00:00:00 2001
From: liuchuang <liuchuang@elink-cn.com>
Date: Sat, 10 Jul 2021 14:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E4=BA=A7=E5=93=81=E7=BD=91=E6=A0=BC=E5=91=98=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysEpmetUserRelationController.java       | 13 ------------
 .../dao/SysEpmetUserRelationDao.java          | 21 +++++++++++++++++++
 .../service/SysEpmetUserRelationService.java  | 10 ---------
 .../impl/SysEpmetUserRelationServiceImpl.java | 19 ++++++++++++-----
 .../mapper/SysEpmetUserRelationDao.xml        |  8 +++++++
 .../epdc-analysis-server/pom.xml              |  9 ++++----
 6 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java
index 80cac07c..3b2e24e4 100644
--- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java
@@ -124,17 +124,4 @@ public class SysEpmetUserRelationController {
         return sysEpmetUserRelationService.bindSysUserWithEpmetUser(formDto);
     }
 
-    /**
-     * 解除当前用户已绑定的产品工作人员信息
-     *
-     * @param formDto 产品工作人员信息
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author liuchuang
-     * @since 2021/7/8 16:49
-     */
-    @PostMapping("unbindepmetuser")
-    public Result unbindEpmetUser(@RequestBody SysEpmetUserRelationDTO formDto) {
-        return sysEpmetUserRelationService.unbindSysUserWithEpmetUser(formDto);
-    }
-
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java
index 75976251..26f32429 100644
--- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.epmet.modules.userrelation.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO;
 import com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -40,4 +41,24 @@ public interface SysEpmetUserRelationDao extends BaseDao<SysEpmetUserRelationEnt
      * @since 2021/7/8 17:04
      */
     SysEpmetUserRelationEntity selectSysUserRelationEpmetInfo(Long id);
+
+    /**
+     * 根据手机号获取系统用户
+     *
+     * @param mobile 手机号
+     * @return com.elink.esua.epdc.dto.SysUserDTO
+     * @author liuchuang
+     * @since 2021/7/10 14:13
+     */
+    SysUserDTO selectSysUserInfoByMobile(String mobile);
+
+    /**
+     * 删除已绑定网格员信息
+     *
+     * @param id 系统用户ID
+     * @return void
+     * @author liuchuang
+     * @since 2021/7/10 14:29
+     */
+    void deleteRelationInfoBySysUserId(Long id);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java
index 8329f743..cf1e78a4 100644
--- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java
@@ -123,14 +123,4 @@ public interface SysEpmetUserRelationService extends BaseService<SysEpmetUserRel
      * @since 2021/7/8 17:09
      */
     Result bindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto);
-
-    /**
-     * 解除当前用户已绑定的产品工作人员信息
-     *
-     * @param formDto 产品工作人员信息
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author liuchuang
-     * @since 2021/7/8 17:12
-     */
-    Result unbindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/impl/SysEpmetUserRelationServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/impl/SysEpmetUserRelationServiceImpl.java
index d0962f9f..3b726ce6 100644
--- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/impl/SysEpmetUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/impl/SysEpmetUserRelationServiceImpl.java
@@ -20,10 +20,12 @@ package com.elink.esua.epdc.epmet.modules.userrelation.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.exception.RenException;
 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.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO;
 import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO;
 import com.elink.esua.epdc.epmet.modules.feign.EpmetAnalysisFeignClient;
@@ -125,12 +127,19 @@ public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl<SysEpmetUse
 
     @Override
     public Result bindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto) {
-        return null;
-    }
+        // 获取系统工作人员ID
+        SysUserDTO sysUser = baseDao.selectSysUserInfoByMobile(formDto.getMobile());
+        if (null == sysUser) {
+            throw new RenException("查询用户信息失败");
+        }
+        formDto.setSysUserId(sysUser.getId());
+        // 删除已绑定网格员信息
+        baseDao.deleteRelationInfoBySysUserId(sysUser.getId());
+        if (StringUtils.isNotEmpty(formDto.getId())) {
+            insert(ConvertUtils.sourceToTarget(formDto, SysEpmetUserRelationEntity.class));
+        }
 
-    @Override
-    public Result unbindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto) {
-        return null;
+        return new Result();
     }
 
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/mapper/SysEpmetUserRelationDao.xml b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/mapper/SysEpmetUserRelationDao.xml
index a8c9c227..7d313f95 100644
--- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/mapper/SysEpmetUserRelationDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/mapper/SysEpmetUserRelationDao.xml
@@ -7,4 +7,12 @@
         SELECT * FROM sys_epmet_user_relation WHERE DEL_FLAG = '0' AND SYS_USER_ID = #{id}
     </select>
 
+    <select id="selectSysUserInfoByMobile" resultType="com.elink.esua.epdc.dto.SysUserDTO">
+        SELECT * FROM sys_user WHERE DEL_FLAG = 0 AND mobile = #{mobile}
+    </select>
+
+    <delete id="deleteRelationInfoBySysUserId">
+        DELETE FROM sys_epmet_user_relation WHERE SYS_USER_ID = #{id}
+    </delete>
+
 </mapper>
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
index df40ed07..179404ae 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
@@ -136,10 +136,11 @@
                 <nacos.server-addr>47.105.119.155:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>1da17390-6495-4e16-9ec6-0b8ece18a4a0</nacos.namespace>
-                <epmet.url>https://epmet-dev.elinkservice.cn/api</epmet.url>
-                <epmet.secret>0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e</epmet.secret>
-                <epmet.appId>d44a6daaea58be408bb74fe93714710f</epmet.appId>
-                <epmet.customerId>f5ff0770f409981c73adda6ae35143ef</epmet.customerId>
+
+                <epmet.url>http://192.168.1.140/api</epmet.url>
+                <epmet.secret>d2c011b14217425eb48e27cf6481716ae845cff14cc0429198a8348c76893023</epmet.secret>
+                <epmet.appId>c1fe1becebf94b8aef724728690816a0</epmet.appId>
+                <epmet.customerId>eac9d3b8b10c328350b59ac4b1d64db5</epmet.customerId>
 
             </properties>
         </profile>