Merge branch 'master' of http://192.168.101.10:13000/boman/boman-framwork

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTableColumn.java

@@ -45,7 +45,7 @@ public class GenTableColumn extends BaseEntity
     private String javaType;
 
     /** JAVA字段名 */
-    @NotBlank(message = "Java属性不能为空")
+    //@NotBlank(message = "Java属性不能为空")
     private String javaField;
 
     /** 是否主键（1是） */

boman-modules/boman-gen/src/main/java/com/boman/gen/service/TableSqlServiceImpl.java

@@ -72,7 +72,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
         tableSql.setCreateSql(createSql(tableSql, tableName));
         String createLog = tableSql.getCreateLog();
         StringBuffer sb = new StringBuffer(createLog);
-        sb.append("\r\n").append(DateUtils.getNowDate() + SecurityUtils.getUsername() + "刷新创建语句");
+        sb.append("\r\n").append(DateUtils.getNowDate()).append(SecurityUtils.getUsername()).append("刷新创建语句");
         tableSql.setCreateLog(sb.toString());
         tableSql.setUpdateBy(SecurityUtils.getUsername());
         tableSqlMapper.updateTableSql(tableSql);
@@ -96,7 +96,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
         }
         String createLog = tableSql.getCreateLog();
         StringBuffer sb = new StringBuffer(createLog);
-        sb.append(DateUtils.getNowDate() + SecurityUtils.getUsername() +" 执行建表语句");
+        sb.append(DateUtils.getNowDate()).append(SecurityUtils.getUsername()).append(" 执行建表语句");
         tableSqlMapper.updateTableSql(tableSql);
         return AjaxResult.success();
     }

boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <select id="checkColumnNameUnique" parameterType="Long" resultType="com.boman.gen.domain.GenTableColumn">
+    <select id="checkColumnNameUnique" parameterType="String" resultType="com.boman.gen.domain.GenTableColumn">
         <include refid="selectGenTableColumnVo"/>
         where column_name = #{columnName} limit 1
     </select>

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardlyMapper.java

@@ -6,6 +6,7 @@ import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.web.core.constant.FormDataConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -162,7 +163,15 @@ public interface StandardlyMapper {
             , @Param("condition") JSONObject condition
             , @Param("packCondition") JSONObject packCondition);
 
-
+    /**
+     * 功能描述: 根据tableName和map(属性名和属性值)进行查查
+     * {@link SqlProvider#selectByMap(java.util.Map)}
+     * @param tableName tableName
+     * @param param     属性名和属性值
+     * @return java.util.List<com.alibaba.fastjson.JSONObject>
+     */
+    @SelectProvider(type = SqlProvider.class, method = "selectByMap")
+    List<JSONObject> selectByMap(@Param("tableName") String tableName, @Param("param") Map<String, Object> param);
 
 
     public static class SqlProvider {
@@ -515,7 +524,7 @@ public interface StandardlyMapper {
             }
             wholeSql.append(StringUtils.substringBeforeLast(showDataSql.toString(), ","));
 //
-            wholeSql.append(showDataSql).append(" from ").append(tableName);
+            wholeSql.append(" from ").append(tableName);
             // 条件
             packCondition(packCondition, wholeSql);
 
@@ -529,6 +538,21 @@ public interface StandardlyMapper {
             return result;
         }
 
+        public String selectByMap(Map<String, Object> para) {
+            Map<String, Object> param = (Map<String, Object>) para.get("param");
+            String tableName = (String) para.get("tableName");
+
+            StringBuilder wholeSql = new StringBuilder();
+            wholeSql.append("select * from ").append(tableName).append(" where ");
+            for (Map.Entry<String, Object> entry : param.entrySet()) {
+                wholeSql.append(entry.getKey()).append(" = ").append(entry.getValue()).append(" and ");
+            }
+
+            String result = StringUtils.substringBeforeLast(wholeSql.toString(), "and");
+            LOGGER.info("查询拼出的sql语句为：{}", result);
+            return result;
+        }
+
         public String selectByIdList(Map<String, Object> para) {
             String tableName = (String) para.get("tableName");
             String pkName = (String) para.get("pkName");

boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -88,7 +88,7 @@ public class ColumnUtils {
      */
     public static JSONArray filterData(List<GenTableColumn> allColumns, int sort, JSONArray data, Predicate<String> predicate) {
         assert sort < 6;
-        JSONArray returnData = new JSONArray(data.size());
+        JSONArray returnData = new JSONArray();
         boolean dataIsEmpty = isEmpty(data);
         if (dataIsEmpty) {
             // data为空，拿出所有列中列表可见的

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -586,13 +586,8 @@
             } else {
               addGenTableColumn(this.formZd).then(response => {
                 this.msgSuccess("新增成功");
-                this.openZd = false;
-                // 获取表详细信息
-                getGenTable(tableId).then(res => {
-                  this.cloumns = res.data.rows;
-                  this.info = res.data.info;
-                  this.tables = res.data.tables;
-                });
+                this.open = false;
+                this.tabList();
               });
             }