YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by linlong
Commit 3bfbf1f990f726a9355e615e2bc88b16e054a2a1 1 parent a5330487

update

Inline Side-by-side
Showing 4 changed files with 40 additions and 5 deletions
@@ -24,7 +24,6 @@ import org.apache.commons.collections.map.HashedMap; @@ -24,7 +24,6 @@ import org.apache.commons.collections.map.HashedMap;
24 import org.apache.commons.lang.StringUtils; 24 import org.apache.commons.lang.StringUtils;
25 import org.slf4j.Logger; 25 import org.slf4j.Logger;
26 import org.slf4j.LoggerFactory; 26 import org.slf4j.LoggerFactory;
27 -import org.springframework.beans.BeanUtils;  
28 import org.springframework.beans.factory.annotation.Autowired; 27 import org.springframework.beans.factory.annotation.Autowired;
29 import org.springframework.stereotype.Service; 28 import org.springframework.stereotype.Service;
30 import org.springframework.util.CollectionUtils; 29 import org.springframework.util.CollectionUtils;
@@ -182,6 +181,7 @@ public class ChannelGroupServiceImpl implements ChannelGroupService { @@ -182,6 +181,7 @@ public class ChannelGroupServiceImpl implements ChannelGroupService {
182 List<ChannelSmsDetail> smsDetails = Lists.newArrayList(); 181 List<ChannelSmsDetail> smsDetails = Lists.newArrayList();
183 //4.用户去重、黑名单后，分批发送短信 182 //4.用户去重、黑名单后，分批发送短信
184 List<String> mobiles = null; 183 List<String> mobiles = null;
  184 + int successCount = 0 ;
185 for (int i = 0; i < mobileList.size(); i += BATCH_MESSAGE_NUMBER) { 185 for (int i = 0; i < mobileList.size(); i += BATCH_MESSAGE_NUMBER) {
186 if(i + BATCH_MESSAGE_NUMBER>mobileList.size()){ 186 if(i + BATCH_MESSAGE_NUMBER>mobileList.size()){
187 mobiles = mobileList.subList(i, mobileList.size()); 187 mobiles = mobileList.subList(i, mobileList.size());
@@ -205,6 +205,7 @@ public class ChannelGroupServiceImpl implements ChannelGroupService { @@ -205,6 +205,7 @@ public class ChannelGroupServiceImpl implements ChannelGroupService {
205 for (String sms : mobiles) { 205 for (String sms : mobiles) {
206 ChannelSmsDetail channelSmsDetail = new ChannelSmsDetail(sms, groupBatchId, SMS_STATUS_SUCCESS, sendTime); 206 ChannelSmsDetail channelSmsDetail = new ChannelSmsDetail(sms, groupBatchId, SMS_STATUS_SUCCESS, sendTime);
207 smsDetails.add(channelSmsDetail); 207 smsDetails.add(channelSmsDetail);
  208 + successCount++;
208 } 209 }
209 } else { 210 } else {
210 //4.2短信发送失败，打印日志，记录短信日志表（状态为0）和分组批次表 211 //4.2短信发送失败，打印日志，记录短信日志表（状态为0）和分组批次表
@@ -7,6 +7,16 @@ public class ChannelGroup { @@ -7,6 +7,16 @@ public class ChannelGroup {
7 7
8 private Integer groupNumber; 8 private Integer groupNumber;
9 9
  10 + public Integer getSuccessCount() {
  11 + return successCount;
  12 + }
  13 +
  14 + public void setSuccessCount(Integer successCount) {
  15 + this.successCount = successCount;
  16 + }
  17 +
  18 + private Integer successCount;
  19 +
10 private Integer createTime; 20 private Integer createTime;
11 21
12 private Integer createUser; 22 private Integer createUser;
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 <id column="id" property="id" jdbcType="INTEGER" /> 5 <id column="id" property="id" jdbcType="INTEGER" />
6 <result column="name" property="name" jdbcType="VARCHAR" /> 6 <result column="name" property="name" jdbcType="VARCHAR" />
7 <result column="group_number" property="groupNumber" jdbcType="INTEGER" /> 7 <result column="group_number" property="groupNumber" jdbcType="INTEGER" />
  8 + <result column="success_count" property="successCount" jdbcType="INTEGER" />
8 <result column="create_time" property="createTime" jdbcType="INTEGER" /> 9 <result column="create_time" property="createTime" jdbcType="INTEGER" />
9 <result column="create_user" property="createUser" jdbcType="INTEGER" /> 10 <result column="create_user" property="createUser" jdbcType="INTEGER" />
10 <result column="create_userName" property="createUserName" jdbcType="VARCHAR" /> 11 <result column="create_userName" property="createUserName" jdbcType="VARCHAR" />
@@ -18,7 +19,7 @@ @@ -18,7 +19,7 @@
18 <result column="content" property="content" jdbcType="VARCHAR" /> 19 <result column="content" property="content" jdbcType="VARCHAR" />
19 </resultMap> 20 </resultMap>
20 <sql id="Base_Column_List" > 21 <sql id="Base_Column_List" >
21 - id, name, group_number, create_time, create_user, create_userName, update_time 22 + id, name, group_number,success_count, create_time, create_user, create_userName, update_time
22 </sql> 23 </sql>
23 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 24 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
24 select 25 select
@@ -31,10 +32,10 @@ @@ -31,10 +32,10 @@
31 where id = #{id,jdbcType=INTEGER} 32 where id = #{id,jdbcType=INTEGER}
32 </delete> 33 </delete>
33 <insert id="insert" parameterType="com.yoho.unions.dal.model.ChannelGroup" keyProperty="id" useGeneratedKeys="true" > 34 <insert id="insert" parameterType="com.yoho.unions.dal.model.ChannelGroup" keyProperty="id" useGeneratedKeys="true" >
34 - insert into channel_group (id, name, group_number, 35 + insert into channel_group (id, name, group_number,success_count,
35 create_time, create_user, create_userName,update_time 36 create_time, create_user, create_userName,update_time
36 ) 37 )
37 - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{groupNumber,jdbcType=INTEGER}, 38 + values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{groupNumber,jdbcType=INTEGER},#{successCount,jdbcType=INTEGER}
38 #{createTime,jdbcType=INTEGER}, #{createUser,jdbcType=INTEGER}, #{createUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=INTEGER} 39 #{createTime,jdbcType=INTEGER}, #{createUser,jdbcType=INTEGER}, #{createUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=INTEGER}
39 ) 40 )
40 </insert> 41 </insert>
@@ -50,6 +51,9 @@ @@ -50,6 +51,9 @@
50 <if test="groupNumber != null" > 51 <if test="groupNumber != null" >
51 group_number, 52 group_number,
52 </if> 53 </if>
  54 + <if test="successCount != null" >
  55 + success_count,
  56 + </if>
53 <if test="createTime != null" > 57 <if test="createTime != null" >
54 create_time, 58 create_time,
55 </if> 59 </if>
@@ -73,6 +77,9 @@ @@ -73,6 +77,9 @@
73 <if test="groupNumber != null" > 77 <if test="groupNumber != null" >
74 #{groupNumber,jdbcType=INTEGER}, 78 #{groupNumber,jdbcType=INTEGER},
75 </if> 79 </if>
  80 + <if test="successCount != null" >
  81 + #{successCount,jdbcType=INTEGER},
  82 + </if>
76 <if test="createTime != null" > 83 <if test="createTime != null" >
77 #{createTime,jdbcType=INTEGER}, 84 #{createTime,jdbcType=INTEGER},
78 </if> 85 </if>
@@ -96,6 +103,9 @@ @@ -96,6 +103,9 @@
96 <if test="groupNumber != null" > 103 <if test="groupNumber != null" >
97 group_number = #{groupNumber,jdbcType=INTEGER}, 104 group_number = #{groupNumber,jdbcType=INTEGER},
98 </if> 105 </if>
  106 + <if test="successCount != null" >
  107 + success_count = #{successCount,jdbcType=INTEGER},
  108 + </if>
99 <if test="createTime != null" > 109 <if test="createTime != null" >
100 create_time = #{createTime,jdbcType=INTEGER}, 110 create_time = #{createTime,jdbcType=INTEGER},
101 </if> 111 </if>
@@ -115,6 +125,7 @@ @@ -115,6 +125,7 @@
115 update channel_group 125 update channel_group
116 set name = #{name,jdbcType=VARCHAR}, 126 set name = #{name,jdbcType=VARCHAR},
117 group_number = #{groupNumber,jdbcType=INTEGER}, 127 group_number = #{groupNumber,jdbcType=INTEGER},
  128 + success_count = #{success_count,jdbcType=INTEGER},
118 create_time = #{createTime,jdbcType=INTEGER}, 129 create_time = #{createTime,jdbcType=INTEGER},
119 create_user = #{createUser,jdbcType=INTEGER}, 130 create_user = #{createUser,jdbcType=INTEGER},
120 create_userName = #{createUserName,jdbcType=VARCHAR}, 131 create_userName = #{createUserName,jdbcType=VARCHAR},
@@ -153,7 +164,7 @@ @@ -153,7 +164,7 @@
153 </where> 164 </where>
154 </select> 165 </select>
155 <select id="selectListByParam" resultMap="groupResultMap" parameterType="com.yoho.service.model.union.response.ChannelGroupRspBO" > 166 <select id="selectListByParam" resultMap="groupResultMap" parameterType="com.yoho.service.model.union.response.ChannelGroupRspBO" >
156 - select cg.id as id, name, group_number, create_time, create_user, create_userName, cgb.id as group_id, send_time, 167 + select cg.id as id, name, group_number, success_count,create_time, create_user, create_userName, cgb.id as group_id, send_time,
157 send_user, send_userName, content 168 send_user, send_userName, content
158 from channel_group cg 169 from channel_group cg
159 left join channel_group_batch cgb 170 left join channel_group_batch cgb
@@ -153,6 +153,19 @@ @@ -153,6 +153,19 @@
153 width: 170, 153 width: 170,
154 align: "center" 154 align: "center"
155 },{ 155 },{
  156 + title: "发送结果分析",
  157 + field: "successCount",
  158 + width: 170,
  159 + align: "center",
  160 + formatter: function (value, rowData, rowIndex) {
  161 + if(rowData.content == null || rowData.content ==''){
  162 + return "";
  163 + }else{
  164 + var fail =rowData.groupNumber - value;
  165 + return "成功数"+value+",失败数"+fail;
  166 + }
  167 + }
  168 + },{
156 title: "操作", 169 title: "操作",
157 field: "asdf", 170 field: "asdf",
158 width: 170, 171 width: 170,