From 91319555f6a306872ec4f83c45b4361e82517eb8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 6 Jun 2022 23:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EDAO=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=AD=E5=8F=A5=EF=BC=8C=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?ExecutorType=E6=8C=87=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/msg/msgInnerList.html       | 74 +++++++++----------
 .../com/jeesite/test/InsertBatchTest.java     | 23 +++---
 2 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html
index 3922ea63..854c16cf 100644
--- a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html
+++ b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html
@@ -1,19 +1,19 @@
-<% layout('/layouts/default.html', {title: '站内消息', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa icon-speech"></i> ${text('站内消息')}
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
-				<% if(hasPermi('msg:msgInner:edit')){ %>
-					<a href="${ctx}/msg/msgInner/form" class="btn btn-default btnTool" title="${text('新增')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
-				<% } %>
-				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
-			</div>
-		</div>
-		<div class="box-body">
+<% layout('/layouts/default.html', {title: '站内消息', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-speech"></i> ${text('站内消息')}
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
+				<% if(hasPermi('msg:msgInner:edit')){ %>
+					<a href="${ctx}/msg/msgInner/form" class="btn btn-default btnTool" title="${text('新增')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+				<% } %>
+				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
+			</div>
+		</div>
+		<div class="box-body">
 			<#form:form id="searchForm" model="${msgInner}" action="${ctx}/msg/msgInner/listData" method="post" class="form-inline hide"
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
 				<div class="form-group">
@@ -37,10 +37,10 @@
 				<div class="form-group">
 					<label class="control-label">${text('发送时间')}：</label>
 					<div class="control-inline">
-						<#form:input path="sendDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="sendDate_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="sendDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date"
+						<#form:input path="sendDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
+							dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="sendDate_lte.click()"/>
+						&nbsp;-&nbsp;
+						<#form:input path="sendDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date"
 							dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
 					</div>
 				</div>
@@ -55,24 +55,24 @@
 					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
 				</div>
 			</#form:form>
-			<table id="dataGrid"></table> 
-			<div id="dataGridPage"></div>
-		</div>
-	</div>
-</div>
-<% } %>
+			<table id="dataGrid"></table> 
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+<% } %>
 <script>
 // 初始化DataGrid对象
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'${text("标题")}', name:'msgTitle', index:'a.msg_title', width:280, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			if(row.status == Global.STATUS_DRAFT){
-				return '<a href="${ctx}/msg/msgInner/form?id='+row.id+'" class="btnList" data-title="${text("编辑消息")}">'
-						+(val||row.id)+'</a>'+(row.isAttac==1?' <i class="fa fa-paperclip"></i>':'');
-			}else{
-				return '<a href="${ctx}/msg/msgInner/view?id='+row.id+'" class="btnList" data-title="${text("查看消息")}">'
-						+(val||row.id)+'</a>'+(row.isAttac==1?' <i class="fa fa-paperclip"></i>':'');
+			if(row.status == Global.STATUS_DRAFT){
+				return '<a href="${ctx}/msg/msgInner/form?id='+row.id+'" class="btnList" data-title="${text("编辑消息")}">'
+						+(val||row.id)+'</a>'+(row.isAttac==1?' <i class="fa fa-paperclip"></i>':'');
+			}else{
+				return '<a href="${ctx}/msg/msgInner/view?id='+row.id+'" class="btnList" data-title="${text("查看消息")}">'
+						+(val||row.id)+'</a>'+(row.isAttac==1?' <i class="fa fa-paperclip"></i>':'');
 			}
 		}},
 		{header:'${text("等级")}', name:'contentLevel', index:'a.content_level', width:80, align:"center", formatter: function(val, obj, row, act){
@@ -90,12 +90,12 @@ $('#dataGrid').dataGrid({
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			if(row.status == Global.STATUS_DRAFT){
-			<% if(hasPermi('msg:msgInner:edit')){ %>
-				actions.push('<a href="${ctx}/msg/msgInner/form?id='+row.id+'" class="btnList" title="${text("编辑消息")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+			//<% if(hasPermi('msg:msgInner:edit')){ %>
+				actions.push('<a href="${ctx}/msg/msgInner/form?id='+row.id+'" class="btnList" title="${text("编辑消息")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				actions.push('<a href="${ctx}/msg/msgInner/delete?id='+row.id+'" class="btnList" title="${text("删除消息")}" data-confirm="${text("确认要删除该消息吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
-			}else{
-				actions.push('<a href="${ctx}/msg/msgInner/view?id='+row.id+'" class="btnList" title="${text("查看消息")}"><i class="fa fa-book"></i></a>&nbsp;');
+			//<% } %>
+			}else{
+				actions.push('<a href="${ctx}/msg/msgInner/view?id='+row.id+'" class="btnList" title="${text("查看消息")}"><i class="fa fa-book"></i></a>&nbsp;');
 			}
 			return actions.join('');
 		}}
diff --git a/web/src/test/java/com/jeesite/test/InsertBatchTest.java b/web/src/test/java/com/jeesite/test/InsertBatchTest.java
index 4046a535..dac4fc59 100644
--- a/web/src/test/java/com/jeesite/test/InsertBatchTest.java
+++ b/web/src/test/java/com/jeesite/test/InsertBatchTest.java
@@ -4,19 +4,17 @@
  */
 package com.jeesite.test;
 
-import java.util.List;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-
-import com.jeesite.common.callback.MethodCallback;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.tests.BaseSpringContextTests;
 import com.jeesite.modules.Application;
 import com.jeesite.modules.test.dao.TestDataDao;
 import com.jeesite.modules.test.entity.TestData;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import java.util.List;
 
 /**
  * 批量插入测试
@@ -38,14 +36,11 @@ public class InsertBatchTest extends BaseSpringContextTests {
 			testData.setTestInput("test"+i);
 			list.add(testData);
 		}
-		ListUtils.pageList(list, 100, new MethodCallback() {
-			@SuppressWarnings("unchecked")
-			public Object execute(Object... objs) {
-				return testDataDao.insertBatch((List<TestData>)objs[0]);
-			}
-		});
+		testDataDao.insertBatch(list, null);
 		list = testDataDao.findList(new TestData());
 		System.out.println("size: " + list.size());
+		long count = testDataDao.updateBatch(list, null);
+		System.out.println("update: " + count);
 	}
 	
 }