Browse Source

fix 修改新增接口位置,使用finger

Administrator 4 năm trước cách đây
mục cha
commit
d69cf92b7d

+ 39 - 0
boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTable.java

@@ -130,6 +130,21 @@ public class GenTable extends BaseEntity
      */
     private String triggerSubmit;
 
+    /**
+     * 实际数据库名称
+     */
+    private String realTableName;
+
+    /**
+     * 过滤条件
+     */
+    private String filterConditions;
+
+    /**
+     * 扩展属性
+     */
+    private String extendedAttributes;
+
 
     /** 树编码字段 */
     private String treeCode;
@@ -146,6 +161,30 @@ public class GenTable extends BaseEntity
     /** 上级菜单名称字段 */
     private String parentMenuName;
 
+    public String getRealTableName() {
+        return realTableName;
+    }
+
+    public void setRealTableName(String realTableName) {
+        this.realTableName = realTableName;
+    }
+
+    public String getFilterConditions() {
+        return filterConditions;
+    }
+
+    public void setFilterConditions(String filterConditions) {
+        this.filterConditions = filterConditions;
+    }
+
+    public String getExtendedAttributes() {
+        return extendedAttributes;
+    }
+
+    public void setExtendedAttributes(String extendedAttributes) {
+        this.extendedAttributes = extendedAttributes;
+    }
+
     public String getTriggerCreate() {
         return triggerCreate;
     }

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

@@ -92,6 +92,56 @@ public class GenTableColumn extends BaseEntity
     /** hr的孩子们 */
     private List<GenTableColumn> hrChildren;
 
+    /**
+     * 字段排序规则
+     */
+    private String mask;
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 行数
+     */
+    private String numRows;
+    /**
+     * 列数
+     */
+    private String numColumns;
+
+    public String getMask() {
+        return mask;
+    }
+
+    public void setMask(String mask) {
+        this.mask = mask;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getNumRows() {
+        return numRows;
+    }
+
+    public void setNumRows(String numRows) {
+        this.numRows = numRows;
+    }
+
+    public String getNumColumns() {
+        return numColumns;
+    }
+
+    public void setNumColumns(String numColumns) {
+        this.numColumns = numColumns;
+    }
+
     public String getForeignKey() {
         return foreignKey;
     }

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

@@ -29,10 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
         <result property="hrParentId"     column="hr_parent_id"    />
+        <result property="mask"     column="mask"    />
+        <result property="defaultValue"     column="default_value"    />
+        <result property="numRows"     column="num_rows"    />
+        <result property="numColumns"     column="num_columns"    />
     </resultMap>
 	
 	<sql id="selectGenTableColumnVo">
-        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, foreign_key, dict_type, sort, create_by, create_time, update_by, update_time, hr_parent_id from gen_table_column
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, foreign_key, dict_type, sort, create_by, create_time, update_by, update_time, hr_parent_id, mask, default_value, num_rows, num_columns from gen_table_column
     </sql>
 	
     <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
@@ -83,6 +87,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="dictType != null and dictType != ''">dict_type,</if>
 			<if test="sort != null">sort,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="hrParentId != null and hrParentId != ''">hr_parent_id,</if>
+			<if test="mask != null and mask != ''">mask,</if>
+			<if test="defaultValue != null and defaultValue != ''">default_value,</if>
+			<if test="numRows != null and numRows != ''">num_rows,</if>
+			<if test="numColumns != null and numColumns != ''">num_columns,</if>
 			create_time
          )values(
 			<if test="tableId != null and tableId != ''">#{tableId},</if>
@@ -104,6 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="dictType != null and dictType != ''">#{dictType},</if>
 			<if test="sort != null">#{sort},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="hrParentId != null and hrParentId != ''">#{hrParentId},</if>
+			<if test="mask != null and mask != ''">#{mask},</if>
+			<if test="defaultValue != null and defaultValue != ''">#{defaultValue},</if>
+			<if test="numRows != null and numRows != ''">#{numRows},</if>
+			<if test="numColumns != null and numColumns != ''">#{numColumns},</if>
 			sysdate()
          )
     </insert>
@@ -111,20 +125,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateGenTableColumn" parameterType="GenTableColumn">
         update gen_table_column
         <set>
-            column_comment = #{columnComment},
-            java_type = #{javaType},
-            java_field = #{javaField},
-            is_insert = #{isInsert},
-            is_edit = #{isEdit},
-            is_list = #{isList},
-            is_query = #{isQuery},
-            is_required = #{isRequired},
-            query_type = #{queryType},
-            html_type = #{htmlType},
-            dict_type = #{dictType},
-            foreign_key = #{foreignKey},
-            sort = #{sort},
-            update_by = #{updateBy},
+            <if test="tableId != null and tableId != ''">#{tableId},</if>
+            <if test="columnName != null and columnName != ''">#{columnName},</if>
+            <if test="columnComment != null and columnComment != ''">column_comment = #{columnComment},</if>
+            <if test="columnType != null and columnType != ''">#{columnType},</if>
+            <if test="javaType != null and javaType != ''">java_type = #{javaType},</if>
+            <if test="javaField != null and javaField != ''">java_field = #{javaField},</if>
+            <if test="isPk != null and isPk != ''">#{isPk},</if>
+            <if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+            <if test="isRequired != null and isRequired != ''">is_required = #{isRequired},</if>
+            <if test="isInsert != null and isInsert != ''">is_insert = #{isInsert},</if>
+            <if test="isEdit != null and isEdit != ''">is_edit = #{isEdit},</if>
+            <if test="isList != null and isList != ''">is_list = #{isList},</if>
+            <if test="isQuery != null and isQuery != ''">is_query = #{isQuery},</if>
+            <if test="queryType != null and queryType != ''">query_type = #{queryType},</if>
+            <if test="htmlType != null and htmlType != ''">html_type = #{htmlType},</if>
+            <if test="foreignKey != null">foreign_key = #{foreignKey},</if>
+            <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="hrParentId != null and hrParentId != ''">hr_parent_id = #{hrParentId},</if>
+            <if test="mask != null and mask != ''">mask = #{mask},</if>
+            <if test="defaultValue != null and defaultValue != ''">default_value = #{defaultValue},</if>
+            <if test="numRows != null and numRows != ''">num_rows = #{numRows},</if>
+            <if test="numColumns != null and numColumns != ''">num_columns = #{numColumns},</if>
             update_time = sysdate()
         </set>
         where column_id = #{columnId}

+ 16 - 4
boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -34,6 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="triggerUpdate"         column="trigger_update"            />
 		<result property="triggerDelete"         column="trigger_delete"            />
 		<result property="triggerSubmit"         column="trigger_submit"            />
+		<result property="realTableName"         column="real_table_name"            />
+		<result property="filterConditions"         column="filter_conditions"            />
+		<result property="extendedAttributes"         column="extended_attributes"            />
 		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
 	</resultMap>
 	
@@ -64,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectGenTableVo">
         select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options,
-         create_by, create_time, update_by, update_time, remark, is_menu, menu_role, ak_column, dk_column, trigger_create, trigger_retrieve, trigger_update, trigger_delete, trigger_submit from gen_table
+         create_by, create_time, update_by, update_time, remark, is_menu, menu_role, ak_column, dk_column, trigger_create, trigger_retrieve, trigger_update, trigger_delete, trigger_submit, real_table_name, filter_conditions, extended_attributes from gen_table
     </sql>
     
     <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -123,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -131,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -139,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -169,6 +172,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="triggerUpdate != null and triggerUpdate != ''">trigger_update,</if>
 			<if test="triggerDelete != null and triggerDelete != ''">trigger_delete,</if>
 			<if test="triggerSubmit != null and triggerSubmit !=''">trigger_submit,</if>
+ 			<if test="realTableName != null and realTableName != ''">real_table_name,</if>
+ 			<if test="filterConditions != null and filterConditions != ''">filter_conditions,</if>
+ 			<if test="extendedAttributes != null and extendedAttributes != ''">extended_attributes,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
          )values(
@@ -193,6 +199,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="triggerUpdate != null and triggerUpdate != ''">#{triggerUpdate},</if>
 			<if test="triggerDelete != null and triggerDelete != ''">#{triggerDelete},</if>
 			<if test="triggerSubmit != null and triggerSubmit !=''">#{triggerSubmit},</if>
+ 			<if test="realTableName != null and realTableName != ''">#{realTableName},</if>
+ 			<if test="filterConditions != null and filterConditions != ''">#{filterConditions},</if>
+ 			<if test="extendedAttributes != null and extendedAttributes != ''">#{extendedAttributes},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			sysdate()
          )
@@ -226,6 +235,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="triggerUpdate != null and triggerUpdate != ''">trigger_update = #{triggerUpdate},</if>
 			<if test="triggerDelete != null and triggerDelete != ''">trigger_delete = #{triggerDelete},</if>
 			<if test="triggerSubmit != null and triggerSubmit !=''">trigger_submit = #{triggerSubmit},</if>
+			<if test="realTableName != null and realTableName !=''">real_table_name = #{realTableName},</if>
+			<if test="filterConditions != null and filterConditions !=''">filter_conditions = #{filterConditions},</if>
+			<if test="extendedAttributes != null and extendedAttributes !=''">extended_attributes = #{extendedAttributes},</if>
             update_time = sysdate()
         </set>
         where table_id = #{tableId}

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java

@@ -2,6 +2,7 @@ package com.boman.system.controller;
 
 import java.util.List;
 
+import com.boman.system.api.domain.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,7 +22,6 @@ import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.system.domain.SysMenu;
 import com.boman.system.service.ISysMenuService;
 
 /**

+ 0 - 258
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysMenu.java

@@ -1,258 +0,0 @@
-package com.boman.system.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import com.boman.common.core.web.domain.BaseEntity;
-
-/**
- * 菜单权限表 sys_menu
- * 
- * @author ruoyi
- */
-public class SysMenu extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 菜单ID */
-    private Long id;
-
-    /** 菜单名称 */
-    private String menuName;
-
-    /** 父菜单名称 */
-    private String parentName;
-
-    /** 父菜单ID */
-    private Long parentId;
-
-    /** 显示顺序 */
-    private String orderNum;
-
-    /** 路由地址 */
-    private String path;
-
-    /** 组件路径 */
-    private String component;
-
-    /** 是否为外链(0是 1否) */
-    private String isFrame;
-
-    /** 是否缓存(0缓存 1不缓存) */
-    private String isCache;
-
-    /** 类型(M目录 C菜单 F按钮) */
-    private String menuType;
-
-    /** 显示状态(0显示 1隐藏) */
-    private String visible;
-    
-    /** 菜单状态(0显示 1隐藏) */
-    private String status;
-
-    /** 权限字符串 */
-    private String perms;
-
-    /** 菜单图标 */
-    private String icon;
-
-    /** 子菜单 */
-    private List<SysMenu> children = new ArrayList<SysMenu>();
-    /**
-     * 对应的表名称
-     */
-    private String sysTableName;
-
-    public String getSysTableName() {
-        return sysTableName;
-    }
-
-    public void setSysTableName(String sysTableName) {
-        this.sysTableName = sysTableName;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    @NotBlank(message = "菜单名称不能为空")
-    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
-    public String getMenuName()
-    {
-        return menuName;
-    }
-
-    public void setMenuName(String menuName)
-    {
-        this.menuName = menuName;
-    }
-
-    public String getParentName()
-    {
-        return parentName;
-    }
-
-    public void setParentName(String parentName)
-    {
-        this.parentName = parentName;
-    }
-
-    public Long getParentId()
-    {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
-    {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum)
-    {
-        this.orderNum = orderNum;
-    }
-
-    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
-    public String getPath()
-    {
-        return path;
-    }
-
-    public void setPath(String path)
-    {
-        this.path = path;
-    }
-
-    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
-    public String getComponent()
-    {
-        return component;
-    }
-
-    public void setComponent(String component)
-    {
-        this.component = component;
-    }
-
-    public String getIsFrame()
-    {
-        return isFrame;
-    }
-
-    public void setIsFrame(String isFrame)
-    {
-        this.isFrame = isFrame;
-    }
-
-    public String getIsCache()
-    {
-        return isCache;
-    }
-
-    public void setIsCache(String isCache)
-    {
-        this.isCache = isCache;
-    }
-
-    @NotBlank(message = "菜单类型不能为空")
-    public String getMenuType()
-    {
-        return menuType;
-    }
-
-    public void setMenuType(String menuType)
-    {
-        this.menuType = menuType;
-    }
-
-    public String getVisible()
-    {
-        return visible;
-    }
-
-    public void setVisible(String visible)
-    {
-        this.visible = visible;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
-    public String getPerms()
-    {
-        return perms;
-    }
-
-    public void setPerms(String perms)
-    {
-        this.perms = perms;
-    }
-
-    public String getIcon()
-    {
-        return icon;
-    }
-
-    public void setIcon(String icon)
-    {
-        this.icon = icon;
-    }
-
-    public List<SysMenu> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<SysMenu> children)
-    {
-        this.children = children;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("menuName", getMenuName())
-            .append("parentId", getParentId())
-            .append("orderNum", getOrderNum())
-            .append("path", getPath())
-            .append("component", getComponent())
-            .append("isFrame", getIsFrame())
-            .append("IsCache", getIsCache())
-            .append("menuType", getMenuType())
-            .append("visible", getVisible())
-            .append("status ", getStatus())
-            .append("perms", getPerms())
-            .append("icon", getIcon())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

+ 2 - 1
boman-modules/boman-system/src/main/java/com/boman/system/domain/vo/TreeSelect.java

@@ -3,9 +3,10 @@ package com.boman.system.domain.vo;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import com.boman.system.api.domain.SysMenu;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.boman.system.api.domain.SysDept;
-import com.boman.system.domain.SysMenu;
 
 /**
  * Treeselect树结构实体类

+ 1 - 2
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysMenuMapper.java

@@ -2,10 +2,9 @@ package com.boman.system.mapper;
 
 import java.util.List;
 
+import com.boman.system.api.domain.SysMenu;
 import org.apache.ibatis.annotations.Param;
 
-import com.boman.system.domain.SysMenu;
-
 /**
  * 菜单表 数据层
  * 

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysMenuService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Set;
 
 
-import com.boman.system.domain.SysMenu;
+import com.boman.system.api.domain.SysMenu;
 import com.boman.system.domain.vo.RouterVo;
 import com.boman.system.domain.vo.TreeSelect;
 

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.boman.system.api.domain.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.boman.common.core.constant.UserConstants;
@@ -16,7 +17,6 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.system.api.domain.SysRole;
 import com.boman.system.api.domain.SysUser;
-import com.boman.system.domain.SysMenu;
 import com.boman.system.domain.vo.MetaVo;
 import com.boman.system.domain.vo.RouterVo;
 import com.boman.system.domain.vo.TreeSelect;

+ 2 - 2
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysScheduleServiceImpl.java

@@ -42,10 +42,10 @@ public class SysScheduleServiceImpl implements ISysScheduleService {
             for (Map.Entry<String, Object> entry : entries) {
                 String key = entry.getKey();
                 if ("begin_time".equals(key)) {
-                    beginTime = LocalDate.parse(DateUtils.stampToTime(entry.getValue().toString()), formatter);
+                    beginTime = LocalDate.parse(entry.getValue().toString());
                     num++;
                 } else if ("end_time".equals(key)) {
-                    endTime = LocalDate.parse(DateUtils.stampToTime(entry.getValue().toString()), formatter);
+                    endTime = LocalDate.parse(entry.getValue().toString());
                     num++;
                 } else if (num == 2) {
                     if (beginTime != null && endTime != null) {