分类去掉字段

doc/5.2-patch.sql

@@ -49,6 +49,10 @@ ADD CONSTRAINT `fk_category_id` FOREIGN KEY (`category_id`) REFERENCES `cms_cate
 
 ALTER TABLE `cms_category`
 MODIFY COLUMN `category_id` bigint(20) NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`;
+ALTER TABLE `cms_category`
+DROP COLUMN `category_manager_id`;
+ALTER TABLE `cms_category`
+DROP COLUMN `app_id`;
 
 ALTER TABLE`app`
 DROP COLUMN `app_mobile_style`,
@@ -84,6 +88,9 @@ CHANGE COLUMN `model_modelmanagerid` `manager_id` int(11) NULL DEFAULT NULL COMM
 ALTER TABLE `model` DROP FOREIGN KEY `model_ibfk_1`;
 
 ALTER TABLE `model`
+MODIFY COLUMN `IS_CHILD` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展业务标记' AFTER `model_parent_ids`;
+
+ALTER TABLE `model`
 RENAME INDEX `model_modelid` TO `idx_model_id`,
 DROP INDEX `sys_c009201`,
 DROP INDEX `model_code`,

src/main/java/net/mingsoft/cms/action/CategoryAction.java

@@ -72,8 +72,6 @@ public class CategoryAction extends BaseAction {
     	@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
     	@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "appId", value = "应用编号", required =false,paramType="query"),
     	@ApiImplicitParam(name = "dictId", value = "字典对应编号", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryPath", value = "栏目路径", required =false,paramType="query"),
@@ -132,8 +130,6 @@ public class CategoryAction extends BaseAction {
 		@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
 		@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
 		@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
-		@ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
-		@ApiImplicitParam(name = "appId", value = "应用编号", required =false,paramType="query"),
 		@ApiImplicitParam(name = "dictId", value = "字典对应编号", required =false,paramType="query"),
 		@ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"),
 		@ApiImplicitParam(name = "categoryPath", value = "栏目路径", required =false,paramType="query"),
@@ -216,8 +212,6 @@ public class CategoryAction extends BaseAction {
 		@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
 		@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
 		@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
-		@ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
-		@ApiImplicitParam(name = "appId", value = "应用编号", required =false,paramType="query"),
 		@ApiImplicitParam(name = "dictId", value = "字典对应编号", required =false,paramType="query"),
 		@ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"),
 		@ApiImplicitParam(name = "categoryPath", value = "栏目路径", required =false,paramType="query"),

src/main/java/net/mingsoft/cms/action/web/CategoryAction.java

@@ -77,8 +77,6 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{
     	@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
     	@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "appId", value = "应用编号", required =false,paramType="query"),
     	@ApiImplicitParam(name = "dictId", value = "字典对应编号", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryPath", value = "栏目路径", required =false,paramType="query"),

src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml

@@ -17,8 +17,6 @@
 				<result column="category_diy_url" property="categoryDiyUrl" /><!--自定义链接 -->
 				<result column="mdiy_model_id" property="mdiyModelId" /><!--栏目管理的内容模型id -->
 				<result column="category_datetime" property="categoryDatetime" /><!--类别发布时间 -->
-				<result column="category_manager_id" property="categoryManagerId" /><!--发布用户id -->
-				<result column="app_id" property="appId" /><!--应用编号 -->
 				<result column="dict_id" property="dictId" /><!--字典对应编号 -->
 				<result column="category_flag" property="categoryFlag" /><!--栏目属性 -->
 				<result column="category_path" property="categoryPath" /><!--栏目路径 -->
@@ -48,7 +46,6 @@
 				<if test="categoryDiyUrl != null and categoryDiyUrl != ''">category_diy_url,</if>
 				<if test="mdiyModelId != null and mdiyModelId != ''">mdiy_model_id,</if>
 				<if test="categoryDatetime != null">category_datetime,</if>
-				<if test="categoryManagerId != null">category_manager_id,</if>
 				<if test="dictId != null">dict_id,</if>
 				<if test="categoryFlag != null">category_flag,</if>
 				<if test="categoryPath != null and categoryPath != ''">category_path,</if>
@@ -73,7 +70,6 @@
 				<if test="categoryDiyUrl != null and categoryDiyUrl != ''">#{categoryDiyUrl},</if>
 				<if test="mdiyModelId != null and mdiyModelId != ''">#{mdiyModelId},</if>
 				<if test="categoryDatetime != null">#{categoryDatetime},</if>
-				<if test="categoryManagerId != null">#{categoryManagerId},</if>
 				<if test="dictId != null">#{dictId},</if>
 				<if test="categoryFlag != null ">#{categoryFlag},</if>
 				<if test="categoryPath != null and categoryPath != ''">#{categoryPath},</if>
@@ -104,7 +100,6 @@
 				<if test="categoryDiyUrl != null">category_diy_url=#{categoryDiyUrl},</if>
 				<if test="mdiyModelId != null and mdiyModelId != ''">mdiy_model_id=#{mdiyModelId},</if>
 				<if test="categoryDatetime != null">category_datetime=#{categoryDatetime},</if>
-				<if test="categoryManagerId != null">category_manager_id=#{categoryManagerId},</if>
 				<if test="dictId != null">dict_id=#{dictId},</if>
 				<if test="categoryFlag != null ">category_flag=#{categoryFlag},</if>
 				<if test="categoryPath != null and categoryPath != ''">category_path=#{categoryPath},</if>
@@ -139,7 +134,6 @@
 				<if test="categoryDiyUrl != null and categoryDiyUrl != ''">and category_diy_url=#{categoryDiyUrl}</if>
 				<if test="mdiyModelId != null and mdiyModelId != ''">and mdiy_model_id=#{mdiyModelId}</if>
 				<if test="categoryDatetime != null"> and category_datetime=#{categoryDatetime} </if>
-				<if test="categoryManagerId != null"> and category_manager_id=#{categoryManagerId} </if>
 				<if test="dictId != null"> and dict_id=#{dictId} </if>
 				<if test="categoryFlag != null and categoryFlag != ''">and category_flag=#{categoryFlag}</if>
 				<if test="categoryPath != null and categoryPath != ''">and category_path=#{categoryPath}</if>
@@ -221,7 +215,6 @@
 			<if test="categoryDiyUrl != null and categoryDiyUrl != ''"> and category_diy_url=#{categoryDiyUrl}</if>
 			<if test="mdiyModelId != null and mdiyModelId != ''"> and mdiy_model_id=#{mdiyModelId}</if>
 			<if test="categoryDatetime != null"> and category_datetime=#{categoryDatetime} </if>
-			<if test="categoryManagerId != null"> and category_manager_id=#{categoryManagerId} </if>
 			<if test="dictId != null"> and dict_id=#{dictId} </if>
 			<if test="categoryFlag != null and categoryFlag != ''"> and category_flag=#{categoryFlag}</if>
 			<if test="categoryPath != null and categoryPath != ''"> and category_path=#{categoryPath}</if>

src/main/java/net/mingsoft/cms/dao/IContentDao.xml

@@ -64,7 +64,6 @@
 		<result column="category_diy_url" property="categoryDiyUrl" /><!--自定义链接 -->
 		<result column="mdiy_model_id" property="mdiyModelId" /><!--栏目管理的内容模型id -->
 		<result column="category_datetime" property="categoryDatetime" /><!--类别发布时间 -->
-		<result column="category_manager_id" property="categoryManagerId" /><!--发布用户id -->
 		<result column="dict_id" property="dictId" /><!--字典对应编号 -->
 		<result column="category_flag" property="categoryFlag" /><!--栏目属性 -->
 		<result column="category_path" property="categoryPath" /><!--栏目路径 -->

src/main/java/net/mingsoft/cms/entity/CategoryEntity.java

@@ -78,10 +78,6 @@ private static final long serialVersionUID = 1574925152750L;
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date categoryDatetime;
-	/**
-	* 发布用户id
-	*/
-	private Integer categoryManagerId;
 
 	/**
 	* 字典对应编号
@@ -290,19 +286,6 @@ private static final long serialVersionUID = 1574925152750L;
 	public Date getCategoryDatetime() {
 	return this.categoryDatetime;
 	}
-	/**
-	* 设置发布用户id
-	*/
-	public void setCategoryManagerId(Integer categoryManagerId) {
-	this.categoryManagerId = categoryManagerId;
-	}
-
-	/**
-	* 获取发布用户id
-	*/
-	public Integer getCategoryManagerId() {
-	return this.categoryManagerId;
-	}
 
 	/**
 	* 设置字典对应编号