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

online 表单激活模板不生效

Browse Source
jeecg_3.6.5
zhangdaiscott 8 years ago
parent 6d23951b3c
commit aaddccdb7b
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File

43
src/main/java/org/jeecgframework/web/cgform/controller/cgformftl/CgformFtlController.java
Unescape View File

@ -8,16 +8,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.jeecgframework.web.cgform.common.OfficeHtmlUtil;
import org.jeecgframework.web.cgform.entity.cgformftl.CgformFtlEntity;
import org.jeecgframework.web.cgform.service.cgformftl.CgformFtlServiceI;
import org.jeecgframework.web.cgform.service.config.CgFormFieldServiceI;
import org.jeecgframework.web.cgform.util.TemplateUtil;
import org.jeecgframework.web.system.service.SystemService;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.jeecgframework.core.common.controller.BaseController;
@ -36,8 +28,14 @@ import org.jeecgframework.core.util.ResourceUtil;
import org.jeecgframework.core.util.StringUtil;
import org.jeecgframework.core.util.oConvertUtils;
import org.jeecgframework.tag.core.easyui.TagUtil;
import org.jeecgframework.web.cgform.common.OfficeHtmlUtil;
import org.jeecgframework.web.cgform.engine.TempletContext;
import org.jeecgframework.web.cgform.entity.cgformftl.CgformFtlEntity;
import org.jeecgframework.web.cgform.entity.config.CgFormHeadEntity;
import org.jeecgframework.web.cgform.service.cgformftl.CgformFtlServiceI;
import org.jeecgframework.web.cgform.util.TemplateUtil;
import org.jeecgframework.web.system.service.SystemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.RequestMapping;
@ -70,7 +68,7 @@ public class CgformFtlController extends BaseController {
@Autowired
private SystemService systemService;
@Autowired
private CgFormFieldServiceI cgFormFieldService;
private TempletContext templetContext;
/**
@ -191,14 +189,18 @@ public class CgformFtlController extends BaseController {
AjaxJson j = new AjaxJson();
try {
// 判断有没有激活过的模板
cgformFtl = systemService.getEntity(CgformFtlEntity.class,
cgformFtl.getId());
cgformFtl = systemService.getEntity(CgformFtlEntity.class,cgformFtl.getId());
if (!cgformFtlService.hasActive(cgformFtl.getCgformId())) {
cgformFtl.setFtlStatus("1");
cgformFtlService.saveOrUpdate(cgformFtl);
message = "激活成功";
systemService.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO);
//update-begin----date:20160721------for:清除缓存---------------------------------------------
CgFormHeadEntity po = systemService.getEntity(CgFormHeadEntity.class, cgformFtl.getCgformId());
templetContext.removeTemplateFromCache(po.getTableName()+"_"+TemplateUtil.TemplateType.ADD.getName());
templetContext.removeTemplateFromCache(po.getTableName()+"_"+TemplateUtil.TemplateType.DETAIL.getName());
templetContext.removeTemplateFromCache(po.getTableName()+"_"+TemplateUtil.TemplateType.UPDATE.getName());
//update-end----date:20160721------for:清除缓存----------------------------------------------
systemService.addLog(message, Globals.Log_Type_UPDATE,Globals.Log_Leavel_INFO);
j.setSuccess(true);
j.setMsg(message);
} else {
@ -227,8 +229,13 @@ public class CgformFtlController extends BaseController {
String message = null;
AjaxJson j = new AjaxJson();
try {
cgformFtl = systemService.getEntity(CgformFtlEntity.class,
cgformFtl.getId());
cgformFtl = systemService.getEntity(CgformFtlEntity.class,cgformFtl.getId());
//update-begin----date:20160721------for:清除缓存----------------------------------------------
CgFormHeadEntity po = systemService.getEntity(CgFormHeadEntity.class, cgformFtl.getCgformId());
templetContext.removeTemplateFromCache(po.getTableName()+"_"+TemplateUtil.TemplateType.ADD.getName());
templetContext.removeTemplateFromCache(po.getTableName()+"_"+TemplateUtil.TemplateType.DETAIL.getName());
templetContext.removeTemplateFromCache(po.getTableName()+"_"+TemplateUtil.TemplateType.UPDATE.getName());
//update-end----date:20160721------for:清除缓存-----------------------------------------------
cgformFtl.setFtlStatus("0");
cgformFtlService.saveOrUpdate(cgformFtl);
message = "取消激活成功";
@ -619,7 +626,7 @@ public class CgformFtlController extends BaseController {
// System.out.println(json.getString("data"));
// // 判断有没有激活过的模板
// message = FormUtil.GetHtml(json.getString("parse"),json.getString("data"), action);
//update-begin--Author:jg_renjie Date:20150706 for：更改解析前台传来的html
if(StringUtils.isNotBlank(parseForm)){
TemplateUtil tool = new TemplateUtil();
Map<String,Object> map = tool.processor(parseForm);
@ -627,7 +634,7 @@ public class CgformFtlController extends BaseController {
} else {
j.setMsg("");
}
//update-end--Author:jg_renjie Date:20150706 for：更改解析前台传来的html
j.setSuccess(true);
} catch (Exception e) {
logger.info(e.getMessage());

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

@ -65,11 +65,11 @@ public class TempletContext {
return null;
}
String oldTableName = tableName;
// 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);
@ -112,6 +112,24 @@ public class TempletContext {
}
return template;
}
/**
* 从缓存中读取ftl模板
* @param template
* @param encoding
* @return
*/
public void removeTemplateFromCache(String tableName){
try {
//获取版本号
String version = cgFormFieldService.getCgFormVersionByTableName(tableName);
//cache的键：类名.方法名.参数名
String cacheKey = FreemarkerHelper.class.getName()+".getTemplateFormCache."+tableName+"."+version;
ehCache.remove(cacheKey);
} catch (Exception e) {
e.printStackTrace();
}
}
public Configuration getFreemarker() {
return freemarker;
@ -128,7 +146,7 @@ public class TempletContext {
public void setTags(Map<String, TemplateDirectiveModel> tags) {
this.tags = tags;
}
//update-begin--Author:张忠亮 Date:20151121 for：清除缓存
public void clearCache(){
try{
ehCache.removeAll();
@ -136,5 +154,5 @@ public class TempletContext {
}
}
//update-end--Author:张忠亮 Date:20151121 for：清除缓存
}

Write Preview
Loading…
Cancel
Save