废弃attribebean
This commit is contained in:
parent
81cf5e8f4e
commit
a6436015bf
|
@ -38,7 +38,6 @@ import net.mingsoft.cms.biz.IContentBiz;
|
||||||
import net.mingsoft.cms.entity.CategoryEntity;
|
import net.mingsoft.cms.entity.CategoryEntity;
|
||||||
import net.mingsoft.cms.entity.ContentEntity;
|
import net.mingsoft.cms.entity.ContentEntity;
|
||||||
import net.mingsoft.cms.util.CmsParserUtil;
|
import net.mingsoft.cms.util.CmsParserUtil;
|
||||||
import net.mingsoft.mdiy.bean.AttributeBean;
|
|
||||||
import net.mingsoft.mdiy.bean.PageBean;
|
import net.mingsoft.mdiy.bean.PageBean;
|
||||||
import net.mingsoft.mdiy.biz.IModelBiz;
|
import net.mingsoft.mdiy.biz.IModelBiz;
|
||||||
import net.mingsoft.mdiy.biz.IPageBiz;
|
import net.mingsoft.mdiy.biz.IPageBiz;
|
||||||
|
@ -409,8 +408,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
|
||||||
//设置动态请求的模块路径
|
//设置动态请求的模块路径
|
||||||
map.put(ParserUtil.MODEL_NAME, "mcms");
|
map.put(ParserUtil.MODEL_NAME, "mcms");
|
||||||
searchMap.put(ParserUtil.PAGE_NO, 0);
|
searchMap.put(ParserUtil.PAGE_NO, 0);
|
||||||
AttributeBean attributeBean = new AttributeBean();
|
ParserUtil.read(SEARCH+ParserUtil.HTM_SUFFIX,map, page);
|
||||||
ParserUtil.read(SEARCH+ParserUtil.HTM_SUFFIX,map, page,attributeBean);
|
|
||||||
int total = PageUtil.totalPage(count, page.getSize());
|
int total = PageUtil.totalPage(count, page.getSize());
|
||||||
int pageNo = BasicUtil.getInt(ParserUtil.PAGE_NO, 1);
|
int pageNo = BasicUtil.getInt(ParserUtil.PAGE_NO, 1);
|
||||||
if(pageNo >= total && total!=0) {
|
if(pageNo >= total && total!=0) {
|
||||||
|
|
|
@ -34,7 +34,6 @@ import net.mingsoft.cms.dao.ICategoryDao;
|
||||||
import net.mingsoft.cms.entity.CategoryEntity;
|
import net.mingsoft.cms.entity.CategoryEntity;
|
||||||
import net.mingsoft.cms.entity.ContentEntity;
|
import net.mingsoft.cms.entity.ContentEntity;
|
||||||
import net.mingsoft.cms.util.CmsParserUtil;
|
import net.mingsoft.cms.util.CmsParserUtil;
|
||||||
import net.mingsoft.mdiy.bean.AttributeBean;
|
|
||||||
import net.mingsoft.mdiy.bean.PageBean;
|
import net.mingsoft.mdiy.bean.PageBean;
|
||||||
import net.mingsoft.mdiy.entity.ModelEntity;
|
import net.mingsoft.mdiy.entity.ModelEntity;
|
||||||
import net.mingsoft.mdiy.util.ParserUtil;
|
import net.mingsoft.mdiy.util.ParserUtil;
|
||||||
|
@ -122,7 +121,6 @@ public class ContentBizImpl extends BaseBizImpl<IContentDao, ContentEntity> imp
|
||||||
// 网站风格物理路径
|
// 网站风格物理路径
|
||||||
List<CategoryBean> articleIdList = null;
|
List<CategoryBean> articleIdList = null;
|
||||||
List<CategoryEntity> categoryList = null;
|
List<CategoryEntity> categoryList = null;
|
||||||
AttributeBean attributeBean = new AttributeBean();
|
|
||||||
ContentBean contentBean = new ContentBean();
|
ContentBean contentBean = new ContentBean();
|
||||||
contentBean.setBeginTime(dateTime);
|
contentBean.setBeginTime(dateTime);
|
||||||
Map<String, Object> map = new HashMap<>();
|
Map<String, Object> map = new HashMap<>();
|
||||||
|
@ -145,12 +143,7 @@ public class ContentBizImpl extends BaseBizImpl<IContentDao, ContentEntity> imp
|
||||||
LOG.error("模板不存在:{}",category.getCategoryUrl());
|
LOG.error("模板不存在:{}",category.getCategoryUrl());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// 获取文章列表表属性
|
|
||||||
ParserUtil.read(category.getCategoryListUrl(),map, page,attributeBean);
|
|
||||||
contentBean.setFlag(attributeBean.getFlag());
|
|
||||||
contentBean.setNoflag(attributeBean.getNoflag());
|
|
||||||
contentBean.setOrder(attributeBean.getOrder());
|
|
||||||
contentBean.setOrderBy(attributeBean.getOrderby());
|
|
||||||
}
|
}
|
||||||
articleIdList = queryIdsByCategoryIdForParser(contentBean);
|
articleIdList = queryIdsByCategoryIdForParser(contentBean);
|
||||||
// 有符合条件的就更新
|
// 有符合条件的就更新
|
||||||
|
@ -190,13 +183,7 @@ public class ContentBizImpl extends BaseBizImpl<IContentDao, ContentEntity> imp
|
||||||
map.put(ParserUtil.HTML, ParserUtil.HTML);
|
map.put(ParserUtil.HTML, ParserUtil.HTML);
|
||||||
map.put(ParserUtil.URL, BasicUtil.getUrl());
|
map.put(ParserUtil.URL, BasicUtil.getUrl());
|
||||||
map.put(ParserUtil.PAGE, page);
|
map.put(ParserUtil.PAGE, page);
|
||||||
AttributeBean attributeBean = new AttributeBean();
|
|
||||||
// 获取文章列表模板标签属性
|
|
||||||
ParserUtil.read(column.getCategoryListUrl(), map, page, attributeBean);
|
|
||||||
contentBean.setFlag(attributeBean.getFlag());
|
|
||||||
contentBean.setNoflag(attributeBean.getNoflag());
|
|
||||||
contentBean.setOrder(attributeBean.getOrder());
|
|
||||||
contentBean.setOrderBy(attributeBean.getOrderby());
|
|
||||||
}
|
}
|
||||||
articleIdList = contentDao.queryIdsByCategoryIdForParser(contentBean);
|
articleIdList = contentDao.queryIdsByCategoryIdForParser(contentBean);
|
||||||
// 判断列表类型
|
// 判断列表类型
|
||||||
|
|
|
@ -122,7 +122,7 @@
|
||||||
#index .left-tree{
|
#index .left-tree{
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 180px;
|
width: 220px;
|
||||||
border-right: solid 1px #e6e6e6;
|
border-right: solid 1px #e6e6e6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
</el-popover>
|
</el-popover>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="栏目名" align="left" prop="categoryId" :formatter="contentCategoryIdFormat" width="100">
|
<el-table-column label="栏目名" align="left" prop="categoryId" :formatter="contentCategoryIdFormat" width="180">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip>
|
<el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
|
@ -328,7 +328,8 @@
|
||||||
})
|
})
|
||||||
|
|
||||||
if (sub.syncStoreUrl) {
|
if (sub.syncStoreUrl) {
|
||||||
sub.modelUrl = sub.syncStoreUrl
|
//sub.modelUrl = "http://store.web.i.mingsoft.net/#/?client=localhost:8080//ms";
|
||||||
|
sub.modelUrl = sub.syncStoreUrl;
|
||||||
sub.modelTitle = 'mstore';
|
sub.modelTitle = 'mstore';
|
||||||
sub.isStore = true;
|
sub.isStore = true;
|
||||||
!result ? this.editableTabs.push(sub) : ""
|
!result ? this.editableTabs.push(sub) : ""
|
||||||
|
|
Loading…
Reference in New Issue