github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuangqian 2016-11-14 15:35:41 +08:00
parent 394007faff
commit ddc2dc537c
6 changed files with 61 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/smallchill/core/base/service/BaseService.java
View File

@ -124,6 +124,11 @@ public class BaseService<M> implements IService<M>, ConstCurd {
Blade dao = getSqlMananger(); Blade dao = getSqlMananger();
return dao.saveAndSetKey(model); return dao.saveAndSetKey(model);
} }
public void saveBatch(List<?> list) {
Blade dao = getSqlMananger();
dao.saveBatch(list);
}
public boolean update(M model) { public boolean update(M model) {
Blade dao = getSqlMananger(); Blade dao = getSqlMananger();

6
src/main/java/com/smallchill/core/base/service/IService.java
View File

@ -135,6 +135,12 @@ public interface IService<M> {
* @param model * @param model
*/ */
public boolean saveAndSetKey(M model); public boolean saveAndSetKey(M model);
/**
* 批量插入
* @param list void
*/
public void saveBatch(List<?> list);
/** /**
* 通用修改(null的不入库) * 通用修改(null的不入库)

8
src/main/java/com/smallchill/core/plugins/dao/Blade.java
View File

@ -388,6 +388,14 @@ public class Blade {
public boolean saveAndSetKey(Object model){ public boolean saveAndSetKey(Object model){
return getSqlManager().insert(this.modelClass, model, true) > 0; return getSqlManager().insert(this.modelClass, model, true) > 0;
} }
/**
* 批量新增
* @param list void
*/
public void saveBatch(List<?> list){
getSqlManager().insertBatch(this.modelClass, list);
}
/** /**
* 修改一条数据,只更新非空字段 * 修改一条数据,只更新非空字段

2
src/main/webapp/WEB-INF/view/login.html
View File

@ -14,7 +14,7 @@
$(function(){ $(function(){
if(self != top){ if(self != top){
var url = window.location.href; var url = window.location.href;
parent.window.location.href=url; parent.window.location.href = url;
} }
}); });
</script> </script>

2
src/main/webapp/WEB-INF/view/system/menu/_widget/_menu_icon.html
View File

@ -55,11 +55,13 @@
else if (this.value == "重置密码") { else if (this.value == "重置密码") {
_icon = "btn btn-xs btn-white | fa fa-key bigger-120"; _icon = "btn btn-xs btn-white | fa fa-key bigger-120";
_url = _name + "/reset"; _url = _name + "/reset";
_code = _name.split("/")[1] + "_reset";
_alias = "reset"; _alias = "reset";
} }
else if (this.value == "冻结") { else if (this.value == "冻结") {
_icon = "btn btn-xs btn-white | fa fa-ban bigger-120"; _icon = "btn btn-xs btn-white | fa fa-ban bigger-120";
_url = _name + "/ban"; _url = _name + "/ban";
_code = _name.split("/")[1] + "_frozen";
_alias = "frozen"; _alias = "frozen";
} }
else if (this.value == "审核") { else if (this.value == "审核") {

126
src/main/webapp/static/blade/js/blade-btn.js
View File

@ -1,10 +1,8 @@
var btnjsons; var btnjsons;
var toolbar; var toolbar;
var curkeyword;
var curkeyword1;
var exwhere; var exwhere;
(function () { (function () {
var tmsp_btn = function (btnjson) { var blade_btn = function (btnjson) {
this.id = btnjson.CODE; this.id = btnjson.CODE;
this.name = btnjson.NAME; this.name = btnjson.NAME;
this.pname = btnjson.PNAME; this.pname = btnjson.PNAME;
@ -17,31 +15,31 @@ var exwhere;
}; };
//用于额外加载一些控件 //用于额外加载一些控件
tmsp_btn.prototype.initOther = function(){ blade_btn.prototype.initOther = function(){
if( typeof initZtree === 'function' ){ if( typeof initZtree === 'function' ){
initZtree(); initZtree();
} }
} }
tmsp_btn.prototype.isEmpty = function (str) { blade_btn.prototype.isEmpty = function (str) {
if (str == "" || str == null || str == "null" || str == "undefined" || str == undefined) { if (str == "" || str == null || str == "null" || str == "undefined" || str == undefined) {
return ""; return "";
} }
return str; return str;
}; };
tmsp_btn.prototype.open=function(tmsp_url,tmsp_id,tmsp_open){ blade_btn.prototype.open = function(blade_url, blade_id, blade_open){
var width=(this.area!="")?(this.area.split('*')[0]):"800"; var width = (this.area!="") ? (this.area.split('*')[0]) : "800";
var height=(this.area!="")?(this.area.split('*')[1]):"520"; var height = (this.area!="") ? (this.area.split('*')[1]) : "520";
var iframe_width=window.top.$(window).width(); var iframe_width = window.top.$(window).width();
var iframe_height=window.top.$(window).height(); var iframe_height = window.top.$(window).height();
var flag=(parseInt(width)>=iframe_width||parseInt(height)>=iframe_height)?true:false;width+="px";height+="px"; var flag = (parseInt(width) >= iframe_width || parseInt(height) >= iframe_height) ? true : false; width += "px";height += "px";
if(this.isopen=="1"||this.isEmpty(tmsp_open)=="1"){ if(this.isopen == "1" || this.isEmpty(blade_open) == "1"){
tmsp_id="btn_"+this.id+((this.isEmpty(tmsp_id)=="")?"":("_"+tmsp_id)); blade_id = "btn_" + this.id + ((this.isEmpty(blade_id) == "") ? "" : ("_" + blade_id));
window.top.addTabs({ window.top.addTabs({
id:tmsp_id, id: blade_id,
title:this.pname+"→"+this.name, title: this.pname + "→" + this.name,
url: tmsp_url, url: blade_url,
icon: this.li, icon: this.li,
close: true close: true
}); });
@ -49,11 +47,11 @@ var exwhere;
else{ else{
var index=layer.open({ var index=layer.open({
type: 2, type: 2,
title:this.pname+"→"+this.name, title: this.pname + "→" + this.name,
area: [width,height], area: [width, height],
fix: false, //不固定 fix: false, //不固定
maxmin: true, maxmin: true,
content: tmsp_url content: blade_url
}); });
if(flag){ if(flag){
layer.full(index); layer.full(index);
@ -61,7 +59,7 @@ var exwhere;
} }
}; };
tmsp_btn.prototype.itemClick = function () { blade_btn.prototype.itemClick = function () {
var ids = getGridXls().join(","); var ids = getGridXls().join(",");
var rows = getGridXls().length; var rows = getGridXls().length;
var rowData=getRowData(); var rowData=getRowData();
@ -100,7 +98,7 @@ var exwhere;
return; return;
} }
var _this = this; var _this = this;
var url= _this.url; var url = _this.url;
layer.confirm('是否确定删除？', { layer.confirm('是否确定删除？', {
icon: 3, icon: 3,
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消'] //按钮
@ -144,7 +142,7 @@ var exwhere;
layer_alert('只能选择一条数据!', "warn"); layer_alert('只能选择一条数据!', "warn");
return; return;
} }
var _this=this; var _this = this;
$.post(ctx + "/role/getPowerById", { id: ids }, function (data) { $.post(ctx + "/role/getPowerById", { id: ids }, function (data) {
if (data.code === 0) { if (data.code === 0) {
var roleName=rowData.NAME; var roleName=rowData.NAME;
@ -180,7 +178,7 @@ var exwhere;
layer_alert('请先分配角色!', "warn"); layer_alert('请先分配角色!', "warn");
return; return;
} }
var Name=rowData.NAME; var Name = rowData.NAME;
this.open(this.url + split + ids + split + Name,"","1"); this.open(this.url + split + ids + split + Name,"","1");
return; return;
} }
@ -202,7 +200,7 @@ var exwhere;
layer_alert('请选择一条数据!', "warn"); layer_alert('请选择一条数据!', "warn");
return; return;
} }
var url=this.url; var url = this.url;
layer.confirm('是否将密码重置为 111111？', { layer.confirm('是否将密码重置为 111111？', {
icon: 3, icon: 3,
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消'] //按钮
@ -226,7 +224,7 @@ var exwhere;
layer_alert('请选择一条数据!', "warn"); layer_alert('请选择一条数据!', "warn");
return; return;
} }
var url=this.url; var url = this.url;
layer.confirm('是否将选中账号冻结？', { layer.confirm('是否将选中账号冻结？', {
icon: 3, icon: 3,
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消'] //按钮
@ -256,18 +254,18 @@ var exwhere;
//带子按钮区域 //带子按钮区域
if (this.alias == "audit" || this.alias == "recycle") { if (this.alias == "audit" || this.alias == "recycle") {
var code=this.id; var code = this.id;
if (stage.all[code]==undefined) { if (stage.all[code] == undefined) {
$.post(ctx + "/cache/getChildBtn", { code: code }, function (data) { $.post(ctx + "/cache/getChildBtn", { code: code }, function (data) {
if (data.code === 0) { if (data.code === 0) {
btnjsons = data.data; btnjsons = data.data;
var _btn_child_stage=new btn_child_stage(); var _btn_child_stage = new btn_child_stage();
for (var i = 0; i < btnjsons.length; i++) { for (var i = 0; i < btnjsons.length; i++) {
if (btnjsons[i].name == '') continue; if (btnjsons[i].name == '') continue;
var btn_child = new tmsp_btn(btnjsons[i]); var btn_child = new blade_btn(btnjsons[i]);
_btn_child_stage.btn.register(btn_child); _btn_child_stage.btn.register(btn_child);
} }
stage.register(code,_btn_child_stage); stage.register(code, _btn_child_stage);
stage.all[code].btn.bind(toolbar); stage.all[code].btn.bind(toolbar);
} }
}, "json"); }, "json");
@ -275,14 +273,14 @@ var exwhere;
else { else {
stage.all[code].btn.bind(toolbar); stage.all[code].btn.bind(toolbar);
} }
exwhere=this.url.replace(ctx,"");//修复未发布在tomcat根目录下带有项目路径导致不能搜索的问题 exwhere = this.url.replace(ctx, "");//修复未发布在tomcat根目录下带有项目路径导致不能搜索的问题
searchGrid(); searchGrid();
return; return;
} }
}; };
tmsp_btn.prototype.childItemClick = function () { blade_btn.prototype.childItemClick = function () {
var ids = getGridXls().join(","); var ids = getGridXls().join(",");
var rows = getGridXls().length; var rows = getGridXls().length;
var split = "/"; var split = "/";
@ -308,7 +306,7 @@ var exwhere;
layer_alert('请选择一条数据!', "warn"); layer_alert('请选择一条数据!', "warn");
return; return;
} }
var url=this.url; var url = this.url;
layer.confirm('是否审核通过？', { layer.confirm('是否审核通过？', {
icon: 3, icon: 3,
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消'] //按钮
@ -333,7 +331,7 @@ var exwhere;
layer_alert('请选择一条数据!', "warn"); layer_alert('请选择一条数据!', "warn");
return; return;
} }
var url=this.url; var url = this.url;
layer.confirm('是否审核拒绝？', { layer.confirm('是否审核拒绝？', {
icon: 3, icon: 3,
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消'] //按钮
@ -359,7 +357,7 @@ var exwhere;
return; return;
} }
var _this = this; var _this = this;
var url=this.url; var url = this.url;
layer.confirm('是否还原', { layer.confirm('是否还原', {
icon: 3, icon: 3,
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消'] //按钮
@ -386,7 +384,7 @@ var exwhere;
return; return;
} }
var _this = this; var _this = this;
var url=this.url; var url = this.url;
layer.confirm('是否删除？删除后不可恢复', { layer.confirm('是否删除？删除后不可恢复', {
icon: 3, icon: 3,
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消'] //按钮
@ -412,7 +410,7 @@ var exwhere;
var stage = { var stage = {
all: {}, all: {},
register: function (id,_btn_child_stage) { register: function (id, _btn_child_stage) {
this.all[id] = _btn_child_stage; this.all[id] = _btn_child_stage;
} }
}; };
@ -447,7 +445,7 @@ var exwhere;
} }
}; };
var btn_child_stage=function(){ var btn_child_stage = function(){
this.btn = { this.btn = {
all: {}, all: {},
count: 0, count: 0,
@ -477,14 +475,14 @@ var exwhere;
}; };
}; };
window.tmsp_btn = tmsp_btn; window.blade_btn = blade_btn;
window.stage = stage; window.stage = stage;
window.btn_stage = btn_stage; window.btn_stage = btn_stage;
window.btn_child_stage = btn_child_stage; window.btn_child_stage = btn_child_stage;
} ()); } ());
// 根据模块code生成 每个工具条上面的 btn // 根据模块code生成每个工具条上面的 btn
function initMenuBtn(obj, code) { function initMenuBtn(obj, code) {
$.post(ctx + "/cache/getBtn", { code: code }, function (data) { $.post(ctx + "/cache/getBtn", { code: code }, function (data) {
if (data.code === 0) { if (data.code === 0) {
@ -492,7 +490,7 @@ function initMenuBtn(obj, code) {
btnjsons = data.data; btnjsons = data.data;
for (var i = 0; i < btnjsons.length; i++) { for (var i = 0; i < btnjsons.length; i++) {
if (btnjsons[i].name == '') continue; if (btnjsons[i].name == '') continue;
var btn_parent = new tmsp_btn(btnjsons[i]); var btn_parent = new blade_btn(btnjsons[i]);
btn_stage.register(btn_parent); btn_stage.register(btn_parent);
} }
btn_stage.bind(toolbar); btn_stage.bind(toolbar);
@ -501,50 +499,4 @@ function initMenuBtn(obj, code) {
doOther(); doOther();
} }
}, "json"); }, "json");
/*$.ajax({
type: "post",
url: ctx + "/cache/getBtn",
dataType: "json",
async: false,
data: {code : code},
success: function(data) {
if (data.code === 0) {
toolbar = obj;
btnjsons = data.data;
for (var i = 0; i < btnjsons.length; i++) {
if (btnjsons[i].name == '') continue;
var btn_parent = new tmsp_btn(btnjsons[i]);
btn_stage.register(btn_parent);
}
btn_stage.bind(toolbar);
}
if( typeof doOther === 'function' ){
doOther();
}
}
});*/
} }
//keyword为额外传入的变量
function initMenuBtns(obj, code, keyword, keyword1) {
$.post(ctx + "/cache/getBtn", { code: code }, function (data) {
if (data.code === 0) {
toolbar = obj;
btnjsons = data.data;
curkeyword = keyword;
curkeyword1 = keyword1;
for (var i = 0; i < btnjsons.length; i++) {
if (btnjsons[i].name == '') continue;
var btn_parent = new tmsp_btn(btnjsons[i]);
btn_stage.register(btn_parent);
}
}
if( typeof doOther === 'function' ){
doOther();
}
}, "json");
}