From 61425a010be88ba553c7ca3e98c31cba7220651c Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 14 May 2020 11:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B4=BB=E5=8A=A8=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E5=92=8C=E7=88=B1=E5=BF=83=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E6=98=B5=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/volunteer/VolunteerRankDao.xml         |  2 +-
 .../controller/EpdcAppInformationController.java  | 12 ++++++++++++
 .../esua/epdc/service/InformationService.java     |  8 ++++++++
 .../epdc/service/impl/InformationServiceImpl.java | 15 +++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml
index 01f12a45..5bde38ef 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml
@@ -24,7 +24,7 @@
     </resultMap>
 
     <select id="leaderboard" resultType="com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO">
-        select NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT
+        select substr(NICKNAME,locate('-',NICKNAME)+1) as NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT
         from epdc_volunteer_rank
         where GENERATE_DATE = DATE_FORMAT(NOW(),'%Y-%m-%d')
         order by sort
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java
index ff65dd5c..3291cee9 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java
@@ -59,6 +59,18 @@ public class EpdcAppInformationController {
         return this.informationService.saveInformation(formDto);
     }
 
+   /**
+    * @Description  批量发送用户消息
+    * @Author songyunpeng
+    * @Date  2020/5/14
+    * @Param [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    **/
+    @PostMapping("saveList")
+    public Result saveInformationList(@RequestBody List<EpdcInformationFormDTO> epdcInformationFormDTOList) {
+        return this.informationService.saveInformationList(epdcInformationFormDTOList);
+    }
+
     /**
      * 消息已读
      *
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java
index 889972dc..e80953b1 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java
@@ -137,4 +137,12 @@ public interface InformationService extends BaseService<InformationEntity> {
      * @date 2019/9/11 19:05
      */
     Result<EpdcInformationFristResultDTO> selectOneFristByUserId(String userId);
+    /**
+     * @Description  给用户批量发送消息 
+     * @Author songyunpeng
+     * @Date  2020/5/14
+     * @Param [epdcInformationFormDTOList]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result saveInformationList(List<EpdcInformationFormDTO> epdcInformationFormDTOList);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java
index c9f7d5fe..34481847 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java
@@ -39,6 +39,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -132,4 +133,18 @@ public class InformationServiceImpl extends BaseServiceImpl<InformationDao, Info
     public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(String userId) {
         return new Result<EpdcInformationFristResultDTO>().ok(baseDao.selectOneFristByUserId(userId));
     }
+
+    @Override
+    public Result saveInformationList(List<EpdcInformationFormDTO> epdcInformationFormDTOList) {
+        if(epdcInformationFormDTOList != null && !epdcInformationFormDTOList.isEmpty()){
+            List<InformationEntity> addData = new ArrayList<>(epdcInformationFormDTOList.size());
+            for(EpdcInformationFormDTO epdcInformationFormDTO : epdcInformationFormDTOList){
+                InformationEntity entity = ConvertUtils.sourceToTarget(epdcInformationFormDTO, InformationEntity.class);
+                entity.setReadFlag(YesOrNoEnum.NO.value());
+                addData.add(entity);
+            }
+            this.insertBatch(addData);
+        }
+        return new Result();
+    }
 }
\ No newline at end of file