From ca8906ff317bbf26096d487a24edf8398c932eea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 21 Sep 2022 13:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=9A=E7=9F=A5=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E9=80=81=E7=BB=93=E6=9E=9C=EF=BC=8CsendRes:?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=BB=93=E6=9E=9C=EF=BC=9A1=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F,0=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcNoticeDTO.java            | 4 ++++
 .../src/main/java/com/epmet/entity/IcNoticeEntity.java      | 4 ++++
 .../java/com/epmet/service/impl/IcNoticeServiceImpl.java    | 6 ++++++
 .../resources/db/migration/V0.0.71__icnotice_sendres.sql    | 1 +
 .../src/main/resources/mapper/UserBaseInfoDao.xml           | 1 +
 5 files changed, 16 insertions(+)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNoticeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNoticeDTO.java
index 72520ef800..d4184734a9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNoticeDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNoticeDTO.java
@@ -106,4 +106,8 @@ public class IcNoticeDTO implements Serializable {
     @JsonIgnore
 	private Date updatedTime;
 
+    /**
+     * 发送结果：1成功,0失败
+     */
+    private String sendRes;
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNoticeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNoticeEntity.java
index 133d56dfcd..41deda8a70 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNoticeEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNoticeEntity.java
@@ -57,4 +57,8 @@ public class IcNoticeEntity extends BaseEpmetEntity {
      */
 	private String orgName;
 
+	/**
+	 * 发送结果：1成功,0失败
+	 */
+	private String sendRes;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
index 1abb00b5f3..bab4d5e5a6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
@@ -147,6 +147,8 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
             entity.setMobile(item.getMobile());
             entity.setIdCard(item.getIdCard());
             entity.setOrgName(finalOrgName);
+            // 发送结果：1成功,0失败
+            entity.setSendRes(NumConstant.ONE_STR);
             return entity;
         }).collect(Collectors.toList());
         insertBatch(entityList);
@@ -174,6 +176,10 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
                         messageFormDTO.setTargetId(item.getId());
                         msgList.add(messageFormDTO);
                     });
+                }else{
+                    // 没有找到居民端的用户id,发送失败
+                    item.setSendRes(NumConstant.ZERO_STR);
+                    baseDao.updateById(item);
                 }
             }
             //TODO 短信消息
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql
new file mode 100644
index 0000000000..5f767b5455
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql
@@ -0,0 +1 @@
+ALTER TABLE ic_notice ADD COLUMN SEND_RES VARCHAR ( 1 ) NOT NULL DEFAULT '1' COMMENT '发送结果：1成功,0失败' after ORG_NAME;
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
index 3164ebcddb..b8990fe155 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
@@ -128,6 +128,7 @@
         WHERE DEL_FLAG = '0'
         AND customer_id = #{customerId}
         and id_num=#{idNum}
+        limit 1
     </select>
 
     <select id="selectCountIdNum" parameterType="map" resultType="java.lang.Integer">