From 71de09076e268a245871571a72a852a345b3220a Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Wed, 22 Sep 2021 16:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=96=B9=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=85=B6=E8=83=BD=E5=A4=9F=E5=BE=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84operator=5Fid=5Fevcs?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/XhpcChargingPileController.java    |  2 +-
 .../controller/XhpcInternetUserController.java    |  2 ++
 .../com/xhpc/user/domain/XhpcInternetUser.java    | 15 +++++++++++++++
 .../resources/mapper/XhpcInternetUserMapper.xml   | 11 +++++++++--
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java
index b703a357..3882decb 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java
@@ -97,7 +97,7 @@ public class XhpcChargingPileController extends BaseController {
      */
     @PostMapping(value = "/downloadsTerminalImgs")
     public AjaxResult downloadsTerminalImgs(@RequestBody List<Integer> terminalIds){
-        List<Map<String,Object>> xhpcImgs = xhpcChargingPileService.downloadsTerminalImgs(terminalIds);
+       List<Map<String,Object>> xhpcImgs = xhpcChargingPileService.downloadsTerminalImgs(terminalIds);
         return AjaxResult.success(xhpcImgs);
 
     }
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java
index fc20946f..85ccac9f 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java
@@ -58,6 +58,8 @@ public class XhpcInternetUserController extends BaseController {
         if (iXhpcUserService.checkUserNameUnique(sysUser.getUserName()) > 0) {
             return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在");
         }
+
+
         iXhpcInternetUserService.insert(xhpcInternetUser);
         sysUser.setInternetUserId(xhpcInternetUser.getInternetUserId());
         iXhpcUserService.insertUser(sysUser);
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java
index 72abe323..9ade960e 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java
@@ -132,6 +132,21 @@ public class XhpcInternetUser extends BaseEntity {
      */
     private String delFlag;
 
+    /**
+     * 对接第三方平台及监管平台的operatorId
+     */
+    private String operatorIdEvcs;
+
+    public String getOperatorIdEvcs() {
+
+        return operatorIdEvcs;
+    }
+
+    public void setOperatorIdEvcs(String operatorIdEvcs) {
+
+        this.operatorIdEvcs = operatorIdEvcs;
+    }
+
     public Long getInternetUserId() {
         return internetUserId;
     }
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
index 6a1369b5..5770723f 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
@@ -29,6 +29,7 @@
         <result column="update_by" property="updateBy"/>
         <result column="update_time" property="updateTime"/>
         <result column="remark" property="remark"/>
+<!--        <result column="operator_id_evcs" property="operatorIdEvcs"/>-->
     </resultMap>
 
 
@@ -104,7 +105,10 @@
                 update_time,
             </if>
             <if test="null != remark and '' != remark">
-                remark
+                remark,
+            </if>
+            <if test="null != operatorIdEvcs and '' != operatorIdEvcs">
+                operator_id_evcs
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -175,7 +179,10 @@
                 #{updateTime},
             </if>
             <if test="null != remark and '' != remark">
-                #{remark}
+                #{remark},
+            </if>
+            <if test="null != operatorIdEvcs and '' != operatorIdEvcs">
+                #{operatorIdEvcs}
             </if>
         </trim>
     </insert>