Former-commit-id: 83928d98ec238674e8dbb3641b93bde726201751
master
wangbing 5 years ago
parent 3e09f9f77b
commit 3a1a6606e4

@ -7,6 +7,8 @@ import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import freemarker.template.TemplateExceptionHandler;
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModelException;
import org.springframework.util.ClassUtils;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
@ -15,6 +17,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.List;
public class FreeMarkerManager {
private FreeMarkerConfigurer freeMarkerConfigurer;
@ -26,6 +29,7 @@ public class FreeMarkerManager {
cfg.setDefaultEncoding("UTF-8");
cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
cfg.setNumberFormat("0.##");
cfg.setSharedVariable("print", new Print());
MultiTemplateLoader multiTemplateLoader = new MultiTemplateLoader(new TemplateLoader[]{
new ClassTemplateLoader(ClassUtils.getDefaultClassLoader(), "/modules"),
@ -59,4 +63,18 @@ public class FreeMarkerManager {
e.printStackTrace();
}
}
private class Print implements TemplateMethodModelEx {
@Override
public Object exec(List list) throws TemplateModelException {
if (list.size() == 1) {
return list.get(0);
} else if (list.size() > 1) {
return String.join(",", list);
}
return "";
}
}
}

@ -376,10 +376,6 @@ public class SpringBootCallable implements Callable {
ctx.put("author", md.getProjectAuthor());
ctx.put("date", new Date());
if (md.getModuleName().equals("api")) {
freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ApiExampleRequest" + ".java"), "SpringBoot/java/module/req/ApiExampleRequest.java", ctx);
}
for (Table table : md.getTables()) {
ctx.put("table", table);

@ -510,6 +510,10 @@ public class Tool {
return false;
}
public static String out(String out) {
return out;
}
/**
*
*

@ -31,57 +31,6 @@
<result column="LAST_UPDATE_TIME" jdbcType="TIMESTAMP" property="lastUpdateTime"/>
</resultMap>
<select id="find" resultMap="res">
SELECT
<include refid="entityColumnList"/>
FROM
<include refid="table"/>
WHERE
`IS_DELETED` = 0
<if test="request.resCode != null and request.resCode != ''">
AND `RES_CODE` = ${r'#'}{request.resCode}
</if>
<if test="request.resName != null and request.resName != ''">
AND `RES_NAME` = ${r'#'}{request.resName}
</if>
<if test="request.resType != null and request.resType != ''">
AND `RES_TYPE` = ${r'#'}{request.resType}
</if>
<if test="request.resValue != null and request.resValue != ''">
AND `RES_VALUE` = ${r'#'}{request.resValue}
</if>
<if test="request.supCode != null and request.supCode != ''">
AND `SUP_CODE` = ${r'#'}{request.supCode}
</if>
<if test="request.supName != null and request.supName != ''">
AND `SUP_NAME` = ${r'#'}{request.supName}
</if>
<if test="request.free != null">
AND `FREE` = ${r'#'}{request.free}
</if>
<if test="request.valid != null">
AND `VALID` = ${r'#'}{request.valid}
</if>
<if test="request.userId != null">
AND `ID` IN (
SELECT
t2.RES_ID
FROM
`sys_user_role` t1,
`sys_role_res` t2
WHERE t1.ROLE_ID = t2.ROLE_ID
AND t1.IS_DELETED = '0'
AND t2.IS_DELETED = '0'
AND t1.USER_ID = ${r'#'}{request.userId}
)
</if>
<if test="request.roleCode != null">
AND `ID` IN (
SELECT RES_ID FROM `sys_role_res` WHERE ROLE_CODE = ${r'#'}{request.roleCode}
)
</if>
</select>
<select id="find" resultMap="res">
SELECT
<include refid="entityColumnList"/>
@ -133,11 +82,19 @@
AND t1.IS_DELETED = '0'
AND t2.IS_DELETED = '0'
AND t1.USER_ID = ${r'#'}{request.userId}
UNION
SELECT `ID` FROM `sys_res` WHERE `IS_DELETED` = '0' AND `FREE` = '1'
)
</if>
<if test="request.roleId != null">
AND `ID` IN (
SELECT RES_ID FROM `sys_role_res` WHERE ROLE_ID = ${r'#'}{request.roleId}
SELECT `RES_ID` FROM `sys_role_res` WHERE ROLE_ID = ${r'#'}{request.roleId}
UNION
SELECT `ID` FROM `sys_res` WHERE `IS_DELETED` = '0' AND `FREE` = '1'
)
</if>
</select>

@ -70,20 +70,25 @@
"IS_DELETED" = 0
<if test="request.userId != null">
AND "ID" IN (
SELECT
t2.RES_ID
FROM
"SYS_USER_ROLE" t1,
"SYS_ROLE_RES" t2
SELECT t2.RES_ID
FROM "SYS_USER_ROLE" t1, "SYS_ROLE_RES" t2
WHERE t1.ROLE_ID = t2.ROLE_ID
AND t1.IS_DELETED = '0'
AND t2.IS_DELETED = '0'
AND t1.USER_ID = ${r'#'}{request.userId}
AND t1.USER_ID = ${r"#"}{request.userId}
UNION
SELECT "ID" FROM "SYS_RES" WHERE IS_DELETED = '0' AND "FREE" = '1'
)
</if>
<if test="request.roleId != null">
AND "ID" IN (
SELECT RES_ID FROM "SYS_ROLE_RES" WHERE ROLE_ID = ${r'#'}{request.roleId}
SELECT RES_ID FROM "SYS_ROLE_RES" WHERE ROLE_ID = ${r"#"}{request.roleId}
UNION
SELECT "ID" FROM "SYS_RES" WHERE IS_DELETED = '0' AND "FREE" = '1'
)
</if>
</select>

@ -1,7 +1,7 @@
package xyz.wbsite.module.system.rsp;
package ${basePackage}.module.system.rsp;
import xyz.wbsite.frame.base.BaseFindResponse;
import xyz.wbsite.module.system.ent.Res;
import ${basePackage}.frame.base.BaseFindResponse;
import ${basePackage}.module.system.ent.Res;
/**
* ResLoadResponse -

@ -21,6 +21,7 @@
text-color="#d6d6d6"
active-text-color="#ffd04b">
<#if sysMD>
${print('<#if token.hasRes("DEV")>')}
<el-submenu index="${tool.uuid()}" >
<template slot="title">
<i class="el-icon-help"></i>
@ -30,6 +31,8 @@
<el-menu-item index="${tool.uuid()}" @click="addTab({title: '错误日志', name: 'LOG_ERR', url: '${r'${context}'}/system/logErr.htm'})">错误日志</el-menu-item>
<el-menu-item index="${tool.uuid()}" @click="addTab({title: '计划调度', name: 'schedule', url: '${r'${context}'}/system/schedule.htm'})">计划调度</el-menu-item>
</el-submenu>
${print('</#if>')}
${print('<#if token.hasRes("SYS")>')}
<el-submenu index="${tool.uuid()}" >
<template slot="title">
<i class="el-icon-setting"></i>
@ -42,9 +45,11 @@
<el-menu-item index="${tool.uuid()}" @click="addTab({title: '文件管理', name: 'file', url: '${r'${context}'}/system/file.htm'})">文件管理</el-menu-item>
<el-menu-item index="${tool.uuid()}" @click="addTab({title: '登录管理', name: 'tokens', url: '${r'${context}'}/system/tokens.htm'})">登录管理</el-menu-item>
</el-submenu>
${print('</#if>')}
</#if>
<#list modules as item>
<#if item.hasHtml()>
${print('<#if token.hasRes("WEB_')}${item.moduleName?upper_case}${print('")>')}
<el-submenu index="${tool.uuid()}">
<template slot="title">
<i class="el-icon-document-copy"></i>
@ -56,6 +61,7 @@
</#if>
</#list>
</el-submenu>
${print('</#if>')}
</#if>
</#list>
</el-menu>

Loading…
Cancel
Save

Powered by TurnKey Linux.