manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JsonMapper、XmlMapper工具，增加 JsonView 过滤参数

Browse Source
This commit is contained in:
thinkgem
2020-05-20 23:16:26 +08:00
parent 4609d8aee7
commit 6b059e29dd
9 changed files with 131 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java
View File

@@ -31,10 +31,10 @@ public class AreaUtils {
* @return
*/
public static List<Area> getAreaAllList(){
List<Area> areaList = SysUtils.getCache(CACHE_AREA_ALL_LIST);
List<Area> areaList = SysCacheUtils.get(CACHE_AREA_ALL_LIST);
if (areaList == null){
areaList = Static.areaService.findList(new Area());
SysUtils.putCache(CACHE_AREA_ALL_LIST, areaList);
SysCacheUtils.put(CACHE_AREA_ALL_LIST, areaList);
}
return areaList;
}
@@ -43,7 +43,7 @@ public class AreaUtils {
* 清理区域缓存
*/
public static void clearCache(){
SysUtils.removeCache(CACHE_AREA_ALL_LIST);
SysCacheUtils.remove(CACHE_AREA_ALL_LIST);
}
}

8
modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java
View File

@@ -20,9 +20,9 @@ import com.jeesite.modules.sys.service.EmployeeService;
import com.jeesite.modules.sys.service.OfficeService;
/**
* 员工工具类
* 员工部门工具类
* @author ThinkGem
* @version 2016年11月2日
* @version 2020-5-20
*/
public class EmpUtils {
@@ -158,7 +158,7 @@ public class EmpUtils {
}
/**
* 获取当前员工所有机构编码，包括附属机构以及子机构（数据权限用）
* 获取当前员工所有机构编码，包括附属机构以及子机构（数据权限用）V4.2.0
* @author ThinkGem
*/
public static String[] getOfficeCodesAndChildren(){
@@ -295,7 +295,7 @@ public class EmpUtils {
}
/**
* 获取当前员工所有公司编码，包括子公司（数据权限用）
* 获取当前员工所有公司编码，包括子公司（数据权限用）V4.2.0
* @author ThinkGem
*/
public static String[] getCompanyCodesAndChildren(){

6
modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java
View File

@@ -32,7 +32,7 @@ import com.jeesite.common.lang.TimeUtils;
import com.jeesite.common.shiro.realm.LoginInfo;
import com.jeesite.common.shiro.session.SessionDAO;
import com.jeesite.common.web.BaseController;
import com.jeesite.modules.sys.utils.SysUtils;
import com.jeesite.modules.sys.utils.SysCacheUtils;
import com.jeesite.modules.sys.utils.UserUtils;
/**
@@ -145,7 +145,7 @@ public class OnlineController extends BaseController{
public String kickOut(String sessionId) {
Session session = sessionDAO.readSession(sessionId);
if (session != null){
Map<String, String> onlineTickOutMap = SysUtils.getCache("onlineTickOutMap");
Map<String, String> onlineTickOutMap = SysCacheUtils.get("onlineTickOutMap");
if (onlineTickOutMap == null){
onlineTickOutMap = MapUtils.newConcurrentMap();
}
@@ -157,7 +157,7 @@ public class OnlineController extends BaseController{
onlineTickOutMap.put(key, StringUtils.EMPTY);
}
}
SysUtils.putCache("onlineTickOutMap", onlineTickOutMap);
SysCacheUtils.put("onlineTickOutMap", onlineTickOutMap);
sessionDAO.delete(session);
return renderResult(Global.TRUE, text("踢出已成功！"));
}

8
modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
View File

@@ -165,7 +165,7 @@ public class ${ClassName}Controller extends BaseController {
<% } %>
/**
* 保存${functionNameSimple}
* 保存数据
*/
@RequiresPermissions("${permissionPrefix}:edit")
@PostMapping(value = "save")
@@ -177,7 +177,7 @@ public class ${ClassName}Controller extends BaseController {
<% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %>
/**
* 停用${functionNameSimple}
* 停用数据
*/
@RequiresPermissions("${permissionPrefix}:edit")
@RequestMapping(value = "disable")
@@ -198,7 +198,7 @@ public class ${ClassName}Controller extends BaseController {
}
/**
* 启用${functionNameSimple}
* 启用数据
*/
@RequiresPermissions("${permissionPrefix}:edit")
@RequestMapping(value = "enable")
@@ -212,7 +212,7 @@ public class ${ClassName}Controller extends BaseController {
<% if(toBoolean(table.optionMap['isHaveDelete'])){ %>
/**
* 删除${functionNameSimple}
* 删除数据
*/
@RequiresPermissions("${permissionPrefix}:edit")
@RequestMapping(value = "delete")