msb-public-java
/
jeecg
mirror of https://gitee.com/jeecg/jeecg.git
1
0
Code Issues Projects Releases Wiki Activity

追加lib包，避免不熟悉maven的困难

Browse Source 
追加lib包，避免不熟悉maven的困难
jeecg_3.5.2
zhangdaiscott 11 years ago
parent 084a819acb
commit 5136c9e669
216 changed files with 285 additions and 377 deletions
Show Stats Download Patch File Download Diff File

6
.classpath
Unescape View File

@ -4,11 +4,7 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_07"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_43">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

4
.project
Unescape View File

@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>

13
.settings/org.eclipse.jdt.core.prefs
Unescape View File

@ -0,0 +1,13 @@
#Wed Apr 01 11:35:12 CST 2015
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5

9
.settings/org.maven.ide.eclipse.prefs
Unescape View File

@ -0,0 +1,9 @@
#Wed Apr 01 11:33:36 CST 2015
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
includeModules=false
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1

2
pom.xml
Unescape View File

@ -102,7 +102,7 @@
<xstream.version>1.4.4</xstream.version>
<groovy.version>2.3.3</groovy.version>
<!--poi 工具类 -->
<easypoi.version>2.0.6</easypoi.version>
<easypoi.version>2.0.5</easypoi.version>
</properties>
<repositories>

4
src/main/java/org/jeecgframework/core/aop/GZipFilter.java
Unescape View File

@ -34,11 +34,11 @@ public class GZipFilter implements Filter {
private static boolean isGZipEncoding(HttpServletRequest request){
boolean flag=false;
String encoding=request.getHeader("Accept-Encoding");
//update-begin--Author:JueYue Date:20140518 for：IE下Excel上传encode为空的bug--------------------
if(encoding!=null&&encoding.indexOf("gzip")!=-1){
flag=true;
}
//update-end--Author:JueYue Date:20140518 for：IE下Excel上传encode为空的bug--------------------
return flag;
}

3
src/main/java/org/jeecgframework/core/common/dao/ICommonDao.java
Unescape View File

@ -55,7 +55,6 @@ public interface ICommonDao extends IGenericBaseCommonDao{
public void parserXml(String fileName);
public List<ComboTree> comTree(List<TSDepart> all,ComboTree comboTree);
// update-begin--Author:zhangguoming Date:20140819 for：添加recuisive方法参数
/**
* 根据模型生成ComboTree JSON
*
@ -66,7 +65,7 @@ public interface ICommonDao extends IGenericBaseCommonDao{
* @return List<ComboTree>
*/
public List<ComboTree> ComboTree(List all, ComboTreeModel comboTreeModel, List in, boolean recursive);
// update-end--Author:zhangguoming Date:20140819 for：添加recuisive方法参数
public List<TreeGrid> treegrid(List all,TreeGridModel treeGridModel);
}

11
src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java
Unescape View File

@ -466,16 +466,15 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene
for (Object inobj : in) {
ReflectHelper reflectHelper2 = new ReflectHelper(inobj);
String inId = oConvertUtils.getString(reflectHelper2.getMethodValue(comboTreeModel.getIdField()));
//update-begin--Author:JueYue Date:20140514 for：==不起作用--------------------
if (inId.equals(id)) {
tree.setChecked(true);
}
//update-end--Author:JueYue Date:20140514 for：==不起作用--------------------
}
}
}
// update-begin--Author:zhangguoming Date:20140819 for：递归子节点属性
List curChildList = (List) reflectHelper.getMethodValue(comboTreeModel.getChildField());
if (curChildList != null && curChildList.size() > 0) {
tree.setState("closed");
@ -491,7 +490,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene
tree.setChildren(children);
}
}
// update-end--Author:zhangguoming Date:20140819 for：递归子节点属性
return tree;
}
@ -587,12 +586,12 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene
tg.getFieldMap().put(entry.getKey(), fieldValue);
}
}
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
if (treeGridModel.getFunctionType() != null) {
String functionType = oConvertUtils.getString(reflectHelper.getMethodValue(treeGridModel.getFunctionType()));
tg.setFunctionType(functionType);
}
//update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
treegrid.add(tg);
}
return treegrid;

4
src/main/java/org/jeecgframework/core/common/model/json/TreeGrid.java
Unescape View File

@ -18,7 +18,7 @@ public class TreeGrid implements java.io.Serializable {
private String state = "open";// 是否展开(open,closed)
private String order;//排序
private Map<String, Object> fieldMap; // 存储实体字段信息容器： key-字段名称，value-字段值
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
private String functionType;// 其他参数
public String getFunctionType() {
@ -27,7 +27,7 @@ public class TreeGrid implements java.io.Serializable {
public void setFunctionType(String functionType) {
this.functionType = functionType;
}
//update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
public String getOrder() {
return order;
}

3
src/main/java/org/jeecgframework/core/common/service/CommonService.java
Unescape View File

@ -248,7 +248,6 @@ public interface CommonService {
public List<ComboTree> comTree(List<TSDepart> all, ComboTree comboTree);
// update-begin--Author:zhangguoming Date:20140819 for：添加recuisive方法参数
/**
* 根据模型生成JSON
*
@ -258,7 +257,7 @@ public interface CommonService {
* @return List<ComboTree>
*/
public List<ComboTree> ComboTree(List all, ComboTreeModel comboTreeModel, List in, boolean recursive);
// update-end--Author:zhangguoming Date:20140819 for：添加recuisive方法参数
/**
* 构建树形数据表

3
src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java
Unescape View File

@ -415,11 +415,10 @@ public class CommonServiceImpl implements CommonService {
return commonDao.getCountForJdbc(sql);
}
//update-begin--Author:JueYue Date:20140514 for：调用方法错误--------------------
public Long getCountForJdbcParam(String sql, Object[] objs) {
return commonDao.getCountForJdbcParam(sql,objs);
}
//update-end--Author:JueYue Date:20140514 for：调用方法错误--------------------
public <T> void batchSave(List<T> entitys) {

3
src/main/java/org/jeecgframework/core/constant/Globals.java
Unescape View File

@ -57,7 +57,6 @@ public final class Globals {
public static String Function_Order_ONE="ofun";//一级权限
public static String Function_Order_TWO="tfun";//二级权限
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
/**
* 权限类型
*/
@ -88,7 +87,7 @@ public final class Globals {
* 数据权限 - 菜单数据规则sql
*/
public static String MENU_DATA_AUTHOR_RULE_SQL ="MENU_DATA_AUTHOR_RULE_SQL";
//update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
/**
* 新闻法规
*/

6
src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java
Unescape View File

@ -111,7 +111,7 @@ public class HqlGenerateUtil {
// 根据类型分类处理
if (type.contains("class java.lang")
|| type.contains("class java.math")) {
// ------------update--Author:JueYue Date:2014-8-23
// for：查询拼装的替换
if (value != null && !value.equals("")) {
HqlRuleEnum rule = PageValueConvertRuleEnum
@ -125,7 +125,7 @@ public class HqlGenerateUtil {
ObjectParseUtil.addCriteria(cq, aliasName,
HqlRuleEnum.LE, endValue);
}
// ------------update--Author:JueYue Date:2014-8-23
// for：查询拼装的替换
} else if ("class java.util.Date".equals(type)) {
QueryTimeFormat format = origDescriptors[i].getReadMethod()
@ -164,7 +164,7 @@ public class HqlGenerateUtil {
if (isHaveRuleData(ruleMap, aliasName) ||( isNotEmpty(param)
&& itIsNotAllEmpty(param))) {
// 如果是实体类,创建别名,继续创建查询条件
// ------------update--Author:JueYue Date:20140521
// for：用户反馈
cq.createAlias(aliasName,
aliasName.replaceAll("\\.", "_"));

4
src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java
Unescape View File

@ -25,10 +25,10 @@ public class SWFToolsSWFConverter implements SWFConverter {
return;
}
String command = ConStant.getSWFToolsPath(extend) + " \"" + inputFile
//---update-for--文件预览无效------ scott@2013/05/22 ADD START
+ "\" -o " +" \""+ swfFile +" \""+ " -s languagedir=D:\\xpdf-chinese-simplified -T 9 -f";
// + "\" -o " + swfFile + " -s languagedir=D:\\xpdf-chinese-simplified -T 9 -f";
// ---update-for--文件预览无效----- scott@2013/05/22 ADD END
try {
// 开始转换文档
Process process = Runtime.getRuntime().exec(command);

13
src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java
Unescape View File

@ -95,7 +95,7 @@ public class AuthInterceptor implements HandlerInterceptor {
}
//String functionId=oConvertUtils.getString(request.getParameter("clickFunctionId"));
String functionId="";
//update-begin--Author:JueYue Date:20140831 for：onlinecodeing 的URL判断--------------------
//onlinecoding的访问地址有规律可循，数据权限链接篡改
if(requestPath.equals("cgAutoListController.do?datagrid")) {
requestPath += "&configId=" + request.getParameter("configId");
@ -106,7 +106,7 @@ public class AuthInterceptor implements HandlerInterceptor {
if(requestPath.equals("cgFormBuildController.do?ftlForm")) {
requestPath += "&tableName=" + request.getParameter("tableName");
}
//update-end--Author:JueYue Date:20140831 for：onlinecodeing 的URL判断--------------------
//这个地方用全匹配？应该是模糊查询吧
//TODO
List<TSFunction> functions = systemService.findByProperty(TSFunction.class, "functionUrl", requestPath);
@ -122,7 +122,7 @@ public class AuthInterceptor implements HandlerInterceptor {
request.setAttribute(Globals.OPERATIONCODES, operationCodes);
}
if(!oConvertUtils.isEmpty(functionId)){
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
//List<String> allOperation=this.systemService.findListbySql("SELECT operationcode FROM t_s_operation WHERE functionid='"+functionId+"'");
List<TSOperation> allOperation=this.systemService.findByProperty(TSOperation.class, "TSFunction.id", functionId);
@ -211,16 +211,15 @@ public class AuthInterceptor implements HandlerInterceptor {
"ru.userid='"+userid+"' AND f.functionurl like '"+requestPath+"%'";
List list = this.systemService.findListbySql(sql);
if(list.size()==0){
// update-start--Author:zhangguoming Date:20140821 for：判断当前用户组织机构下角色所拥有的权限
// update-start--Author:zhangguoming Date:20140825 for：获取当前用户登录时选择的组织机构代码
String orgId = currLoginUser.getCurrentDepart().getId();
// update-end--Author:zhangguoming Date:20140825 for：获取当前用户登录时选择的组织机构代码
String functionOfOrgSql = "SELECT DISTINCT f.id from t_s_function f, t_s_role_function rf, t_s_role_org ro " +
"WHERE f.ID=rf.functionid AND rf.roleid=ro.role_id " +
"AND ro.org_id='" +orgId+ "' AND f.functionurl like '"+requestPath+"%'";
List functionOfOrgList = this.systemService.findListbySql(functionOfOrgSql);
return functionOfOrgList.size() > 0;
// update-end--Author:zhangguoming Date:20140821 for：判断当前用户组织机构下角色所拥有的权限
}else{
return true;
}

3
src/main/java/org/jeecgframework/core/util/DateUtils.java
Unescape View File

@ -65,7 +65,6 @@ public class DateUtils extends PropertyEditorSupport {
*/
public static Calendar getCalendar(long millis) {
Calendar cal = Calendar.getInstance();
// --------------------cal.setTimeInMillis(millis);
cal.setTime(new Date(millis));
return cal;
}
@ -256,7 +255,6 @@ public class DateUtils extends PropertyEditorSupport {
* @return 指定日历的时间戳
*/
public static Timestamp getCalendarTimestamp(Calendar cal) {
// ---------------------return new Timestamp(cal.getTimeInMillis());
return new Timestamp(cal.getTime().getTime());
}
@ -290,7 +288,6 @@ public class DateUtils extends PropertyEditorSupport {
* @return 指定日历的毫秒数
*/
public static long getMillis(Calendar cal) {
// --------------------return cal.getTimeInMillis();
return cal.getTime().getTime();
}

13
src/main/java/org/jeecgframework/core/util/ListtoMenu.java
Unescape View File

@ -206,7 +206,6 @@ public class ListtoMenu {
return menuString.toString();
}
// update-start--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色
/**
* 拼装EASYUI 多级 菜单 下级菜单为树形
@ -261,7 +260,7 @@ public class ListtoMenu {
return menuString.toString();
}
// update-end--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色
/**
* 获取顶级菜单的下级菜单-----面板式菜单
@ -455,8 +454,6 @@ public class ListtoMenu {
return menuString.toString();
}
//update-start--Author:gaofeng Date:2014-02-14：新增webos头部菜单导航,多级菜单
/**
* 拼装webos头部菜单
* @param pFunctions
@ -588,10 +585,10 @@ public class ListtoMenu {
dataString.append("'"+function.getId()+"':{ ");
dataString.append("appid:'"+function.getId()+"',");
dataString.append("url:'"+function.getFunctionUrl()+"',");
// update-begin--Author:zhangguoming Date:20140509 for：添加云桌面图标
// dataString.append(getIconandName(function.getFunctionName()));
dataString.append(getIconAndNameForDesk(function));
// update-end--Author:zhangguoming Date:20140509 for：添加云桌面图标
dataString.append("asc :"+function.getFunctionOrder());
dataString.append(" },");
}
@ -601,7 +598,6 @@ public class ListtoMenu {
return data;
}
// update-begin--Author:zhangguoming Date:20140512 for：添加云桌面图标管理
private static String getIconAndNameForDesk(TSFunction function) {
StringBuffer dataString = new StringBuffer();
@ -681,6 +677,5 @@ public class ListtoMenu {
String lang_context = mutiLangService.getLang(functionName);
return lang_context;
}
// update-end--Author:zhangguoming Date:20140512 for：添加云桌面图标管理
//update-start--Author:gaofeng Date:2014-02-14：新增Webos头部菜单导航，多级菜单
}

9
src/main/java/org/jeecgframework/core/util/ResourceUtil.java
Unescape View File

@ -145,7 +145,6 @@ public class ResourceUtil {
return DBTypeUtil.getDBType().toLowerCase();
}
// update-begin--Author:zhangguoming Date:20140226 for：添加验证码
/**
* 获取随机码的长度
*
@ -163,7 +162,7 @@ public class ResourceUtil {
public static String getRandCodeType() {
return bundle.getString("randCodeType");
}
// update-end--Author:zhangguoming Date:20140226 for：添加验证码
/**
* 获取组织机构编码长度的类型
@ -180,8 +179,7 @@ public class ResourceUtil {
* @return
*/
public static String getUserSystemData(String key) {
//----------------------------------------------------------------
//update-begin--Author:zhangdaihao Date:20140913 for：获取系统上下文变量
//替换为系统的登录用户账号
// if (key.equals(DataBaseConstant.CREATE_BY)
@ -203,9 +201,6 @@ public class ResourceUtil {
) {
return getSessionUserName().getRealName();
}
//update-end--Author:zhangdaihao Date:20140913 for：获取系统上下文变量
//----------------------------------------------------------------
//替换为系统登录用户的公司编码
if (key.equals(DataBaseConstant.SYS_COMPANY_CODE)|| key.equals(DataBaseConstant.SYS_COMPANY_CODE_TABLE)) {
return getSessionUserName().getCurrentDepart().getOrgCode()

4
src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java
Unescape View File

@ -57,7 +57,7 @@ public class AuthFilterTag extends TagSupport{
protected void getAuthFilter(StringBuilder out) {
out.append("<script type=\"text/javascript\">");
out.append("$(document).ready(function(){");
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
if(ResourceUtil.getSessionUserName().getUserName().equals("admin")|| !Globals.BUTTON_AUTHORITY_CHECK){
}else{
Set<String> operationCodes = (Set<String>) super.pageContext.getRequest().getAttribute(Globals.OPERATIONCODES);
@ -82,7 +82,7 @@ public class AuthFilterTag extends TagSupport{
}
}
//update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
out.append("});");
out.append("</script>");
}

3
src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java
Unescape View File

@ -43,13 +43,12 @@ public class BaseTag extends TagSupport {
String langjs = StringUtil.replace("<script type=\"text/javascript\" src=\"plug-in/mutiLang/{0}.js\"></script>", "{0}", lang);
sb.append(langjs);
// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面
if (oConvertUtils.isIn("jquery-webos", types)) {
sb.append("<script type=\"text/javascript\" src=\"plug-in/sliding/js/jquery-1.7.1.min.js\"></script>");
} else if (oConvertUtils.isIn("jquery", types)) {
sb.append("<script type=\"text/javascript\" src=\"plug-in/jquery/jquery-1.8.3.js\"></script>");
}
// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面
if (oConvertUtils.isIn("ckeditor", types)) {
sb.append("<script type=\"text/javascript\" src=\"plug-in/ckeditor/ckeditor.js\"></script>");
sb.append("<script type=\"text/javascript\" src=\"plug-in/tools/ckeditorTool.js\"></script>");

4
src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java
Unescape View File

@ -25,9 +25,9 @@ public class DataGridColumnTag extends TagSupport {
protected boolean sortable=true;
protected boolean checkbox;
protected String formatter;
// update-start-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题
protected boolean hidden=false;
// update-end-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题
protected String replace;
protected String treefield;
protected boolean image;

24
src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java
Unescape View File

@ -283,7 +283,7 @@ public class DataGridTag extends TagSupport {
dataGridColumn.setAutocomplete(isAuto);
dataGridColumn.setExtendParams(extendParams);
columnList.add(dataGridColumn);
//update-begin--Author:anchao Date:20140826 for：[bugfree号]数据列权限控制--------------------
Set<String> operationCodes = (Set<String>) super.pageContext.getRequest().getAttribute(Globals.OPERATIONCODES);
if (null!=operationCodes) {
for (String MyoperationCode : operationCodes) {
@ -297,7 +297,7 @@ public class DataGridTag extends TagSupport {
}
}
}
//update-end--Author:anchao Date:20140826 for：[bugfree号]数据列权限控制--------------------
@ -476,9 +476,9 @@ public class DataGridTag extends TagSupport {
sb.append(",\"mData\":\"" + column.getField() + "\"");
sb.append(",\"sWidth\":\"" + colwidth + "\"");
sb.append(",\"bSortable\":" + column.isSortable() + "");
// update-start-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题
sb.append(",\"bVisible\":" + !column.isHidden() + "");
// update-end-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题
sb.append(",\"bSearchable\":" + column.isQuery() + "");
}
sb.append("}");
@ -618,20 +618,18 @@ public class DataGridTag extends TagSupport {
sb.append("var jsonparams=$.parseJSON(params);");
sb.append("$(\'#" + name + "\')." + grid + "({url:'" + actionUrl + "&field=" + searchFields + "',queryParams:jsonparams});" + "}");
//update-begin chenxu 20140423 for:修改在弹出界面中使用single查询模式时，查询条件不起作用
//searchbox框执行方法
searchboxFun(sb,grid);
//update-end chenxu 20140423 for:修改在弹出界面中使用single查询模式时，查询条件不起作用
//生成重置按钮功能js
//update-begin Robin 20140426 for:回车事件
//回车事件
sb.append("function EnterPress(e){");
sb.append("var e = e || window.event;");
sb.append("if(e.keyCode == 13){ ");
sb.append(name+"search();");
sb.append("}}");
//update-begin Robin 20140426 for:回车事件
sb.append("function searchReset(name){");
sb.append(" $(\"#\"+name+\"tb\").find(\":input\").val(\"\");");
@ -698,7 +696,7 @@ public class DataGridTag extends TagSupport {
}else if(col.isAutocomplete()){
sb.append(getAutoSpan(col.getField().replaceAll("_","\\."),extendAttribute(col.getExtend())));
}else{
//update-begin Robin 20140426 for:回车事件 兼容IE,FF
sb.append("<input onkeypress=\"EnterPress(event)\" onkeydown=\"EnterPress()\" type=\"text\" name=\""+col.getField().replaceAll("_","\\.")+"\" "+extendAttribute(col.getExtend())+" style=\"width: 100px\" />");
}
}else if("group".equals(col.getQueryMode())){
@ -1029,12 +1027,12 @@ public class DataGridTag extends TagSupport {
sb.append(","+column.getExtendParams().substring(0,
column.getExtendParams().length()-1));
}
// update-start-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题
// 隐藏字段
if (column.isHidden()) {
sb.append(",hidden:true");
}
// update-end-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题
if (!treegrid) {
// 字段排序
if ((column.isSortable()) && (field.indexOf("_") <= 0 && field != "opt")) {
@ -1181,7 +1179,7 @@ public class DataGridTag extends TagSupport {
}
public String getNoAuthOperButton(){
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
StringBuffer sb = new StringBuffer();
if(ResourceUtil.getSessionUserName().getUserName().equals("admin")|| !Globals.BUTTON_AUTHORITY_CHECK){
}else{
@ -1207,7 +1205,7 @@ public class DataGridTag extends TagSupport {
}
}
//update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
org.jeecgframework.core.util.LogUtil.info("----getNoAuthOperButton-------"+sb.toString());
return sb.toString();
}

8
src/main/java/org/jeecgframework/tag/core/easyui/DictSelectTag.java
Unescape View File

@ -104,9 +104,9 @@ public class DictSelectTag extends TagSupport {
sb.append(" id=\"" + id + "\"");
}
sb.append(">");
//update-begin--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目--------------------
select("common.please.select", "", sb);
//update-end--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目----------------------
for (Map<String, Object> map : list) {
select(map.get("text").toString(), map.get("field").toString(), sb);
}
@ -153,9 +153,9 @@ public class DictSelectTag extends TagSupport {
sb.append(" id=\"" + id + "\"");
}
sb.append(">");
//update-begin--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目--------------------
select("common.please.select", "", sb);
//update-end--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目----------------------
for (TSType type : types) {
select(type.getTypename(), type.getTypecode(), sb);
}

8
src/main/java/org/jeecgframework/tag/core/easyui/FormValidationTag.java
Unescape View File

@ -168,7 +168,7 @@ public class FormValidationTag extends TagSupport {
passsb.append("}");// trigger结尾
passsb.append("}");// passwordstrength结尾
}
// update-start--Author:gaofeng Date:20140711 for：修改在使用jptransform时的逗号","拼接错误
sb.append("usePlugin:{");
if (usePlugin.indexOf("password") >= 0) {
sb.append(passsb);
@ -180,7 +180,7 @@ public class FormValidationTag extends TagSupport {
}
jqsb.append("jqtransform :{selector:\"select\"}");
}
// update-end--Author:gaofeng Date:20140711 for：修改在使用jptransform时的逗号","拼接错误
if (usePlugin.indexOf("jqtransform") >= 0) {
sb.append(jqsb);
}
@ -188,8 +188,8 @@ public class FormValidationTag extends TagSupport {
}
sb.append("callback:function(data){");
if (dialog) {
if(callback!=null&&callback.contains("@Override")){//复写默认callback
sb.append(callback.replaceAll("@Override", "") + "(data);");
if(callback!=null&&callback.contains("")){//复写默认callback
sb.append(callback.replaceAll("", "") + "(data);");
}else{
sb.append("var win = frameElement.api.opener;");
//先判断是否成功，成功再刷新父页面，否则return false

8
src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java
Unescape View File

@ -54,22 +54,22 @@ public class MenuTag extends TagSupport {
public StringBuffer end() {
StringBuffer sb = new StringBuffer();
// update-begin--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色
if (style.equals("easyui")) {
sb.append("<ul id=\"nav\" class=\"easyui-tree tree-lines\" fit=\"true\" border=\"false\">");
sb.append(ListtoMenu.getEasyuiMultistageTree(menuFun, style));
sb.append("</ul>");
}
if(style.equals("shortcut"))
// update-begin--Author:zhangguoming Date:20140429 for：在IE7下 导航显示问题
// { sb.append("<div id=\"nav\" style=\"display:none;\" class=\"easyui-accordion\" fit=\"true\" border=\"false\">");
{
sb.append("<div id=\"nav\" style=\"display:block;\" class=\"easyui-accordion\" fit=\"true\" border=\"false\">");
// update-end--Author:zhangguoming Date:20140429 for：在IE7下 导航显示问题
sb.append(ListtoMenu.getEasyuiMultistageTree(menuFun, style));
sb.append("</div>");
}
// update-end--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色
if(style.equals("bootstrap"))
{
sb.append(ListtoMenu.getBootMenu(parentFun, childFun));

4
src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java
Unescape View File

@ -73,7 +73,7 @@ public class TagUtil {
}
value = reflectHelper.getMethodValue(fieldName)==null?"":reflectHelper.getMethodValue(fieldName);
if (value !=""&&value != null && (FiledName.indexOf("_") != -1||FiledName.indexOf(".") != -1)) {
// update-start--Author:zhangguoming Date:20140827 for：功能增强，添加处理对象中List<Object>属性字段的解析
if(value instanceof List) {
Object tempValue = "";
for (Object listValue : (List)value) {
@ -83,7 +83,7 @@ public class TagUtil {
} else {
value = fieldNametoValues(childFieldName, value);
}
// update-end--Author:zhangguoming Date:20140827 for：功能增强，添加处理对象中List<Object>属性字段的解析
}
if(value != "" && value != null) {
value = value.toString().replaceAll("\r\n", "");

8
src/main/java/org/jeecgframework/web/cgform/controller/autolist/CgAutoListController.java
Unescape View File

@ -193,9 +193,9 @@ public class CgAutoListController extends BaseController{
// }
for(DictEntity dictEntity:dicDataList){
if(value.equalsIgnoreCase(dictEntity.getTypecode())){
//------------------update-begin------for:-国际化处理-----------------------author:zhagndaihao------------
r.put(bean.getFieldName(),MutiLangUtil.getMutiLangInstance().getLang(dictEntity.getTypename()));
//------------------update-end-----for:-国际化处理----------------------------author:zhagndaihao---------
}
}
}
@ -266,7 +266,7 @@ public class CgAutoListController extends BaseController{
List<Map> queryList = new ArrayList<Map>();
StringBuilder fileds = new StringBuilder();
StringBuilder initQuery = new StringBuilder();
//------------------update-begin-------2014年9月3日----author:JueYue------for:-列表数据隐藏权限------------
Set<String> operationCodes = (Set<String>) request.getAttribute(Globals.OPERATIONCODES);
Map<String,TSOperation> operationCodesMap = new HashMap<String, TSOperation>();
if(operationCodes != null){
@ -282,7 +282,7 @@ public class CgAutoListController extends BaseController{
if(operationCodesMap.containsKey(bean.getFieldName())) {
continue;
}
//------------------update-end---2014年9月3日----author:JueYue------for:-列表数据隐藏权限------------
Map fm = new HashMap<String, Object>();
fm.put(CgAutoListConstant.FILED_ID, bean.getFieldName());
fm.put(CgAutoListConstant.FIELD_TITLE, bean.getContent());

4
src/main/java/org/jeecgframework/web/cgform/controller/build/CgFormBuildController.java
Unescape View File

@ -71,10 +71,10 @@ public class CgFormBuildController extends BaseController {
try {
long start = System.currentTimeMillis();
String tableName =request.getParameter("tableName");
// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
String ftlVersion =request.getParameter("ftlVersion");
Template template = templetContext.getTemplate(tableName, ftlVersion);
// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
StringWriter stringWriter = new StringWriter();
BufferedWriter writer = new BufferedWriter(stringWriter);
Map<String, Object> data = new HashMap<String, Object>();

4
src/main/java/org/jeecgframework/web/cgform/controller/excel/ExcelTempletController.java
Unescape View File

@ -306,9 +306,9 @@ public class ExcelTempletController extends BaseController {
String value = String.valueOf(r.get(bean.getFieldName()));
for(DictEntity dictEntity:dicDataList){
if(value.equalsIgnoreCase(dictEntity.getTypecode())){
//------------------update-begin------for:-国际化处理-----------------------author:zhagndaihao------------
r.put(bean.getFieldName(),MutiLangUtil.getMutiLangInstance().getLang(dictEntity.getTypename()));
//------------------update-end-----for:-国际化处理----------------------------author:zhagndaihao---------
}
}
}

4
src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java
Unescape View File

@ -191,13 +191,13 @@ public class CgformTransController {
cgFormField.setLength(Integer.valueOf(columnt
.getPrecision()));
}
//update-begin--Author:zhangdaihao Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败
else{
if(cgFormField.getType().equals(DataBaseConst.INT)){
cgFormField.setLength(10);
}
}
//update-end--Author:zhangdaihao Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败
if (StringUtil.isNotEmpty(columnt.getScale()))
cgFormField.setPointLength(Integer.valueOf(columnt
.getScale()));

8
src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java
Unescape View File

@ -67,14 +67,14 @@ public class DBTempletLoader implements TemplateLoader {
}
private Object getObject(String name) throws IOException {
// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
String ftlVersion = "";
String ftlVersionParam = "&ftlVersion=";
if(name.contains(ftlVersionParam)) {
ftlVersion = name.substring(name.indexOf(ftlVersionParam) + ftlVersionParam.length());
name = name.substring(0, name.indexOf(ftlVersionParam));
}
// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
PathMatchingResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver();
if(name.lastIndexOf(".ftl")==-1){//判断是否为include的模板
//如果是主表直接走一对多模板
@ -90,14 +90,14 @@ public class DBTempletLoader implements TemplateLoader {
}
//1、根据table name 查询cgformftl 有则获取模板内容
//2、没有cgformftl 则查询cgformfield 根据cgformfield生成模板
// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
Map<String,Object> cgformFtlEntity = new HashMap<String, Object>();
if (ftlVersion != null && ftlVersion.length() > 0) {
cgformFtlEntity = cgformFtlService.getCgformFtlByTableName(name, ftlVersion);
} else {
cgformFtlEntity = cgformFtlService.getCgformFtlByTableName(name);
}
// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
if(cgformFtlEntity!=null){
String content = (String) (cgformFtlEntity.get("ftl_content")==null?"":cgformFtlEntity.get("ftl_content"));
content = initFormHtml( content, name);

4
src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java
Unescape View File

@ -64,11 +64,11 @@ public class TempletContext {
if (tableName == null) {
return null;
}
// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
if (ftlVersion != null && ftlVersion.length() > 0) {
tableName = tableName + "&ftlVersion=" + ftlVersion;
}
// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
try {
if(CgAutoListConstant.SYS_MODE_DEV.equalsIgnoreCase(_sysMode)){//开发模式
template = freemarker.getTemplate(tableName,freemarker.getLocale(), ENCODING);

4
src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java
Unescape View File

@ -63,12 +63,12 @@ public class DictDataTag implements TemplateDirectiveModel {
if (dataList == null) {
dataList = new ArrayList<TSType>();
}
//------------------update-begin------for:-国际化处理-----------------------author:zhagndaihao------------
for(TSType s:dataList){
String names = s.getTypename();
s.setTypename(MutiLangUtil.getMutiLangInstance().getLang(names));
}
//------------------update-end-----for:-国际化处理----------------------------author:zhagndaihao---------
env.setGlobalVariable(var, new SimpleCollection(dataList));
} else {
// table表查询

4
src/main/java/org/jeecgframework/web/cgform/service/cgformftl/CgformFtlServiceI.java
Unescape View File

@ -5,7 +5,7 @@ import org.jeecgframework.core.common.service.CommonService;
import java.util.Map;
public interface CgformFtlServiceI extends CommonService{
// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
/**
* 根据tableName获取form模板信息
* <li>根据 ftlVersion 的值获取模板，如果该参数为空，则默认取第一个激活的模板</li>
@ -14,7 +14,7 @@ public interface CgformFtlServiceI extends CommonService{
* @return form模板信息
*/
public Map<String,Object> getCgformFtlByTableName(String tableName, String ftlVersion);
// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
/**
* 根据tableName获取form模板信息

4
src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java
Unescape View File

@ -138,7 +138,7 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ
}
}
}
//update-begin--Author:JueYue Date:20140831 for：onlinecoding 数据权限
Object dataRuleSql = JeecgDataAutorUtils.loadDataSearchConditonSQLString();//ContextHolderUtils.getRequest().getAttribute(Globals.MENU_DATA_AUTHOR_RULE_SQL);
if(dataRuleSql != null && !dataRuleSql.equals("")){
if(params.size() == 0) {
@ -146,7 +146,7 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ
}
sqlB.append(dataRuleSql);
}
//update-end--Author:JueYue Date:20140831 for：onlinecoding 数据权限
}

8
src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java
Unescape View File

@ -177,11 +177,11 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe
data.put(String.valueOf(key), newV);
}
}
//update---start--author：JueYue---------date：20140824---------for：默认值无效
} else if(oConvertUtils.isNotEmpty(fieldConfigs.get(key).getFieldDefault())) {
data.remove(key.toString().toLowerCase());
}
//update---end--author：JueYue---------date：20140824---------for：默认值无效
}
return data;
}
@ -298,10 +298,10 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe
sql = sql.replace("#{UUID}", UUIDGenerator.generate());
}
for (String key : params.keySet()) {
//update-begin--Author:JueYue Date:20140425 for：String不能强转
// sql = sql.replace("${" + key + "}", "'"+String.valueOf(params.get(key))+"'");
sql = sql.replace("#{" + key + "}",String.valueOf(params.get(key)));
//update-end--Author:JueYue Date:20140425 for：String不能强转
}
return sql;
}

8
src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java
Unescape View File

@ -13,8 +13,8 @@ import java.util.Map;
@Service("cgformFtlService")
@Transactional
public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtlServiceI {
// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
@Override
public Map<String, Object> getCgformFtlByTableName(String tableName, String ftlVersion) {
StringBuilder sql = new StringBuilder("");
sql.append("select ftl.* from cgform_ftl ftl,cgform_head head");
@ -27,7 +27,7 @@ public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtl
}
return null;
}
// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板
/**
* 根据tableName获取form模板信息
@ -72,7 +72,7 @@ public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtl
return false;
}
@Override
public String getUserFormFtl(String id) {
CriteriaQuery cq = new CriteriaQuery(CgformFtlEntity.class);
cq.eq("cgformId", id);

3
src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/DbTableProcess.java
Unescape View File

@ -161,14 +161,13 @@ public class DbTableProcess {
session.getSessionFactory()).getConnection());
dbExport.execute(true, true, false, true);
//update-begin--Author:Robin Date:20140507 for：TASK #409 字段长度未注明时，显示同步数据库成功，但实则未创建数据表
//抛出执行异常，抛出第一个即可
@SuppressWarnings("unchecked")
List<Exception> exceptionList = dbExport.getExceptions();
for (Exception exception : exceptionList) {
throw new DBException(exception.getMessage());
}
//update-end--Author:Robin Date:20140507 for：TASK #409 字段长度未注明时，显示同步数据库成功，但实则未创建数据表
}
/**

8
src/main/java/org/jeecgframework/web/demo/controller/test/JeecgEasyUIController.java
Unescape View File

@ -92,14 +92,10 @@ public class JeecgEasyUIController extends BaseController {
this.jeecgJdbcService.getDatagrid1(jeecgJdbc, dataGrid);
TagUtil.datagrid(response, dataGrid);
// end of 方式1 ========================================= */
// 方式2, 取值自己处理(代码量多一些，但执行效率应该会稍高一些) -------------------------------
/*
this.jeecgJdbcService.getDatagrid2(jeecgJdbc, dataGrid);
TagUtil.datagrid(response, dataGrid);
// end of 方式2 ========================================= */
// 方式3, 取值进一步自己处理(直接转换成easyUI的datagrid需要的东西，执行效率最高，最自由) -------------------------------
//*
JSONObject jObject = this.jeecgJdbcService.getDatagrid3(jeecgJdbc, dataGrid);
responseDatagrid(response, jObject);
@ -171,11 +167,7 @@ public class JeecgEasyUIController extends BaseController {
req.setAttribute("departList", departList);
return new ModelAndView("jeecg/demo/notag/jeecgEasyUI");
}
// -----------------------------------------------------------------------------------
// 以下各函数可以提成共用部件 (Add by Quainty)
// -----------------------------------------------------------------------------------
public void responseDatagrid(HttpServletResponse response, JSONObject jObject) {
response.setContentType("application/json");
response.setHeader("Cache-Control", "no-store");

8
src/main/java/org/jeecgframework/web/demo/controller/test/JeecgJdbcController.java
Unescape View File

@ -83,14 +83,10 @@ public class JeecgJdbcController extends BaseController {
this.jeecgJdbcService.getDatagrid1(jeecgJdbc, dataGrid);
TagUtil.datagrid(response, dataGrid);
// end of 方式1 ========================================= */
// 方式2, 取值自己处理(代码量多一些，但执行效率应该会稍高一些) -------------------------------
/*
this.jeecgJdbcService.getDatagrid2(jeecgJdbc, dataGrid);
TagUtil.datagrid(response, dataGrid);
// end of 方式2 ========================================= */
// 方式3, 取值进一步自己处理(直接转换成easyUI的datagrid需要的东西，执行效率最高，最自由) -------------------------------
//*
JSONObject jObject = this.jeecgJdbcService.getDatagrid3(jeecgJdbc, dataGrid);
responseDatagrid(response, jObject);
@ -160,11 +156,7 @@ public class JeecgJdbcController extends BaseController {
}
return new ModelAndView("jeecg/demo/test/jeecgJdbc");
}
// -----------------------------------------------------------------------------------
// 以下各函数可以提成共用部件 (Add by Quainty)
// -----------------------------------------------------------------------------------
public void responseDatagrid(HttpServletResponse response, JSONObject jObject) {
response.setContentType("application/json");
response.setHeader("Cache-Control", "no-store");

4
src/main/java/org/jeecgframework/web/demo/controller/test/ReportDemoController.java
Unescape View File

@ -114,9 +114,9 @@ public class ReportDemoController extends BaseController {
Long count = systemService.getCountForJdbc("SELECT COUNT(1) FROM T_S_student WHERE 1=1");
List lt = new ArrayList();
hc = new Highchart();
//update-begin--Author:JueYue Date:20140724 for：国际化--------------------
hc.setName(mutiLangService.getLang(CLASS_STUDENT_COUNT_ANALYSIS));
//update-end--Author:JueYue Date:20140724 for：国际化--------------------
hc.setType(reportType);
Map<String, Object> map;
if (userBroswerList.size() > 0) {

6
src/main/java/org/jeecgframework/web/demo/service/impl/test/JeecgJdbcServiceImpl.java
Unescape View File

@ -56,8 +56,6 @@ public class JeecgJdbcServiceImpl extends CommonServiceImpl implements JeecgJdbc
}
// end of 方式1 ========================================= */
// 方式2, 取值自己处理(代码量多一些，但执行效率应该会稍高一些) -------------------------------
public void getDatagrid2(JeecgJdbcEntity pageObj, DataGrid dataGrid) {
String sqlWhere = getSqlWhere(pageObj);
@ -111,7 +109,6 @@ public class JeecgJdbcServiceImpl extends CommonServiceImpl implements JeecgJdbc
// end of 方式2 ========================================= */
// 推荐方法
// 方式3, 取值进一步自己处理(直接转换成easyUI的datagrid需要的东西，执行效率最高，最自由) -------------------------------
public JSONObject getDatagrid3(JeecgJdbcEntity pageObj, DataGrid dataGrid) {
String sqlWhere = getSqlWhere(pageObj);
@ -164,10 +161,7 @@ public class JeecgJdbcServiceImpl extends CommonServiceImpl implements JeecgJdbc
}
return sqlWhere;
}
// -----------------------------------------------------------------------------------
// 以下各函数可以提成共用部件 (Add by Quainty)
// -----------------------------------------------------------------------------------
/**
* 返回easyUI的DataGrid数据格式的JSONObject对象
* @param mapList : 从数据库直接取得的结果集列表

6
src/main/java/org/jeecgframework/web/sms/service/impl/TSSmsSqlServiceImpl.java
Unescape View File

@ -18,19 +18,19 @@ public class TSSmsSqlServiceImpl extends CommonServiceImpl implements TSSmsSqlSe
@Resource
private JdbcTemplate jdbcTemplate;
@Override
public boolean doAddSql(TSSmsSqlEntity t) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean doDelSql(TSSmsSqlEntity t) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean doUpdateSql(TSSmsSqlEntity t) {
// TODO Auto-generated method stub
return false;

15
src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java
Unescape View File

@ -104,7 +104,6 @@ public class DepartController extends BaseController {
TagUtil.datagrid(response, dataGrid);
}
// update-start--Author:zhangguoming Date:20140825 for：添加业务逻辑；添加类注释；
/**
* 删除部门：
* <ul>
@ -143,7 +142,7 @@ public class DepartController extends BaseController {
j.setMsg(message);
return j;
}
// update-end--Author:zhangguoming Date:20140825 for：添加业务逻辑；添加类注释；
public void upEntity(TSDepart depart) {
List<TSUser> users = systemService.findByProperty(TSUser.class, "TSDepart.id", depart.getId());
@ -332,14 +331,14 @@ public class DepartController extends BaseController {
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, user);
String departid = oConvertUtils.getString(request.getParameter("departid"));
if (!StringUtil.isEmpty(departid)) {
// update-start--Author:zhangguoming Date:20140825 for：用户表字段变更后的查询字段修改
DetachedCriteria dc = cq.getDetachedCriteria();
DetachedCriteria dcDepart = dc.createCriteria("userOrgList");
dcDepart.add(Restrictions.eq("tsDepart.id", departid));
// 这种方式也是可以的
// DetachedCriteria dcDepart = dc.createAlias("userOrgList", "userOrg");
// dcDepart.add(Restrictions.eq("userOrg.tsDepart.id", departid));
// update-end--Author:zhangguoming Date:20140825 for：用户表字段变更后的查询字段修改
}
Short[] userstate = new Short[] { Globals.User_Normal, Globals.User_ADMIN };
cq.in("status", userstate);
@ -349,7 +348,6 @@ public class DepartController extends BaseController {
}
//----
// update-start--Author:zhangguoming Date:20140826 for：获取机构树；
/**
* 获取机构树-combotree
* @param request
@ -366,10 +364,7 @@ public class DepartController extends BaseController {
comboTrees = systemService.ComboTree(departsList, comboTreeModel, null, true);
return comboTrees;
}
// update-end--Author:zhangguoming Date:20140826 for：获取机构树；
// update-start--Author:zhangguoming Date:20140826 for：添加已有用户到组织机构；
/**
* 添加 用户到组织机构 的页面 跳转
* @param req request
@ -445,9 +440,7 @@ public class DepartController extends BaseController {
systemService.batchSave(userOrgList);
}
}
// update-end--Author:zhangguoming Date:20140826 for：添加已有用户到组织机构
// update-start--Author:zhangguoming Date:20140827 for：用户列表页面 组织机构查询条件：选择组织机构列表 相关操作
/**
* 用户选择机构列表跳转页面
*
@ -469,5 +462,5 @@ public class DepartController extends BaseController {
this.systemService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid);
}
// update-end--Author:zhangguoming Date:20140827 for：用户列表页面 组织机构查询条件：选择组织机构列表 相关操作
}

34
src/main/java/org/jeecgframework/web/system/controller/core/FunctionController.java
Unescape View File

@ -87,11 +87,7 @@ public class FunctionController extends BaseController {
*/
@RequestMapping(params = "operation")
public ModelAndView operation(HttpServletRequest request, String functionId) {
// ----------------------------------------------------------------
// ----------------------------------------------------------------
request.setAttribute("functionId", functionId);
// ----------------------------------------------------------------
// ----------------------------------------------------------------
return new ModelAndView("system/operation/operationList");
}
@ -103,11 +99,7 @@ public class FunctionController extends BaseController {
@RequestMapping(params = "dataRule")
public ModelAndView operationData(HttpServletRequest request,
String functionId) {
// ----------------------------------------------------------------
// ----------------------------------------------------------------
request.setAttribute("functionId", functionId);
// ----------------------------------------------------------------
// ----------------------------------------------------------------
return new ModelAndView("system/dataRule/ruleDataList");
}
@ -139,14 +131,10 @@ public class FunctionController extends BaseController {
public void opdategrid(HttpServletRequest request,
HttpServletResponse response, DataGrid dataGrid) {
CriteriaQuery cq = new CriteriaQuery(TSOperation.class, dataGrid);
// ----------------------------------------------------------------
// ----------------------------------------------------------------
String functionId = oConvertUtils.getString(request
.getParameter("functionId"));
cq.eq("TSFunction.id", functionId);
cq.add();
// ----------------------------------------------------------------
// ----------------------------------------------------------------
this.systemService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid);
}
@ -241,14 +229,10 @@ public class FunctionController extends BaseController {
@ResponseBody
public AjaxJson saveFunction(TSFunction function, HttpServletRequest request) {
AjaxJson j = new AjaxJson();
// ----------------------------------------------------------------
// ----------------------------------------------------------------
String functionOrder = function.getFunctionOrder();
if (StringUtils.isEmpty(functionOrder)) {
function.setFunctionOrder("0");
}
// ----------------------------------------------------------------
// ----------------------------------------------------------------
if (function.getTSFunction().getId().equals("")) {
function.setTSFunction(null);
} else {
@ -262,18 +246,12 @@ public class FunctionController extends BaseController {
userService.saveOrUpdate(function);
systemService.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO);
// update-end--Author:anchao Date:20140914 for：Jeecg bug 20140914 菜单更新级别后显示混乱
List<TSFunction> subFunction = systemService.findByProperty(TSFunction.class, "TSFunction.id", function.getId());
updateSubFunction(subFunction,function);
// update-end--Author:anchao Date:20140914 for：Jeecg bug 20140914 菜单更新级别后显示混乱
// ----------------------------------------------------------------
// ----------------------------------------------------------------
systemService.flushRoleFunciton(function.getId(), function);
// ----------------------------------------------------------------
// ----------------------------------------------------------------
} else {
if (function.getFunctionLevel().equals(Globals.Function_Leave_ONE)) {
List<TSFunction> functionList = systemService.findByProperty(
@ -341,7 +319,7 @@ public class FunctionController extends BaseController {
List<TSFunction> fuinctionlist = systemService
.getList(TSFunction.class);
req.setAttribute("flist", fuinctionlist);
// update-begin--Author:zhangguoming Date:20140509 for：添加云桌面图标管理
// List<TSIcon> iconlist = systemService.getList(TSIcon.class);
List<TSIcon> iconlist = systemService
.findByQueryString("from TSIcon where iconType != 3");
@ -349,7 +327,7 @@ public class FunctionController extends BaseController {
List<TSIcon> iconDeskList = systemService
.findByQueryString("from TSIcon where iconType = 3");
req.setAttribute("iconDeskList", iconDeskList);
// update-end--Author:zhangguoming Date:20140509 for：添加云桌面图标管理
if (functionid != null) {
function = systemService.getEntity(TSFunction.class, functionid);
req.setAttribute("function", function);
@ -406,9 +384,9 @@ public class FunctionController extends BaseController {
cq.addOrder("functionOrder", SortDirection.asc);
cq.add();
List<TSFunction> functionList = systemService.getListByCriteriaQuery(cq, false);
// update-start-Author:zhangguoming Date:20140914 for：菜单管理页面：菜单排序
Collections.sort(functionList, new NumberComparator());
// update-end-Author:zhangguoming Date:20140914 for：菜单管理页面：菜单排序
List<TreeGrid> treeGrids = new ArrayList<TreeGrid>();
TreeGridModel treeGridModel = new TreeGridModel();
treeGridModel.setIcon("TSIcon_iconPath");
@ -479,7 +457,6 @@ public class FunctionController extends BaseController {
return comboTrees;
}
// update-end--Author:gaofeng Date:20140619 for：修改云桌面的搜索功能中的系统中应用内搜索
/**
* 菜单模糊检索功能
*
@ -548,7 +525,6 @@ public class FunctionController extends BaseController {
return new ModelAndView("system/function/menuAppList");
}
// update-end--Author:gaofeng Date:20140619 for：修改云桌面的搜索功能中的系统中应用内搜索
/**
*

4
src/main/java/org/jeecgframework/web/system/controller/core/LogController.java
Unescape View File

@ -160,9 +160,9 @@ public class LogController extends BaseController {
Long count = systemService.getCountForJdbc("SELECT COUNT(1) FROM T_S_Log WHERE 1=1");
List lt = new ArrayList();
hc = new Highchart();
//update-begin--Author:JueYue Date:20140724 for：国际化--------------------
hc.setName(MutiLangUtil.getMutiLangInstance().getLang(USER_BROWSER_ANALYSIS));
//update-end--Author:JueYue Date:20140724 for：国际化--------------------
hc.setType(reportType);
Map<String, Object> map;
if (userBroswerList.size() > 0) {

56
src/main/java/org/jeecgframework/web/system/controller/core/LoginController.java
Unescape View File

@ -92,12 +92,11 @@ public class LoginController extends BaseController{
DataSourceContextHolder
.setDataSourceType(DataSourceType.dataSource_jeecg);
AjaxJson j = new AjaxJson();
// update-begin--Author:ken Date:20140629 for：添加语言选择
if (req.getParameter("langCode")!=null) {
req.getSession().setAttribute("lang", req.getParameter("langCode"));
}
// update-end--Author:ken Date:20140629 for：添加语言选择
// update-begin--Author:zhangguoming Date:20140226 for：添加验证码
String randCode = req.getParameter("randCode");
if (StringUtils.isEmpty(randCode)) {
j.setMsg(mutiLangService.getLang("common.enter.verifycode"));
@ -107,7 +106,7 @@ public class LoginController extends BaseController{
j.setMsg(mutiLangService.getLang("common.verifycode.error"));
j.setSuccess(false);
} else {
// update-end--Author:zhangguoming Date:20140226 for：添加验证码
int users = userService.getList(TSUser.class).size();
if (users == 0) {
@ -115,13 +114,13 @@ public class LoginController extends BaseController{
j.setSuccess(false);
} else {
TSUser u = userService.checkUserExits(user);
// update-begin--Author:zhangguoming Date:20140617 for：空指针bug
if(u == null) {
j.setMsg(mutiLangService.getLang("common.username.or.password.error"));
j.setSuccess(false);
return j;
}
// update-end--Author:zhangguoming Date:20140617 for：空指针bug
TSUser u2 = userService.getEntity(TSUser.class, u.getId());
if (u != null&&u2.getStatus()!=0) {
@ -129,7 +128,7 @@ public class LoginController extends BaseController{
if (true) {
// update-start-Author:zhangguoming Date:20140825 for：处理用户有多个组织机构的情况，以弹出框的形式让用户选择
Map<String, Object> attrMap = new HashMap<String, Object>();
j.setAttributes(attrMap);
@ -148,7 +147,7 @@ public class LoginController extends BaseController{
saveLoginSuccessInfo(req, u2, orgId);
}
// update-end-Author:zhangguoming Date:20140825 for：处理用户有多个组织机构的情况，以弹出框的形式让用户选择
} else {
j.setMsg(mutiLangService.getLang("common.check.shield"));
j.setSuccess(false);
@ -158,13 +157,12 @@ public class LoginController extends BaseController{
j.setSuccess(false);
}
}
// update-begin--Author:zhangguoming Date:20140226 for：添加验证码
}
// update-end--Author:zhangguoming Date:20140226 for：添加验证码
return j;
}
// update-start-Author:zhangguoming Date:20140825 for：记录用户登录的相关信息
/**
* 保存用户登录的信息，并将当前登录用户的组织机构赋值到用户实体中；
* @param req request
@ -187,7 +185,7 @@ public class LoginController extends BaseController{
// 添加登陆日志
systemService.addLog(message, Globals.Log_Type_LOGIN, Globals.Log_Leavel_INFO);
}
// update-end-Author:zhangguoming Date:20140825 for：记录用户登录的相关信息
/**
* 用户登录
@ -211,9 +209,9 @@ public class LoginController extends BaseController{
}
modelMap.put("roleName", roles);
modelMap.put("userName", user.getUserName());
// update-start-Author:zhangguoming Date:20140914 for：获取当前登录用户的组织机构
modelMap.put("currentOrgName", ClientManager.getInstance().getClient().getUser().getCurrentDepart().getDepartname());
// update-end-Author:zhangguoming Date:20140914 for：获取当前登录用户的组织机构
request.getSession().setAttribute("CKFinder_UserRole", "admin");
//request.getSession().setAttribute("lang", "en");
@ -239,12 +237,11 @@ public class LoginController extends BaseController{
return "main/shortcut_main";
}
// update-start--Author:gaofeng Date:2014-01-24 for:新增首页风格按钮选项
if (StringUtils.isNotEmpty(indexStyle)
&& indexStyle.equalsIgnoreCase("sliding")) {
return "main/sliding_main";
}
// update-start--Author:gaofeng Date:2014-01-24 for:新增首页风格按钮选项
return "main/main";
} else {
@ -308,12 +305,12 @@ public class LoginController extends BaseController{
if (loginActionlist.size() > 0) {
Collection<TSFunction> allFunctions = loginActionlist.values();
for (TSFunction function : allFunctions) {
//update-begin--Author:anchao Date:20140913 for：菜单过滤--------------------
if(function.getFunctionType().intValue()==Globals.Function_TYPE_FROM.intValue()){
//如果为表单或者弹出 不显示在系统菜单里面
continue;
}
//update-end--Author:anchao Date:20140913 for：菜单过滤--------------------
if (!functionMap.containsKey(function.getFunctionLevel() + 0)) {
functionMap.put(function.getFunctionLevel() + 0,
new ArrayList<TSFunction>());
@ -338,31 +335,30 @@ public class LoginController extends BaseController{
private Map<String, TSFunction> getUserFunction(TSUser user) {
HttpSession session = ContextHolderUtils.getSession();
Client client = ClientManager.getInstance().getClient(session.getId());
//update-start--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题
if (client.getFunctions() == null || client.getFunctions().size() == 0) {
//update-end--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题
Map<String, TSFunction> loginActionlist = new HashMap<String, TSFunction>();
List<TSRoleUser> rUsers = systemService.findByProperty(TSRoleUser.class, "TSUser.id", user.getId());
// update-begin--Author:zhangguoming Date:20140821 for：重构方法体，并加载用户组织机构下角色所拥有的权限
for (TSRoleUser ru : rUsers) {
TSRole role = ru.getTSRole();
assembleFunctionsByRole(loginActionlist, role);
}
// update-start-Author:zhangguoming Date:20140825 for：获取当前登录用户的组织机构主键
String orgId = client.getUser().getCurrentDepart().getId();
// update-end-Author:zhangguoming Date:20140825 for：获取当前登录用户的组织机构主键
List<TSRoleOrg> orgRoleList = systemService.findByProperty(TSRoleOrg.class, "tsDepart.id", orgId);
for (TSRoleOrg roleOrg : orgRoleList) {
TSRole role = roleOrg.getTsRole();
assembleFunctionsByRole(loginActionlist, role);
}
// update-end--Author:zhangguoming Date:20140821 for：重构方法体，并加载用户组织机构下角色所拥有的权限
client.setFunctions(loginActionlist);
}
return client.getFunctions();
}
// update-begin--Author:zhangguoming Date:20140821 for：抽取方法，获取角色下的权限列表
/**
* 根据 角色实体 组装 用户权限列表
* @param loginActionlist 登录用户的权限列表
@ -372,16 +368,16 @@ public class LoginController extends BaseController{
List<TSRoleFunction> roleFunctionList = systemService.findByProperty(TSRoleFunction.class, "TSRole.id", role.getId());
for (TSRoleFunction roleFunction : roleFunctionList) {
TSFunction function = roleFunction.getTSFunction();
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
if(function.getFunctionType().intValue()==Globals.Function_TYPE_FROM.intValue()){
//如果为表单或者弹出 不显示在系统菜单里面
continue;
}
//update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
loginActionlist.put(function.getId(), function);
}
}
// update-end--Author:zhangguoming Date:20140821 for：抽取方法，获取角色下的权限列表
/**
* 首页跳转
@ -463,11 +459,11 @@ public class LoginController extends BaseController{
public String getPrimaryMenu() {
List<TSFunction> primaryMenu = getFunctionMap(ResourceUtil.getSessionUserName()).get(0);
String floor = "";
// update-start--Author:zhangguoming Date:20140923 for：用户没有任何权限，首页没有退出按钮的bug
if (primaryMenu == null) {
return floor;
}
// update-end--Author:zhangguoming Date:20140923 for：用户没有任何权限，首页没有退出按钮的bug
for (TSFunction function : primaryMenu) {
if(function.getFunctionLevel() == 0) {

30
src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java
Unescape View File

@ -108,9 +108,9 @@ public class RoleController extends BaseController {
if (count == 0) {
// 删除角色之前先删除角色权限关系
delRoleFunction(role);
// update-start--Author:zhangguoming Date:20140825 for：添加业务逻辑
systemService.executeSql("delete from t_s_role_org where role_id=?", role.getId()); // 删除 角色-机构 关系信息
// update-end--Author:zhangguoming Date:20140825 for：添加业务逻辑
role = systemService.getEntity(TSRole.class, role.getId());
userService.delete(role);
message = "角色: " + role.getRoleName() + "被删除成功";
@ -202,7 +202,7 @@ public class RoleController extends BaseController {
request.setAttribute("roleId", roleId);
return new ModelAndView("system/role/roleSet");
}
// update-start--Author:gaofeng Date:20140822 for：查看角色的所有用户信息
/**
* 角色所有用户信息列表页面跳转
@ -211,9 +211,9 @@ public class RoleController extends BaseController {
*/
@RequestMapping(params = "userList")
public ModelAndView userList(HttpServletRequest request) {
// update-start--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错
request.setAttribute("roleId", request.getParameter("roleId"));
// update-end--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错
return new ModelAndView("system/role/roleUserList");
}
@ -226,7 +226,7 @@ public class RoleController extends BaseController {
@RequestMapping(params = "roleUserDatagrid")
public void roleUserDatagrid(TSUser user,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
CriteriaQuery cq = new CriteriaQuery(TSUser.class, dataGrid);
// update-start--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错
//查询条件组装器
String roleId = request.getParameter("roleId");
List<TSRoleUser> roleUser = systemService.findByProperty(TSRoleUser.class, "TSRole.id", roleId);
@ -239,7 +239,7 @@ public class RoleController extends BaseController {
cq.add(Property.forName("id").in(subCq.getDetachedCriteria()));
cq.add();
*/
// update-end--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错
Criterion cc = null;
if (roleUser.size() > 0) {
for(int i = 0; i < roleUser.size(); i++){
@ -287,8 +287,7 @@ public class RoleController extends BaseController {
comboTrees = systemService.ComboTree(loginActionlist,comboTreeModel,loginActionlist, false);
return comboTrees;
}
// update-end--Author:gaofeng Date:20140822 for：查看角色的所有用户信息
// update-start--Author:zhangguoming Date:20140821 for：为组织机构设置角色
/**
* 角色树列表页面跳转
*
@ -368,7 +367,6 @@ public class RoleController extends BaseController {
return j;
}
// update-end--Author:zhangguoming Date:20140821 for：为组织机构设置角色
/**
* 设置权限
@ -639,9 +637,9 @@ public class RoleController extends BaseController {
String functionId, String roleId) {
CriteriaQuery cq = new CriteriaQuery(TSOperation.class);
cq.eq("TSFunction.id", functionId);
//update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
cq.eq("status", Short.valueOf("0"));
//update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）--------------------
cq.add();
List<TSOperation> operationList = this.systemService
.getListByCriteriaQuery(cq, false);
@ -665,7 +663,7 @@ public class RoleController extends BaseController {
AjaxJson j = new AjaxJson();
String roleId = request.getParameter("roleId");
String functionId = request.getParameter("functionId");
// update-begin--Author:chenxu Date:201403024 for：410
String operationcodes = null;
try {
operationcodes = URLDecoder.decode(
@ -673,7 +671,7 @@ public class RoleController extends BaseController {
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
// update-end--Author:chenxu Date:20140324 for：410
CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class);
cq1.eq("TSRole.id", roleId);
cq1.eq("TSFunction.id", functionId);
@ -728,7 +726,7 @@ public class RoleController extends BaseController {
AjaxJson j = new AjaxJson();
String roleId = request.getParameter("roleId");
String functionId = request.getParameter("functionId");
// update-begin--Author:chenxu Date:201403024 for：410
String dataRulecodes = null;
try {
dataRulecodes = URLDecoder.decode(
@ -736,7 +734,7 @@ public class RoleController extends BaseController {
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
// update-end--Author:chenxu Date:20140324 for：410
CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class);
cq1.eq("TSRole.id", roleId);
cq1.eq("TSFunction.id", functionId);

4
src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java
Unescape View File

@ -596,13 +596,9 @@ public class SystemController extends BaseController {
if (StringUtil.isNotEmpty(comboTree.getId())) {
cq.eq("TSPDepart.id", comboTree.getId());
}
// ----------------------------------------------------------------
// ----------------------------------------------------------------
if (StringUtil.isEmpty(comboTree.getId())) {
cq.isNull("TSPDepart.id");
}
// ----------------------------------------------------------------
// ----------------------------------------------------------------
cq.add();
List<TSDepart> departsList = systemService.getListByCriteriaQuery(cq, false);
List<ComboTree> comboTrees = new ArrayList<ComboTree>();

29
src/main/java/org/jeecgframework/web/system/controller/core/UserController.java
Unescape View File

@ -338,7 +338,6 @@ public class UserController extends BaseController {
Short[] userstate = new Short[]{Globals.User_Normal, Globals.User_ADMIN, Globals.User_Forbidden};
cq.in("status", userstate);
// update-start--Author:zhangguoming Date:20140827 for：添加 组织机构 查询条件
String orgIds = request.getParameter("orgIds");
List<String> orgIdList = extractIdListByComma(orgIds);
// 获取 当前组织机构的用户信息
@ -350,11 +349,11 @@ public class UserController extends BaseController {
cq.add(Property.forName("id").in(subCq.getDetachedCriteria()));
}
// update-end--Author:zhangguoming Date:20140827 for：添加 组织机构 查询条件
cq.add();
this.systemService.getDataGridReturn(cq, true);
// update-start--Author:gaofeng Date:20140822 for：添加用户的角色展示
List<TSUser> cfeList = new ArrayList<TSUser>();
for (Object o : dataGrid.getResults()) {
if (o instanceof TSUser) {
@ -373,7 +372,7 @@ public class UserController extends BaseController {
cfeList.add(cfe);
}
}
// update-end--Author:gaofeng Date:20140822 for：添加用户的角色展示
TagUtil.datagrid(response, dataGrid);
}
@ -399,9 +398,9 @@ public class UserController extends BaseController {
if (roleUser.size()>0) {
// 删除用户时先删除用户和角色关系表
delRoleUser(user);
// update-start--Author:zhangguoming Date:20140825 for：添加业务逻辑
systemService.executeSql("delete from t_s_user_org where user_id=?", user.getId()); // 删除 用户-机构 数据
// update-end--Author:zhangguoming Date:20140825 for：添加业务逻辑
userService.delete(user);
message = "用户：" + user.getUserName() + "删除成功";
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
@ -467,11 +466,11 @@ public class UserController extends BaseController {
users.setEmail(user.getEmail());
users.setOfficePhone(user.getOfficePhone());
users.setMobilePhone(user.getMobilePhone());
// update-start--Author:zhangguoming Date:20140825 for：添加新的业务逻辑
systemService.executeSql("delete from t_s_user_org where user_id=?", user.getId());
saveUserOrgList(req, user);
// users.setTSDepart(user.getTSDepart());
// update-end--Author:zhangguoming Date:20140825 for：添加新的业务逻辑
users.setRealName(user.getRealName());
users.setStatus(Globals.User_Normal);
users.setActivitiSync(user.getActivitiSync());
@ -509,7 +508,6 @@ public class UserController extends BaseController {
return j;
}
// update-start--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法
/**
* 保存 用户-组织机构 关系信息
* @param request request
@ -534,7 +532,7 @@ public class UserController extends BaseController {
systemService.batchSave(userOrgList);
}
}
// update-end--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法
protected void saveRoleUser(TSUser user, String roleidstr) {
String[] roleids = roleidstr.split(",");
@ -590,7 +588,7 @@ public class UserController extends BaseController {
departList.addAll((List)systemService.getList(TSDepart.class));
}
req.setAttribute("departList", departList);
// update-start--Author:zhangguoming Date:20140825 for：往request作用域中添加数据：组装页面中组织机构combobox多选框的数据
List<String> orgIdList = new ArrayList<String>();
if (StringUtil.isNotEmpty(user.getId())) {
user = systemService.getEntity(TSUser.class, user.getId());
@ -601,12 +599,11 @@ public class UserController extends BaseController {
orgIdList = systemService.findHql("select d.id from TSDepart d,TSUserOrg uo where d.id=uo.tsDepart.id and uo.tsUser.id=?", new String[]{user.getId()});
}
req.setAttribute("orgIdList", JSON.toJSON(orgIdList));
// update-start--Author:zhangguoming Date:20140825 for：往request作用域中添加数据：组装页面中组织机构combobox多选框的数据
return new ModelAndView("system/user/user");
}
// update-start--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法
/**
* 用户的登录后的组织机构选择页面
* @param request request
@ -628,7 +625,7 @@ public class UserController extends BaseController {
return new ModelAndView("system/user/userOrgSelect");
}
// update-end--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法
public void idandname(HttpServletRequest req, TSUser user) {
List<TSRoleUser> roleUsers = systemService.findByProperty(TSRoleUser.class, "TSUser.id", user.getId());
@ -897,9 +894,9 @@ public class UserController extends BaseController {
j.setSuccess(Boolean.TRUE);
j.setMsg("样式修改成功，请刷新页面");
}
//update-start--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题
ClientManager.getInstance().getClient().getFunctions().clear();
//update-end--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题
}else{
j.setMsg("请登录后再操作");
}

7
src/main/java/org/jeecgframework/web/system/pojo/base/TSBaseUser.java
Unescape View File

@ -24,11 +24,11 @@ public class TSBaseUser extends IdEntity implements java.io.Serializable {
private Short activitiSync;//是否同步工作流引擎
private Short status;// 状态1：在线,2：离线,0：禁用
private byte[] signature;// 签名文件
// update-start--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性
// private TSDepart TSDepart = new TSDepart();// 部门
private List<TSUserOrg> userOrgList = new ArrayList<TSUserOrg>();
private TSDepart currentDepart = new TSDepart();// 当前部门
// update-end--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性
@Column(name = "signature",length=3000)
public byte[] getSignature() {
@ -108,7 +108,6 @@ public class TSBaseUser extends IdEntity implements java.io.Serializable {
this.realName = realName;
}
// update-start--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性
@Transient
public TSDepart getCurrentDepart() {
return currentDepart;
@ -127,5 +126,5 @@ public class TSBaseUser extends IdEntity implements java.io.Serializable {
public void setUserOrgList(List<TSUserOrg> userOrgList) {
this.userOrgList = userOrgList;
}
// update-end--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性
}

4
src/main/java/org/jeecgframework/web/system/pojo/base/TSFunction.java
Unescape View File

@ -29,7 +29,7 @@ public class TSFunction extends IdEntity implements java.io.Serializable {
private String functionOrder;//菜单排序
private Short functionType;//菜单类型
private TSIcon TSIcon = new TSIcon();//菜单图标
// update-begin--Author:zhangguoming Date:20140509 for：添加云桌面图标实体
private TSIcon TSIconDesk;//云桌面菜单图标
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "desk_iconid")
@ -39,7 +39,7 @@ public class TSFunction extends IdEntity implements java.io.Serializable {
public void setTSIconDesk(TSIcon TSIconDesk) {
this.TSIconDesk = TSIconDesk;
}
// update-end--Author:zhangguoming Date:20140509 for：添加云桌面图标实体
private List<TSFunction> TSFunctions = new ArrayList<TSFunction>();
@ManyToOne(fetch = FetchType.LAZY)

2
src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java
Unescape View File

@ -89,7 +89,7 @@ public class TSOperation extends IdEntity implements java.io.Serializable {
TSFunction = tSFunction;
}
@Override
public boolean equals(Object obj) {
if(this == obj)
return false;

2
src/main/java/org/jeecgframework/web/system/service/impl/CategoryServiceImpl.java
Unescape View File

@ -15,7 +15,7 @@ public class CategoryServiceImpl extends CommonServiceImpl implements
private static final String MAX_SQL = "SELECT MAX(code) FROM t_s_category WHERE parent_id";
@Override
public void saveCategory(TSCategoryEntity category) {
category.setCode(getCategoryCoade(category));
this.save(category);

12
src/main/java/org/jeecgframework/web/system/service/impl/RepairServiceImpl.java
Unescape View File

@ -213,9 +213,9 @@ public class RepairServiceImpl extends CommonServiceImpl implements
private void repairJdbcEntity(){
JeecgJdbcEntity entity = new JeecgJdbcEntity();
entity.setAge(12);
// update-begin--Author:yangyong Date:20140214 for：[bugfree号]当前时间获取调整--------------------
entity.setBirthday(DateUtils.str2Date("2014-02-14",new SimpleDateFormat("yyyy-MM-dd")));
// update-end--Author:yangyong Date:20140214 for：[bugfree号]当前时间获取调整--------------------
entity.setDepId("123");
entity.setEmail("demo@jeecg.com");
entity.setMobilePhone("13111111111");
@ -3110,10 +3110,8 @@ public class RepairServiceImpl extends CommonServiceImpl implements
*/
private void repairDemo() {
TSDemo demo = new TSDemo();
// -------------------------------------------------
// 复杂字符串文本读取，采用文件方式存储
String html = new FreemarkerHelper().parseTemplate("/org/jeecgframework/web/system/txt/valid-code-demo.ftl", null);
// -------------------------------------------------
demo.setDemocode(html);
demo.setDemotitle("表单验证");
commonDao.saveOrUpdate(demo);
@ -3130,7 +3128,6 @@ public class RepairServiceImpl extends CommonServiceImpl implements
TSDepart RAndD = commonDao.findByProperty(TSDepart.class, "departname",
"研发室").get(0);
// update-start--Author:zhangguoming Date:20140825 for：用户表字段修改后，用户与部门的关系为多对多，这里修改初始化数据
TSUser admin = new TSUser();
admin.setSignatureFile("images/renfang/qm/licf.gif");
admin.setStatus((short) 1);
@ -3186,7 +3183,7 @@ public class RepairServiceImpl extends CommonServiceImpl implements
approverUserOrg.setTsUser(approver);
approverUserOrg.setTsDepart(eiu);
commonDao.save(approverUserOrg);
// update-end--Author:zhangguoming Date:20140825 for：用户表字段修改后，用户与部门的关系为多对多，这里修改初始化数据
}
/**
@ -3733,7 +3730,6 @@ public class RepairServiceImpl extends CommonServiceImpl implements
commonDao.saveOrUpdate(folder);
}
// update-begin--Author:zhangguoming Date:20140522 for：云桌面默认图标初始化
/**
* 修复桌面默认图标
* @param iconName 图标名称
@ -3752,7 +3748,7 @@ public class RepairServiceImpl extends CommonServiceImpl implements
return deskIncon;
}
// update-end--Author:zhangguoming Date:20140522 for：云桌面默认图标初始化
/**
* @Description 修复菜单权限

10
src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java
Unescape View File

@ -134,9 +134,6 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
}
}
// ----------------------------------------------------------------
// ----------------------------------------------------------------
/**
* 根据角色ID 和 菜单Id 获取 具有操作权限的按钮Codes
* @param roleId
@ -192,9 +189,6 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
return operationCodes;
}
// ----------------------------------------------------------------
// ----------------------------------------------------------------
public void flushRoleFunciton(String id, TSFunction newFunction) {
TSFunction functionEntity = this.getEntity(TSFunction.class, id);
if (functionEntity.getTSIcon() == null || !StringUtil.isNotEmpty(functionEntity.getTSIcon().getId())) {
@ -214,12 +208,12 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
}
public String generateOrgCode(String id, String pid) {
// update-start--Author:zhangguoming Date:20140901 for：修改编码长度的定义
int orgCodeLength = 2; // 默认编码长度
if ("3".equals(ResourceUtil.getOrgCodeLengthType())) { // 类型2-编码长度为3，如001
orgCodeLength = 3;
}
// update-end--Author:zhangguoming Date:20140901 for：修改编码长度的定义
String newOrgCode = "";
if(!StringUtils.hasText(pid)) { // 第一级编码

4
src/main/java/org/jeecgframework/web/system/servlet/RandCodeImageServlet.java
Unescape View File

@ -48,7 +48,7 @@ public class RandCodeImageServlet extends HttpServlet {
*/
private static final int lineWidth = 2;
@Override
public void doGet(final HttpServletRequest request,
final HttpServletResponse response) throws ServletException,
IOException {
@ -107,7 +107,7 @@ public class RandCodeImageServlet extends HttpServlet {
ImageIO.write(image, "JPEG", response.getOutputStream());
}
@Override
public void doPost(final HttpServletRequest request,
final HttpServletResponse response) throws ServletException,
IOException {

BIN
src/main/webapp/WEB-INF/lib/CKFinder-updateByAlexander-2.4.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/CKFinderPlugin-FileEditor-2.4.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/CKFinderPlugin-ImageResize-2.4.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/CKFinderPlugin-Watermark-2.4.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/activation-1.1.1.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/ant-1.6.5.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/antlr-2.7.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/antlr-3.3.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/antlr-runtime-3.3.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/aopalliance-1.0.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/asm-all-4.1.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/aspectjrt-1.6.9.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/aspectjweaver-1.6.9.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.1.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/avalon-framework-impl-4.3.1.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/avalon-logkit-2.1.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-all-1.6.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-anim-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-awt-util-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-bridge-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-css-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-dom-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-ext-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-gvt-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-js-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-parser-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-script-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-svg-dom-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-svggen-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-transcoder-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-util-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/batik-xml-1.7.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/cglib-nodep-2.2.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/classmate-0.5.4.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/codegenerate-3.4.6.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/com.springsource.org.junit-4.9.0.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/commons-beanutils-1.7.0.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/commons-chain-1.2.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/commons-codec-1.3.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/commons-dbcp-1.4.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/commons-digester-2.0.jar
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save