Commit 41734b8d authored by 赵啸非's avatar 赵啸非

修改窗口导入后redis信息id未更新

parent d35053f5
...@@ -184,3 +184,11 @@ CREATE TABLE mortals_sys_app_category( ...@@ -184,3 +184,11 @@ CREATE TABLE mortals_sys_app_category(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用分类'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用分类';
-- ----------------------------
2023-7-05
-- ----------------------------
ALTER TABLE mortals_sys_app_category ADD COLUMN `cover` varchar(256) COMMENT '封面' AFTER sort;
ALTER TABLE mortals_sys_app_category ADD COLUMN `remark` varchar(256) COMMENT '备注' AFTER cover;
...@@ -7,11 +7,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -7,11 +7,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppCategoryVo; import com.mortals.xhx.module.app.model.vo.AppCategoryVo;
import lombok.Data; import lombok.Data;
/** /**
* 自助终端应用分类实体对象 * 自助终端应用分类实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-06-15 * @date 2023-07-05
*/ */
@Data @Data
public class AppCategoryEntity extends AppCategoryVo { public class AppCategoryEntity extends AppCategoryVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +36,14 @@ public class AppCategoryEntity extends AppCategoryVo { ...@@ -36,6 +36,14 @@ public class AppCategoryEntity extends AppCategoryVo {
* 排序字段 * 排序字段
*/ */
private Integer sort; private Integer sort;
/**
* 封面
*/
private String cover;
/**
* 备注
*/
private String remark;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -63,5 +71,9 @@ public class AppCategoryEntity extends AppCategoryVo { ...@@ -63,5 +71,9 @@ public class AppCategoryEntity extends AppCategoryVo {
this.categoryName = ""; this.categoryName = "";
this.sort = 0; this.sort = 0;
this.cover = "";
this.remark = "";
} }
} }
\ No newline at end of file
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.app.model.AppCategoryEntity; import com.mortals.xhx.module.app.model.AppCategoryEntity;
/** /**
* 自助终端应用分类查询对象 * 自助终端应用分类查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-06-15 * @date 2023-07-05
*/ */
public class AppCategoryQuery extends AppCategoryEntity { public class AppCategoryQuery extends AppCategoryEntity {
/** 开始 主键ID,主键,自增长 */ /** 开始 主键ID,主键,自增长 */
private Long idStart; private Long idStart;
...@@ -111,6 +111,16 @@ public class AppCategoryQuery extends AppCategoryEntity { ...@@ -111,6 +111,16 @@ public class AppCategoryQuery extends AppCategoryEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 封面 */
private List<String> coverList;
/** 封面排除列表 */
private List <String> coverNotList;
/** 备注 */
private List<String> remarkList;
/** 备注排除列表 */
private List <String> remarkNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AppCategoryQuery> orConditionList; private List<AppCategoryQuery> orConditionList;
...@@ -684,6 +694,70 @@ public class AppCategoryQuery extends AppCategoryEntity { ...@@ -684,6 +694,70 @@ public class AppCategoryQuery extends AppCategoryEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 封面
* @return coverList
*/
public List<String> getCoverList(){
return this.coverList;
}
/**
* 设置 封面
* @param coverList
*/
public void setCoverList(List<String> coverList){
this.coverList = coverList;
}
/**
* 获取 封面
* @return coverNotList
*/
public List<String> getCoverNotList(){
return this.coverNotList;
}
/**
* 设置 封面
* @param coverNotList
*/
public void setCoverNotList(List<String> coverNotList){
this.coverNotList = coverNotList;
}
/**
* 获取 备注
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 备注
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 备注
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/** /**
* 设置 主键ID,主键,自增长 * 设置 主键ID,主键,自增长
* @param id * @param id
...@@ -1013,6 +1087,44 @@ public class AppCategoryQuery extends AppCategoryEntity { ...@@ -1013,6 +1087,44 @@ public class AppCategoryQuery extends AppCategoryEntity {
} }
/**
* 设置 封面
* @param cover
*/
public AppCategoryQuery cover(String cover){
setCover(cover);
return this;
}
/**
* 设置 封面
* @param coverList
*/
public AppCategoryQuery coverList(List<String> coverList){
this.coverList = coverList;
return this;
}
/**
* 设置 备注
* @param remark
*/
public AppCategoryQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 备注
* @param remarkList
*/
public AppCategoryQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/** /**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment