新增日程定制接口

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceCmdService.java

@@ -31,8 +31,6 @@ import java.util.stream.Collectors;
 import static com.boman.common.core.utils.obj.ObjectUtils.*;
 import static com.boman.system.common.FormDataConstant.CONDITION;
 import static com.boman.system.common.FormDataConstant.SHOW_DATA;
-import static com.boman.common.core.utils.obj.ObjectUtils.*;
-import static com.boman.system.common.FormDataConstant.*;
 
 /**
  * @author shiqian
@@ -183,6 +181,7 @@ public class TableServiceCmdService {
 
         List<JSONObject> result = selectService.selectByCondition(genTable.getTableName(), condition, packCondition
                 , showData, dto.getOrderBy(), dto.getLimit(), dto.getOffset());
+        result = isCustomized(dto.getTable(),result,"trigger_retrieve");
         rows.put(FormDataConstant.PAGE_ROWS, result);
         return AjaxResult.success(rows);
     }
@@ -397,9 +396,10 @@ public class TableServiceCmdService {
         if (result != null && result.size() > 0){
             //获取到服务名称
             String triggerName = getTriggerName(tableName, action);
-            requireNonNull(triggerName);
-            //组织请求 acos + RestTemplate
-            return restTemplate.postForObject("http://" + triggerName, result, List.class);
+            if(triggerName != null){
+                //组织请求 acos + RestTemplate
+                return restTemplate.postForObject("http://" + triggerName, result, List.class);
+            }
         }
         return result;
     }

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

@@ -62,6 +62,18 @@ public class SysMenu extends BaseEntity
 
     /** 子菜单 */
     private List<SysMenu> children = new ArrayList<SysMenu>();
+    /**
+     * 对应的表名称
+     */
+    private String tableName;
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
 
     public Long getId()
     {

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

@@ -487,12 +487,12 @@ public class SysMenuServiceImpl implements ISysMenuService
      */
     @Override
     public AjaxResult insertGenTable(GenTable genTable) {
-        //判断是否是菜单
-        isMenu(genTable);
         //新增表成功的时候,新增字段公共字段
         int i = genTableMapper.insertGenTable(genTable);
         if (i > 0) {
             insertCommonColumn(genTable.getTableId());
+            //判断是否是菜单
+            isMenu(genTable);
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -508,7 +508,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         String[] columnName = new String[]{"create_by", "create_time", "update_by", "update_time", "is_del"};
         String[] columnComment = new String[]{"创建者", "创建时间", "更新者", "更新时间", "是否删除"};
         String[] columnType = new String[]{"varchar(64)", "datetime", "varchar(64)", "datetime", "char(1)"};
-        String[] htmlType = new String[]{"input", "datetime", "input", "datetime", "input"};
+        String[] htmlType = new String[]{"input", "datetime", "input", "datetime", "select"};
         for (int i = 0; i < columnName.length; i++) {
             GenTableColumn genTableColumn = new GenTableColumn();
             genTableColumn.setTableId(tableId);
@@ -543,6 +543,7 @@ public class SysMenuServiceImpl implements ISysMenuService
             sysMenu.setMenuType("C");
             sysMenu.setIcon("system");
             sysMenu.setCreateBy(SecurityUtils.getUsername());
+            sysMenu.setTableName(genTable.getTableName());
             menuMapper.insertMenu(sysMenu);
             //是菜单,生成crud按钮
             for (int i = 0; i < Constants.MENU_NAME.length; i++) {

boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -24,10 +24,11 @@
 		<result property="updateTime"     column="update_time"    />
 		<result property="updateBy"       column="update_by"      />
 		<result property="remark"         column="remark"         />
+		<result property="sysTableName"         column="sys_table_name"         />
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time, create_by, update_by, update_time, remark, sys_table_name
 		from sys_menu
     </sql>
     
@@ -48,13 +49,13 @@
 	</select>
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by, m.update_time, m.remark, m.sys_table_name
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 	
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by, m.update_time, m.remark, m.sys_table_name
 		from sys_menu m
 		left join sys_role_menu rm on m.id = rm.menu_id
 		left join sys_user_role ur on rm.role_id = ur.role_id
@@ -73,7 +74,7 @@
 	</select>
     
     <select id="selectMenuTreeById" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by, m.update_time, m.remark, m.sys_table_name
 		from sys_menu m
 			 left join sys_role_menu rm on m.id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
@@ -141,6 +142,7 @@
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="sysTableName != null and sysTableName != ''">sys_table_name = #{sysTableName},</if>
 			update_time = sysdate()
 		</set>
 		where id = #{id}
@@ -162,6 +164,9 @@
 		<if test="icon != null and icon != ''">icon,</if>
 		<if test="remark != null and remark != ''">remark,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="updateBy != null and updateBy != ''">update_by,</if>
+		<if test="updateTime != null and updateTime != ''">update_time,</if>
+		<if test="sysTableName != null and sysTableName != ''">sys_table_name,</if>
 		create_time
 		)values(
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
@@ -178,6 +183,9 @@
 		<if test="icon != null and icon != ''">#{icon},</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+		<if test="updateTime != null and updateTime != ''">#{updateTime},</if>
+		<if test="sysTableName != null and sysTableName != ''">#{sysTableName},</if>
 		sysdate()
 		)
 	</insert>