From a3d6c501b97301d71815abaf35237298b4ed4a4d Mon Sep 17 00:00:00 2001 From: 王彬 Date: Wed, 13 Jun 2018 19:56:25 +0800 Subject: [PATCH] 1.新提交 --- src/bazhuaerp.default.properties | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/com/taover/base/template/HtmlLayuiTemplate.ftl | 32 ++++---------------------------- src/com/taover/base/template/model/bussiness/ControllerModel.java | 6 +++--- src/com/taover/base/template/model/bussiness/ViewModel.java | 12 ++++++++++-- src/com/taover/business/GenerateVCSDP.java | 3 +-- src/com/taover/business/GenerateView.java | 11 ++++++----- 6 files changed, 68 insertions(+), 40 deletions(-) create mode 100644 src/bazhuaerp.default.properties diff --git a/src/bazhuaerp.default.properties b/src/bazhuaerp.default.properties new file mode 100644 index 0000000..ada10ce --- /dev/null +++ b/src/bazhuaerp.default.properties @@ -0,0 +1,44 @@ +#顶层po、dao文件生成总目录 +OutputPath=\\D:\\workproject\\bazhuaerp\\src\\main\\java\\com\\bazhuaerp\\db\\ +#OutputPath=\\C:\\workproject\\printer-taover-com\\src\\com\\taover\\printer\\db\\ +#数据库名 +SchameName=bazhuaerp +#SchameName=taoverprinter +CreateSchame=false +#TableName=erp_shop,erp_warehouse,erp_express_template,erp_goods_express,erp_order,erp_order_goods,erp_order_statistics,erp_orderstat_goods,erp_distribution,erp_delivery,erp_delivery_goods,erp_delivery_statistics,erp_deliverystat_goods +TableName=ALL +#数据库库连接信息 +User=tylife +Password=lexi365 +#Password=qwe123!@# +DBLikeStr=% +#数据库驱动类型 +driver=com.mysql.jdbc.Driver +#数据库连接url +URL=jdbc\:mysql\://127.0.0.1\:3306/bazhuaerp +#URL=jdbc\:mysql\://localhost\:3306/taoverprinter +#数据库类型 +dbtype=mysql +#数据库顶层包名 +#packageName=com.taover.printer.db +packageName=com.bazhuaerp.db + +#----------------------------- +# 生成 Controller和Service所需参数 - +#----------------------------- +coverWhenFileExists=false +#模块包全名，controller、service包名都会由此生成 +modulePackageInfo=com.bazhuaerp + +#模块本地文件夹路径 +moduleFilePath=\\D:\\workproject\\bazhuaerp\\src\\main\\java\\com\\bazhuaerp\\ + +#db包，同上面的packageName +dbPackageInfo=com.bazhuaerp.db + +#----------------------------- +# 生成View的HTML、JS所需参数 - +#----------------------------- +#WebRoot的本地路径 +WebRootPath=\\D:\\workproject\\bazhuaerp\\WebContent\\ +#WebRootPath=\\C:\\workproject\\printer-taover-com\\WebRoot\\ diff --git a/src/com/taover/base/template/HtmlLayuiTemplate.ftl b/src/com/taover/base/template/HtmlLayuiTemplate.ftl index 7b66a80..2367a1e 100644 --- a/src/com/taover/base/template/HtmlLayuiTemplate.ftl +++ b/src/com/taover/base/template/HtmlLayuiTemplate.ftl @@ -85,9 +85,9 @@ layui.config({ base: '/plugins/layuiadmin/' //静态资源所在路径 }).extend({ - index: 'lib/index' //主入口模块 - }).use(['table', 'laydate', 'layer', 'form'], function(){ - var $ = layui.$, form = layui.form, table = layui.table, laydate = layui.laydate; + operationlog: 'modules/operationlog' //操作模块日志 + }).use(['table', 'laydate', 'layer', 'form', 'operationlog'], function(){ + var $ = layui.$, form = layui.form, table = layui.table, laydate = layui.laydate, operationlog=layui.operationlog; table.render({ elem: '#table-data-main', @@ -145,31 +145,7 @@ //表格操作栏动作入口 if(obj.event === 'operationLog'){ //查看操作日志动作监听入口 - layer.open({ - type: 1, - content: '
', - btn: null, - success: function(layero, index){ - table.render({ - elem: '#form-data-operation-table' - ,url: '/logtableoper/queryRecord.htm?recordId='+data.id - ,cols: [[ - {field: 'userName', width: 150, title: '操作用户'} - ,{field: 'logName', width: 100, title: '操作类型'} - ,{field: 'createTime', width: 150, title: '创建时间'} - ,{field: 'description', width: 200, title: '备注信息'} - ]], - request:{pageName:'page',limitName:'pageSize'}, - response: {statusName: 'resultId',statusCode: 200,msgName: 'resultMessage',countName: 'total',dataName: 'rows'}, - page:true, - loading:true, - done: function(data){ - $('#form-data-operation-table').parent('.layui-layer-content').css({marginTop:'-10px',marginBottom:'-10px'}); - layero.resize(); - } - }); - } - }); + operationlog.open(data.id, '${tableName}'); } else if(obj.event === 'delete'){ //删除按钮操作入口 if(!data){ layer.alert('没有找到需要删除的记录~'); diff --git a/src/com/taover/base/template/model/bussiness/ControllerModel.java b/src/com/taover/base/template/model/bussiness/ControllerModel.java index ff2b968..0018d1c 100644 --- a/src/com/taover/base/template/model/bussiness/ControllerModel.java +++ b/src/com/taover/base/template/model/bussiness/ControllerModel.java @@ -68,7 +68,7 @@ public class ControllerModel { * @return */ public static String parseConditionString(String name, String fieldName){ - String lowName = StringUtil.formatBeanNameFirstLow(name); + String lowName = name; String sqlCondition = "String "+lowName+" = request.getParameter(\""+lowName+"\");\n" +"\t\tif(StringUtils.isNotEmpty("+lowName+")){ \n" +"\t\t\tarrayCondition.add(new Object[]{\""+fieldName+"\", \"like\", \"%\"+"+lowName+"+\"%\"}); \n" @@ -86,7 +86,7 @@ public class ControllerModel { * @return */ public static String parseConditionNumber(String name, String fieldName){ - String lowName = StringUtil.formatBeanNameFirstLow(name); + String lowName = name; String sqlCondition = "String "+lowName+" = request.getParameter(\""+lowName+"\");\n" +"\t\tif(StringUtils.isNotEmpty("+lowName+") && StringUtils.isNumeric("+lowName+") ){ \n" +"\t\t\tarrayCondition.add(new Object[]{\""+fieldName+"\", \"=\", "+lowName+"}); \n" @@ -109,7 +109,7 @@ public class ControllerModel { * @return */ public static String parseConditionDate(String name, String fieldName){ - String lowName = StringUtil.formatBeanNameFirstLow(name); + String lowName = name; String sqlCondition = "String "+lowName+" = request.getParameter(\""+lowName+"\");\n" + "\t\tif(StringUtils.isNotEmpty("+lowName+")){\n" + "\t\t\tString[] dateGap = "+lowName+".split(\"+-+\");\n" diff --git a/src/com/taover/base/template/model/bussiness/ViewModel.java b/src/com/taover/base/template/model/bussiness/ViewModel.java index c1db03f..65b8d4c 100644 --- a/src/com/taover/base/template/model/bussiness/ViewModel.java +++ b/src/com/taover/base/template/model/bussiness/ViewModel.java @@ -11,15 +11,17 @@ import com.taover.db.TableColumn; public class ViewModel { private String webRootPath; private String controllerPathMap; + private String tableName; //map结构如下 //name:"",easyui:"numberbox|validatebox|datetimebox",required:true|false,precision:0,min:0,max:32767,validType private List> fields = new ArrayList>(); private ViewModel(){} - public static ViewModel createViewModel(String controllerPathMap, String webRootPath,Vector tableColumns){ + public static ViewModel createViewModel(String controllerPathMap, String webRootPath,Vector tableColumns, String tableName){ ViewModel model = new ViewModel(); model.controllerPathMap = controllerPathMap; model.webRootPath = webRootPath; + model.tableName = tableName; for(TableColumn column : tableColumns){ String fieldName = column.getColumBeanLName(); String fieldType = column.getJAVADataType(); @@ -315,7 +317,13 @@ public class ViewModel { String header = "{title:'"+cnName+"', field:'"+name+"', width:100, sort: true},"; return header; } - + + public String getTableName(){ + return tableName; + } + public void setTableName(String tableName){ + this.tableName = tableName; + } public String getControllerPathMap() { return controllerPathMap; } diff --git a/src/com/taover/business/GenerateVCSDP.java b/src/com/taover/business/GenerateVCSDP.java index d51fb49..072896d 100644 --- a/src/com/taover/business/GenerateVCSDP.java +++ b/src/com/taover/business/GenerateVCSDP.java @@ -1,6 +1,5 @@ package com.taover.business; -import java.io.File; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -118,7 +117,7 @@ public class GenerateVCSDP { //生成Service层 GenerateService.generateService(envir, coverWhenFileExists); //生成view - GenerateView.generateView(webRootPath, tableNameCurr, columnsInTable, coverWhenFileExists); + GenerateView.generateView(webRootPath, tableNameCurr, columnsInTable, coverWhenFileExists, moduleName); System.out.println(tableNameCurr + " : 生成结束"); } diff --git a/src/com/taover/business/GenerateView.java b/src/com/taover/business/GenerateView.java index 7952721..2500db9 100644 --- a/src/com/taover/business/GenerateView.java +++ b/src/com/taover/business/GenerateView.java @@ -82,9 +82,10 @@ public class GenerateView { System.out.println(tableNameCurr + " : 生成失败，未设置主键"); continue; } + String moduleName = tableNameCurr.split("_")[0]; //生成view - generateView(webRootPath, tableNameCurr, columnsInTable, false); + generateView(webRootPath, tableNameCurr, columnsInTable, false, moduleName); System.out.println(tableNameCurr + " : 生成结束"); } @@ -92,10 +93,10 @@ public class GenerateView { System.out.println("全部结束"); } - public static void generateView(String webRootPath, String tableName, Vector columnsInTable, boolean coverWhenFileExists) { + public static void generateView(String webRootPath, String tableName, Vector columnsInTable, boolean coverWhenFileExists, String moduleName) { try{ String controllerMapping = StringUtil.formatBeanNameFirstLow(tableName).toLowerCase(); - ViewModel model = ViewModel.createViewModel(controllerMapping, webRootPath, columnsInTable); + ViewModel model = ViewModel.createViewModel(controllerMapping, webRootPath, columnsInTable, tableName); File f = new File(Tools.getPath() + Constants.TEMPATE_PATH); Configuration cfg = new Configuration(); @@ -127,9 +128,9 @@ public class GenerateView { Template htmlLayuiTemplate = cfg.getTemplate(Constants.TEMPATE_HTMLLAYUINAME, "UTF-8"); htmlLayuiTemplate.process(model, htmlLayuiOut); File destLayuiFile = new File( - webRootPath+File.separator+"views"+File.separator+controllerMapping+".html"); + webRootPath+File.separator+"views"+File.separator+moduleName+File.separator+controllerMapping+".html"); if(coverWhenFileExists || !destLayuiFile.exists()){ - Tools.createFile(webRootPath+File.separator+"views", controllerMapping+".html", htmlLayuiOut.toString()); + Tools.createFile(webRootPath+File.separator+"views"+File.separator+moduleName, controllerMapping+".html", htmlLayuiOut.toString()); }else{ System.out.println("文件生成："+destFile.getName()+"文件已经存在，未覆盖！"); } -- libgit2 0.21.2