From 27ce4d6a0d8215d1c0f82b765efe4675546ca0da Mon Sep 17 00:00:00 2001
From: Yang Jing <yangbajing@gmail.com>
Date: Sun, 5 Jul 2020 00:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=20AccountDao.insert=20=E4=B9=9F?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=20PostgreSQL=20=E7=9A=84=20AccountDao.insert?=
 =?UTF-8?q?OnPG=20=E7=89=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kafka/manager/dao/impl/AccountDaoImpl.java       |  8 +++++++-
 dao/src/main/resources/mapper/AccountDao.xml         | 12 ++++++++++++
 dao/src/main/resources/mapper/BrokerDao.xml          | 10 +++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java b/dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java
index 315762b7..9283d40b 100644
--- a/dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java
+++ b/dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java
@@ -18,6 +18,9 @@ public class AccountDaoImpl implements AccountDao {
     @Autowired
     private SqlSessionTemplate sqlSession;
 
+    @Autowired
+    private KafkaManagerProperties kafkaManagerProperties;
+
     public void setSqlSession(SqlSessionTemplate sqlSession) {
         this.sqlSession = sqlSession;
     }
@@ -25,7 +28,7 @@ public class AccountDaoImpl implements AccountDao {
     @Override
     public int addNewAccount(AccountDO accountDO) {
         accountDO.setStatus(DBStatusEnum.NORMAL.getStatus());
-        return sqlSession.insert("AccountDao.insert", accountDO);
+        return updateAccount(accountDO);
     }
 
     @Override
@@ -35,6 +38,9 @@ public class AccountDaoImpl implements AccountDao {
 
     @Override
     public int updateAccount(AccountDO accountDO) {
+        if (kafkaManagerProperties.hasPG()) {
+            return sqlSession.insert("AccountDao.insertOnPG", accountDO);
+        }
         return sqlSession.insert("AccountDao.insert", accountDO);
     }
 
diff --git a/dao/src/main/resources/mapper/AccountDao.xml b/dao/src/main/resources/mapper/AccountDao.xml
index 5d5e79a8..feed2727 100644
--- a/dao/src/main/resources/mapper/AccountDao.xml
+++ b/dao/src/main/resources/mapper/AccountDao.xml
@@ -22,6 +22,18 @@
     ]]>
     </insert>
 
+    <insert id="insertOnPG" parameterType="com.xiaojukeji.kafka.manager.common.entity.po.AccountDO">
+        <![CDATA[
+        insert into account
+        (username, password, role, status)
+        values
+        (#{username}, #{password}, #{role}, #{status})
+        on conflict (username) do update set password = excluded.password,
+                                             role     = excluded.role,
+                                             status   = excluded.status
+    ]]>
+    </insert>
+
     <delete id="deleteByName" parameterType="java.lang.String">
       DELETE FROM account WHERE username = #{username}
     </delete>
diff --git a/dao/src/main/resources/mapper/BrokerDao.xml b/dao/src/main/resources/mapper/BrokerDao.xml
index 7ef90b01..50af2ef1 100644
--- a/dao/src/main/resources/mapper/BrokerDao.xml
+++ b/dao/src/main/resources/mapper/BrokerDao.xml
@@ -22,12 +22,12 @@
 
     <insert id="replaceOnPG" parameterType="BrokerDO">
         insert into broker
-        (cluster_id, broker_id, host, port, timestamp, status)
-        values
+            (cluster_id, broker_id, host, port, timestamp, status)
+        values (#{clusterId}, #{brokerId}, #{host}, #{port}, #{timestamp}, #{status})
         on conflict (cluster_id, broker_id) do update set host      = excluded.host,
-                                                  port      = excluded.port,
-                                                  timestamp = excluded.timestamp,
-                                                  status    = excluded.status
+                                                          port      = excluded.port,
+                                                          timestamp = excluded.timestamp,
+                                                          status    = excluded.status
     </insert>
 
     <delete id="deleteById" parameterType="java.util.Map">