新增表参数数据属性

code-doc/src/main/resources/template/js/codemodelgroup/usemodelgroup.js

@@ -153,7 +153,7 @@ layui.config({
 	
 	// txtcenter DIV内的输入框内容变化事件
 	$("body").on("keyup", ".txtcenter input", function(e){
-		for(var i = 0; i < list.length; i++){
+		for(var i = 0; i < list.length; i++) {
 			list[i].content = codeDocUtil.replaceModelContent(list[i].modelContent);
 			list[i].fileName = $("#tableZhName").val() + list[i].modelName;
 			if(list[i].modelId == editId){
@@ -166,7 +166,7 @@ layui.config({
 	$("body").on("click", "#jsCreate", function(e){
 		AjaxPostUtil.request({url: reqBasePath + "codemodel011", params: {tableName: $("#tableName").val()}, type: 'json', callback: function(data){
 			if(data.returnCode == 0) {
-				console.log(data)
+				codeDocUtil.setTableColumnData(data.rows);
 				AjaxPostUtil.request({url: reqBasePath + "codemodel012", params: {tableName: $("#tableName").val()}, type: 'json', callback: function(json){
 					if(json.returnCode == 0) {
 						jsCreateClick = true;

userauth/src/main/resources/template/js/exexplain/exexplaintocodemodel.js

@@ -10,13 +10,12 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui'], function (exports) {
 	winui.renderColor();
-	layui.use(['form', 'layedit'], function (form) {
+	layui.use(['form'], function (form) {
 		var index = parent.layer.getFrameIndex(window.name);
 	    var $ = layui.$,
-		    form = layui.form,
-		    layedit = layui.layedit;
-	    
-	    var layContent;
+		    form = layui.form;
+
+		var ue
 	    AjaxPostUtil.request({url:reqBasePath + "exexplain002", params: {type: type}, type: 'json', callback: function(json){
    			if(json.returnCode == 0){
    				if(!isNull(json.bean)){
@@ -24,21 +23,10 @@ layui.config({
    					$("#title").val(json.bean.title);
    					$("#content").val(json.bean.content);
    				}
-   				layContent = layedit.build('content', {
-   			    	tool: [
-   		    	       'strong' //加粗
-   		    	       ,'italic' //斜体
-   		    	       ,'underline' //下划线
-   		    	       ,'del' //删除线
-   		    	       ,'|' //分割线
-   		    	       ,'left' //左对齐
-   		    	       ,'center' //居中对齐
-   		    	       ,'right' //右对齐
-   		    	       ,'link' //超链接
-   		    	       ,'unlink' //清除链接
-   		    	       ,'face' //表情
-   		    	     ]
-   			    });
+				ue = ueEditorUtil.initEditor('container');
+				ue.addListener("ready", function () {
+					ue.setContent(json.bean.content);
+				});
    			    matchingLanguage();
    			}else{
    				winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
@@ -48,12 +36,12 @@ layui.config({
 		form.render();
 	    form.on('submit(formAddBean)', function (data) {
 	        if (winui.verifyForm(data.elem)) {
-	        	if(isNull(layedit.getContent(layContent))){
+	        	if(isNull(ue.getContent())){
 	        		winui.window.msg('请输入内容。', {icon: 2,time: 2000});
 	        	}else{
 	        		var params = {
         				title: $("#title").val(),
-        				content: encodeURI(layedit.getContent(layContent)),
+        				content: encodeURIComponent(ue.getContent()),
 						type: type
 	        		};
 	        		if(isNull(rowId)){

userauth/src/main/resources/template/tpl/exexplain/exexplaintocodemodel.html

@@ -18,7 +18,7 @@
 	        <div class="layui-form-item">
 	            <label class="layui-form-label">内容</label>
 	            <div class="layui-input-block">
-                	<textarea id="content" name="content" style="display: none;"></textarea>
+					<script id="container" name="content" type="text/plain"></script>
                 </div>
 	        </div>
 	        <div class="layui-form-item">
@@ -30,6 +30,9 @@
 	</div>
 	<script src="../../assets/lib/layui/layui.js"></script>
    	<script src="../../assets/lib/layui/custom.js"></script>
+	<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ueditor/ueditor.config.js"></script>
+	<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ueditor/ueditor.all.js"></script>
+	<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ueditor/lang/zh-cn/zh-cn.js"></script>
    	<script type="text/javascript">
         layui.config({base: '../../js/exexplain/'}).use('exexplaintocodemodel');
     </script>

web/src/main/resources/template/assets/lib/layui/customer/codeDocUtil.js

@@ -12,8 +12,20 @@ var codeDocUtil = {
         'tableFirstISlowerName': /[$]{{objectName}}/g,
         'tableISlowerName': /[$]{{urlName}}/g,
         'tableBzName': /[$]{{notesName}}/g,
+
+        // 以下数据从tableColumnData对象中获取
         'currentTime': /[$]{{currentTime}}/g,
         'table': /[$]{{table}}/g,
+        'column': /[$]{{column}}/g,
+        'columnJavaStr': /[$]{{columnJavaStr}}/g,
+        'selectColumn': /[$]{{selectColumn}}/g,
+        'updateColumn': /[$]{{updateColumn}}/g,
+        'javaBeanEntity': /[$]{{javaBeanEntity}}/g,
+    },
+
+    // 表参数数据
+    tableColumnData: {
+
     },
 
     /**
@@ -23,9 +35,72 @@ var codeDocUtil = {
      */
     replaceModelContent: function (str){
         $.each(codeDocUtil.replaceModelRelationship, function (key, value){
-            str = str.replace(value, $("#" + key).val());
+            if(!isNull(codeDocUtil.tableColumnData[key])){
+                str = str.replace(value, codeDocUtil.tableColumnData[key]);
+            }else{
+                str = str.replace(value, $("#" + key).val());
+            }
         });
         return str;
+    },
+
+    /**
+     * 设置表参数数据
+     *
+     * @param columns
+     */
+    setTableColumnData: function (columns){
+        var column = []; // 表字段
+        var columnJavaStr = []; // 表字段对应的Java属性
+        var selectColumn = []; // 查询时的表参数信息
+        var updateColumn = []; // 编辑时的表参数信息
+        var javaBeanEntity = []; // Java对象属性
+        $.each(columns, function (i, item) {
+            codeDocUtil.tableColumnData['table'] = item.tableName;
+            var columnName = item.columnName;
+            var lowerColumnName = item.lowerColumnName;
+            column.push(columnName);
+            columnJavaStr.push('#{' + lowerColumnName + '}');
+
+            if(lowerColumnName == 'create_time' || lowerColumnName == 'last_update_time'){
+                selectColumn.push('CONVERT(a.' + columnName + ', char) ' + lowerColumnName);
+            } else {
+                if(columnName == lowerColumnName){
+                    selectColumn.push('a.' + columnName);
+                }else{
+                    selectColumn.push('a.' + columnName + ' ' + lowerColumnName);
+                }
+            }
+
+            if(lowerColumnName != 'id') {
+                // 编辑的时候，id不可以修改
+                updateColumn.push(columnName + ' = #{' + lowerColumnName + '}');
+            }
+
+            if('NO' == item.isNullable){
+                javaBeanEntity.push('@ApiModelProperty(value = "' + item.columnComment + '", required = "required")\n\t' +
+                    'private ' + codeDocUtil.getJavaAttr(item.columnType) + ' ' + lowerColumnName + '');
+            }else{
+                javaBeanEntity.push('@ApiModelProperty(value = "' + item.columnComment + '")\n\t' +
+                    'private ' + codeDocUtil.getJavaAttr(item.columnType) + ' ' + lowerColumnName + '');
+            }
+        });
+        codeDocUtil.tableColumnData['currentTime'] = getFormatDate();
+        codeDocUtil.tableColumnData['column'] = column.join(', ');
+        codeDocUtil.tableColumnData['columnJavaStr'] = columnJavaStr.join(', ');
+        codeDocUtil.tableColumnData['selectColumn'] = selectColumn.join(',\n\t\t\t');
+        codeDocUtil.tableColumnData['updateColumn'] = updateColumn.join(',\n\t\t\t');
+        codeDocUtil.tableColumnData['javaBeanEntity'] = javaBeanEntity.join(';\n\t\n\t');
+    },
+
+    getJavaAttr: function (columnType){
+        if(columnType.indexOf('varchar') >= 0 || columnType.indexOf('datetime') >= 0 || columnType.indexOf('longtext') >= 0
+            || columnType.indexOf('decimal') >= 0){
+            return 'String';
+        } else if(columnType.indexOf('int') >= 0 || columnType.indexOf('bigint') >= 0){
+            return 'Integer';
+        }
+        return 'String';
     }
 
 }