王帅-发布提醒-短信记录

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/SmsMessageController.java

@@ -103,5 +103,40 @@ public class SmsMessageController {
 		
 		return SendUtil.send(obj.getBoolean("result"));
 	}
+	
+	/**
+	* @Title: getWechatSms 
+	* @Description: 获取微信公众号短信 
+	* @param @param page
+	* @param @param limit
+	* @param @return     
+	* @return Map<String,Object>   
+	* @throws
+	 */
+	@GetMapping("getWechatSms")
+	public Map<String, Object> getWechatSms(Integer page, Integer limit) {
+		if (!Blank.notBlank(page) || !Blank.notBlank(limit)) {
+			return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
+		}
+		return smsMessageService.getWechatSms(page, limit);
+	}
+	
+	/**
+	 * 
+	* @Title: getWechatSmsDetail 
+	* @Description: 获取微信公众号短信-详情
+	* @param @param page
+	* @param @param limit
+	* @param @return     
+	* @return Map<String,Object>   
+	* @throws
+	 */
+	@GetMapping("getWechatSmsDetail")
+	public Map<String, Object> getWechatSmsDetail(Integer page, Integer limit, Integer id) {
+		if (!Blank.notBlank(page) || !Blank.notBlank(limit) || !Blank.notBlank(id)) {
+			return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
+		}
+		return smsMessageService.getWechatSmsDetail(page, limit, id);
+	}
 
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/SmsMessageDao.java

@@ -31,4 +31,12 @@ public interface SmsMessageDao {
 	List<Map<String, Object>> getAllOfa();
 	
 	Boolean saveOfaSms(@Param("list") List<Map<String, Object>> list);
+	
+	Integer getCountWechatSms();
+	
+	List<Map<String, Object>> getWechatSms(@Param("page") Integer page, @Param("limit") Integer limit);
+	
+	Integer getCountWechatSmsDetail(@Param("id") Integer id);
+	
+	List<Map<String, Object>> getWechatSmsDetail(@Param("page") Integer page, @Param("limit") Integer limit, @Param("id") Integer id);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/SmsMessageService.java

@@ -23,4 +23,8 @@ public interface SmsMessageService {
 	boolean saveSendSuccess(List<String> ids);
 
 	List<Map<String, Object>> getAllNotSendSmsMessage(Integer limit);
+	
+	Map<String, Object> getWechatSms(Integer page, Integer limit);
+	
+	Map<String, Object> getWechatSmsDetail(Integer page, Integer limit, Integer id);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/SmsMessageServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import com.example.nngkxxdp.dao.SmsMessageDao;
 import com.example.nngkxxdp.entity.SmsMessage;
 import com.example.nngkxxdp.service.SmsMessageService;
+import com.example.nngkxxdp.util.Blank;
 import com.example.nngkxxdp.util.SendUtil;
 
 /**
@@ -50,4 +51,22 @@ public class SmsMessageServiceImpl implements SmsMessageService {
 		return smsMessageDao.getAllNotSendSmsMessage(limit);
 	}
 
+	@Override
+	public Map<String, Object> getWechatSms(Integer page, Integer limit) {
+		Integer count = smsMessageDao.getCountWechatSms();
+		if (Blank.isEmpty(count) || count == 0) {
+			return SendUtil.layuiTable(0, null);
+		}
+		return SendUtil.layuiTable(count, smsMessageDao.getWechatSms(page, limit));
+	}
+
+	@Override
+	public Map<String, Object> getWechatSmsDetail(Integer page, Integer limit, Integer id) {
+		Integer count = smsMessageDao.getCountWechatSmsDetail(id);
+		if (Blank.isEmpty(count) || count == 0) {
+			return SendUtil.layuiTable(0, null);
+		}
+		return SendUtil.layuiTable(count, smsMessageDao.getWechatSmsDetail((page - 1)*limit, limit, id));
+	}
+
 }

nngkxxdp/src/main/resources/mapper/SmsMessageDao.xml

@@ -55,4 +55,28 @@
 			(#{item.ofaId}, #{item.phone}, #{item.type}, #{item.sendTime}, #{item.isSuccess})
 		</foreach>
     </insert>
+    
+    <select id="getCountWechatSms" resultType="java.lang.Integer">
+    	SELECT COUNT(*) FROM w_ofa
+    </select>
+    
+    <select id="getWechatSms" resultType="java.util.Map">
+    	SELECT b.* FROM (
+		SELECT wo.*, DATE_FORMAT(wos.send_time ,'%Y-%m-%d %H:%i') send_time FROM w_ofa wo
+		LEFT JOIN w_ofa_sms wos ON wo.id = wos.ofa_id
+		ORDER BY wos.send_time DESC
+		LIMIT 999999999
+		) b
+		GROUP BY b.id
+    </select>
+    
+    <select id="getCountWechatSmsDetail" resultType="java.lang.Integer">
+    	SELECT COUNT(*) FROM w_ofa_sms WHERE ofa_id = #{id}
+    </select>
+    
+    <select id="getWechatSmsDetail" resultType="java.util.Map">
+    	SELECT id, ofa_id, phone, type, is_success, DATE_FORMAT(send_time ,'%Y-%m-%d %H:%i') send_time FROM w_ofa_sms WHERE ofa_id = #{id}
+		ORDER BY send_time DESC
+		LIMIT #{page}, #{limit}
+    </select>
 </mapper>

nngkxxdp/src/main/resources/static/page/css/webStatis.css

@@ -142,7 +142,7 @@ body {
 
 
 
-/* 缂冩垹鐝懓鍐槑  */
+/* 缂傚啯鍨归悵顖炴嚀閸愵厾妲�  */
 .web-contanier .content-wrap #siteAssessment {
 	width: 100%;
 	height: 634px;
@@ -210,7 +210,7 @@ body {
 	margin-bottom: 8px;
 }
 
-/* 閸栧搫骞欓崣濠咁敎闂�鍥劥闂傘劍娲块弬鐗堝剰閸愶拷 */
+/* 闁告牕鎼獮娆撳矗婵犲拋鏁庨梻锟介崶顒�鍔ラ梻鍌樺妽濞插潡寮悧鍫濆壈闁告劧鎷� */
 .update-case {
 	width: 100%;
 	height: 1000px;
@@ -347,7 +347,7 @@ body {
 	left: 2%;
 }
 
-/* 閺堫剛缍夌粩锟�  */
+/* 闁哄牜鍓涚紞澶岀博閿燂拷  */
 .marker2-one::before {
 	content: ' ';
 	width: 10px;
@@ -393,7 +393,7 @@ body {
 	left: -1%;
 }
 
-/*濮樻垹鏁撻弽蹇曟窗閺囧瓨鏌婇幆鍛枌*/
+/*婵ɑ鍨归弫鎾诲冀韫囨洘绐楅柡鍥х摠閺屽﹪骞嗛崨顓炴瀸*/
 .DistrictPortal {
 	height: 600px;
 	width: 1123px;
@@ -408,7 +408,7 @@ body {
 	text-align: center;
 }
 
-/*闁劑妫弴瀛樻煀閹懎鍠�*/
+/*闂侇喓鍔戝Λ顒勫即鐎涙ɑ鐓�闁诡垰鎳庨崰锟�*/
 .updateStreet {
 	width: 1123px;
 	height: 600px;
@@ -420,7 +420,7 @@ body {
 	text-align: left;
 }
 
-/*閸忔湹绮崠鍝勫箼閹懎鍠�*/
+/*闁稿繑婀圭划顒勫礌閸濆嫬绠奸柟顖氭噹閸狅拷*/
 
 .web-assessment {
 	overflow: hidden;
@@ -439,7 +439,7 @@ body {
 	color: #ffffff;
 }
 
-/*24鐏忓繑妞傞崘鍛纯閺傜増鏋冪粩锟�*/
+/*24閻忓繐绻戝鍌炲礃閸涱喗绾柡鍌滃閺嬪啰绮╅敓锟�*/
 .article-warp {
 	margin-top: 19px;
 }
@@ -482,7 +482,7 @@ body {
 	text-align: left;
 }
 
-/*閸欐垵绔烽幓鎰板晪*/
+/*闁告瑦鍨电粩鐑藉箵閹版澘鏅�*/
 .remindList {
 	width: 100%;
 	/*height: 100px;*/
@@ -585,7 +585,7 @@ body {
 	padding-bottom: 10px;
 }
 
-/*閸旂姴鍣洪崚鍡涖��*/
+/*闁告梻濮撮崳娲礆閸℃稏锟斤拷*/
 .dataTabSec .layui-tab-title li {
 	width: 151px;
 	height: 36px;
@@ -721,7 +721,7 @@ body {
 
 
 
-/* 鎰夊揩鍔炲姙浜嬫寚鍗楁儏鍐电粺璁★紙澶х粺璁★級 */
+/* 閹板鎻╅崝鐐插娴滃瀵氶崡妤佸剰閸愮數绮虹拋鈽呯礄婢堆呯埠鐠佲槄绱� */
 
 ./* city_box {
 	width: 800px;
@@ -750,7 +750,7 @@ body {
 	background: #E3E3E3;
 } */
 
-/* 鎰夊揩鍔炲姙浜嬫寚鍗楃粺璁� */
+/* 閹板鎻╅崝鐐插娴滃瀵氶崡妤冪埠鐠侊拷 */
 .content-wrap>div>div>div>div>div>div.layui-tab-item.layui-show>div>div>div.layui-tab.update-tab>div.layui-tab.layui-tab-brief>ul {
 	border: none;
 }
@@ -787,7 +787,7 @@ body {
 li .min_color {
 	background: linear-gradient(30deg, #37B37D, #43DC99 );
 }
-/* 寮圭獥 */
+/* 瀵湱鐛� */
 .xq{
 	    border-left: 4px solid #333333;
 	    width: 105px;
@@ -807,4 +807,33 @@ li .min_color {
 }
 .xq_box .xq_minbox .xq_font{
 	    color: #999999;
-}
+}
+
+.w-sms-tab {
+	display: flex;
+	margin-top: 20px;
+	float: left;
+}
+.w-sms-tab li {
+    width: 120px;
+    border: 1px solid #333;
+    text-align: center;
+    height: 36px;
+    line-height: 36px;
+    cursor: pointer;
+}
+
+.w-sms-tab li:first-child {
+    border-right: 0px;
+}
+
+.w-sms-tab li:last-child{
+   	border-left: 0px;
+}
+
+.w-sms-tab .w-sms-tab-this {
+    border: 1px solid #1276ff;
+    border-left: 1px solid #1276ff !important;
+    border-right: 1px solid #1276ff !important;
+    color: #1276ff;
+}

nngkxxdp/src/main/resources/static/page/index.html

@@ -630,6 +630,7 @@
 											<button id="testReport" class="layui-btn layui-btn-normal" type="button" style="float: right;margin-right: 15px;">相关工作文档上传</button>
 											<button id="publishReminder" class="layui-btn layui-btn-normal" type="button" style="float: right;">下载情况查看</button>
 											<button id="smsSend" class="layui-btn layui-btn-normal" type="button" style="float: right;">短信发送</button>
+											<button id="smsSendRecord" class="layui-btn layui-btn-normal" type="button" style="float: right;">发送记录</button>
 										</div>
 										<div class="line"></div>
 									</div>
@@ -654,6 +655,21 @@
 										</table>
 										<button class="layui-btn layui-btn-normal layui-btn-sm" id="reBack">返回</button>
 									</div>
+									<div class="w-sms-record" style="display:none;">
+										<div>
+											<div>
+												<div class="w-sms-wai-div">
+													<ul class="w-sms-tab">
+														<li class="w-sms-tab-this">微信公众号</li>
+														<li>网站</li>
+													</ul>
+													<button id="w-sms-tab-back" style="margin-top: 20px;float: right;" class="layui-btn layui-btn-primary" type="button">返回</button>
+												</div>
+												<button id="w-sms-back" style="margin-top: 20px;" class="layui-btn layui-btn-primary layui-hide" type="button">返回</button>
+												<table id="w-sms-wechat-table" class="layui-table" lay-skin="line"></table>
+											</div>
+										</div>
+									</div>
 								</div>
 							</div>
 							<div class="layui-tab-item">
@@ -687,7 +703,7 @@
 														<th>本年更新量</th>
 													</tr>
 													</thead>
-													<tbody style="opacity:0;height" id="otherHeader"></tbody>
+													<tbody style="opacity:0;" id="otherHeader"></tbody>
 												</table>
 											</div>
 											<div class="tbl-body2">

nngkxxdp/src/main/resources/static/page/js/base/fbtx.item.js

@@ -232,6 +232,7 @@ function lyupload() {
 		$("#publishReminder").click(function () {
 			$(".remindList").css("display","none");
 			$(".clearfix").css("display","none");
+			$(".w-sms-record").css("display","none")
 			$("#publishTable").css("display","block")
 			layui.use('table',function(){
 				var table = layui.table;
@@ -389,9 +390,24 @@ function lyupload() {
 					layer.msg('发送成功!');
 				}
 			},function(err) {
+			
 			});
 	 })
-		
+	 
+	 $('#smsSendRecord').on('click', function() {
+	 	$(".remindList").css("display","none");
+		$(".clearfix").css("display","none");
+		$("#publishTable").css("display","none")
+		$(".w-sms-record").css("display","block")
+	 });
+	 
+	 $('.w-sms-tab li').on('click', function() {
+	 	//$('.w-sms-tab li').each(function() {
+	 	//	$(this).removeClass('w-sms-tab-this');
+	 	//});
+	 	//$(this).addClass('w-sms-tab-this');
+	 });
+		initSmsTable();
 		initUp();
 		initUp2();
 		initStatus = false;
@@ -560,4 +576,87 @@ $('#smsSend').on('click', function() {
 			$('#ly-sms-remark').val('')
 		}
 	});
-});
+});
+
+function initSmsTable() {
+	table.render({
+    elem: '#w-sms-wechat-table',
+    url: '/smsmessage/getWechatSms',
+    skin: 'line',
+    cols: [[
+  		{width:80, title: '序号', type: 'numbers'},
+  		{field:'wName', title: '新媒体名称'},
+  		{field:'wType', title: '类型'},
+		{title: '分管领导', templet: function(d) {
+			return d.leadName + "  " + d.leadPhone;
+		}},
+		{title: '工作人员', templet: function(d) {
+			return d.staffName + "  " + d.staffPhone;
+		}},
+		{title: '提醒记录', templet: function(d) {
+			return d.sendTime ? d.sendTime : '未提醒';
+		}},
+		{title: '操作', templet: function(d) {
+			return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\''+ d.staffName +'\',\''+ d.leadName +'\',\''+ (d.wType + '-' + d.wName) +'\',\''+ d.id +'\')">详情</a>';
+		}}
+    ]]
+  });
+  
+  	$('#w-sms-back').on('click', function() {
+		$('#w-sms-back').addClass('layui-hide');
+		$('.w-sms-wai-div').removeClass('layui-hide');
+		reloadSmsTable();
+	})
+	$('#w-sms-tab-back').on('click', function() {
+		$(".remindList").css("display","block");
+		$(".clearfix").css("display","block");
+		$("#publishTable").css("display","none")
+		$(".w-sms-record").css("display","none")
+	})
+}
+function initSmsTableDetail(staffName, leadName, wechat, id) {
+	$('#w-sms-back').removeClass('layui-hide');
+	$('.w-sms-wai-div').addClass('layui-hide');
+	var smsContent = '您好,贵单位政务新媒体{wechat}已有{day}天未更新,有超期未更新风险,如不能按时更新,本月政务公开考核将扣分。如因未及时更新被市政府办公厅点名通报批评,会影响单位政务公开年终考核得分,请及时更新';
+	table.reload('w-sms-wechat-table', {
+		url: '/smsmessage/getWechatSmsDetail',
+		where: {
+			'id': id
+		},
+		page: true,
+		cols: [[
+  		{field:'sendTime', title: '发送时间', width: '15%'},
+		{title: '发送内容', templet: function(d) {
+			return (d.type == 1 ? leadName : staffName) + smsContent.replace('{wechat}', wechat).replace('{day}', d.type == 1 ? '12' : '10');
+		}},
+		{title: '发送状态', width: '12%', templet: function(d) {
+			return d.is_success == 1 ? '发送成功' : '未发送成功';
+		}}
+    ]]
+	});
+}
+
+function reloadSmsTable() {
+	table.reload('w-sms-wechat-table', {
+		url: '/smsmessage/getWechatSms',
+		page: false,
+		cols: [[
+	  		{width:80, title: '序号', type: 'numbers'},
+	  		{field:'wName', title: '新媒体名称'},
+	  		{field:'wType', title: '类型'},
+			{title: '分管领导', templet: function(d) {
+				return d.leadName + "  " + d.leadPhone;
+			}},
+			{title: '工作人员', templet: function(d) {
+				return d.staffName + "  " + d.staffPhone;
+			}},
+			{title: '提醒记录', templet: function(d) {
+				return d.sendTime ? d.sendTime : '未提醒';
+			}},
+			{title: '操作', templet: function(d) {
+				return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\''+ (d.wType + '-' + d.wName) +'\',\''+ d.id +'\')">详情</a>';
+			}}
+	    ]]
+	});
+}
+