Commit e5d73722 authored by 赵啸非's avatar 赵啸非

添加事项同步数据

parent 46407696
package com.mortals.xhx.module.business.service.impl; package com.mortals.xhx.module.business.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.common.code.IsBusinessEnum; import com.mortals.xhx.common.code.IsBusinessEnum;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.site.model.SiteBusinessEntity; import com.mortals.xhx.module.site.model.SiteBusinessEntity;
...@@ -25,6 +26,8 @@ import org.springframework.util.ObjectUtils; ...@@ -25,6 +26,8 @@ import org.springframework.util.ObjectUtils;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
/** /**
* BusinessService * BusinessService
* 站点业务 service实现 * 站点业务 service实现
...@@ -39,6 +42,20 @@ public class BusinessServiceImpl extends AbstractCRUDServiceImpl<BusinessDao, Bu ...@@ -39,6 +42,20 @@ public class BusinessServiceImpl extends AbstractCRUDServiceImpl<BusinessDao, Bu
@Autowired @Autowired
private SiteService siteService; private SiteService siteService;
@Override
protected void findAfter(BusinessEntity params, PageInfo pageInfo, Context context, List<BusinessEntity> list) throws AppException {
list.stream().peek(item->{
List<BusinessEntity> childs = this.find(new BusinessQuery().parentId(item.getId()));
if(!ObjectUtils.isEmpty(childs)){
item.setChildren(childs);
}else{
item.setChildren(null);
}
}).count();
super.findAfter(params, pageInfo, context, list);
}
@Override @Override
protected void saveBefore(BusinessEntity entity, Context context) throws AppException { protected void saveBefore(BusinessEntity entity, Context context) throws AppException {
...@@ -95,8 +112,6 @@ public class BusinessServiceImpl extends AbstractCRUDServiceImpl<BusinessDao, Bu ...@@ -95,8 +112,6 @@ public class BusinessServiceImpl extends AbstractCRUDServiceImpl<BusinessDao, Bu
//更新或新增 //更新或新增
updateOrSave(item, siteId, context); updateOrSave(item, siteId, context);
}).count(); }).count();
} }
private void updateOrSave(BusinessEntity item, Long siteId, Context context) { private void updateOrSave(BusinessEntity item, Long siteId, Context context) {
......
...@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context; ...@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.util.DataUtil; import com.mortals.framework.util.DataUtil;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController; import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.IsBusinessEnum;
import com.mortals.xhx.module.business.model.BusinessEntity; import com.mortals.xhx.module.business.model.BusinessEntity;
import com.mortals.xhx.module.business.model.BusinessQuery; import com.mortals.xhx.module.business.model.BusinessQuery;
import com.mortals.xhx.module.business.service.BusinessService; import com.mortals.xhx.module.business.service.BusinessService;
...@@ -53,23 +54,10 @@ public class BusinessController extends BasePhpCRUDJsonMappingController<Busines ...@@ -53,23 +54,10 @@ public class BusinessController extends BasePhpCRUDJsonMappingController<Busines
} }
@Override @Override
protected int doListAfter( BusinessEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(BusinessEntity query, Map<String, Object> model, Context context) throws AppException {
List<BusinessEntity> businessEntities = (List<BusinessEntity>) model.get(RESULT_KEY); query.setIsBusiness(IsBusinessEnum.一级业务.getValue());
if(!ObjectUtils.isEmpty(businessEntities)){ super.doListBefore(query, model, context);
businessEntities.stream().peek(item->{
List<BusinessEntity> childs = this.service.find(new BusinessQuery().parentId(item.getId()));
if(!ObjectUtils.isEmpty(childs)){
item.setChildren(childs);
}else{
item.setChildren(null);
}
}).count();
model.put(RESULT_KEY,businessEntities);
}
return super.doListAfter(query, model, context);
} }
/** /**
......
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteBusinessVo; import com.mortals.xhx.module.site.model.vo.SiteBusinessVo;
/** /**
* 站点事项实体对象 * 站点事项实体对象
......
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