Skip to content

S
smart_gov_platform
Commit bf21fd81 authored by 赵啸非's avatar 赵啸非
Browse files
Options

删除事项扩展表查询

parent 0ed059d2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 104 deletions
base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java
View file @ bf21fd81
......@@ -49,22 +49,9 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
@Autowired
private SiteService siteService;
@Autowired
private MatterService matterService;
@Autowired
private AreaService areaService;
@Autowired
private DeptService deptService;
@Autowired
private SiteMatterService siteMatterService;
@Autowired
private SiteThemeService siteThemeService;
@Autowired
private SiteThemeMatterService siteThemeMatterService;
@Autowired
private ICacheService cacheService;
@Autowired
private MatterExtService matterExtService;
......@@ -93,92 +80,6 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
log.info("结束同步事项！");
}
private void syncMatter(SiteEntity siteEntity) throws AppException {
AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode());
log.info("同步站点事项开始.....");
Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity, null);
log.info("同步站点部门结果:" + JSON.toJSONString(deptRest));
Rest<String> rest = siteService.syncMatterBySiteId(siteEntity, null);
//log.info("同步事项列表:" + JSON.toJSONString(rest));
if (rest.getCode() == YesNoEnum.YES.getValue()) {
List<MatterEntity> matterEntityList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()).source(SourceEnum.政务网.getValue()));
log.info("查询本地事项列表，size:{}",matterEntityList.size());
List<MatterEntity> unSyncDetailMatterList = matterEntityList.stream()
// .filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false"))
.collect(Collectors.toList());
//查询站点事项相关
List<SiteEntity> siteEntities = siteService.find(new SiteQuery().areaCode(siteEntity.getAreaCode()));
//删除站点与政务事项相关项
//重新添加
if (!ObjectUtils.isEmpty(siteEntities)) {
log.info("同步站点事项到站点.....");
for (SiteEntity site : siteEntities) {
//判断是否已经有站点事项，如果有则不添加
SiteMatterQuery siteMatterQuery = new SiteMatterQuery();
siteMatterQuery.setSiteId(site.getId());
siteMatterQuery.setSource(SourceEnum.政务网.getValue());
int count = siteMatterService.count(siteMatterQuery, null);
if (count > 0) {
continue;
}
List<SiteMatterEntity> siteMatterList = matterEntityList.stream().map(item -> {
return matterService.switchMatterToSiteMatter(item, site, null).getData();
}).filter(f -> f != null).collect(Collectors.toList());
List<List<SiteMatterEntity>> partition = ListUtil.partition(siteMatterList, 100);
for (List<SiteMatterEntity> rests : partition) {
siteMatterService.save(rests);
}
}
log.info("同步站点事项到站点完成.....");
}
log.info("同步站点事项详细条数....." + unSyncDetailMatterList.size());
unSyncDetailMatterList.parallelStream().forEach(matterEntity -> {
matterService.buildMatterDetail(matterEntity, null);
matterEntity.setUpdateTime(new Date());
matterService.update(matterEntity, null);
});
}
log.info("同步站点主题事项开始.....");
//判断站点区域乡镇情况
if (areaEntity.getAreaLevel() <= 3) {
//省，市，区
Rest<String> themeRest = siteThemeService.syncThemeBySiteId(siteEntity, null);
log.info("同步站点主题:" + JSON.toJSONString(themeRest));
log.info("同步站点个人主题事项开始.....");
siteThemeMatterService.deleteGovBySiteId(siteEntity.getId(), null);
Rest<String> grRest = siteThemeMatterService.syncThemeMatterBySiteId(siteEntity.getId(), "2", null);
log.info("同步站点主题个人事项:" + JSON.toJSONString(grRest));
log.info("同步站点法人主题事项开始.....");
Rest<String> frRest = siteThemeMatterService.syncThemeMatterBySiteId(siteEntity.getId(), "3", null);
log.info("同步站点主题法人事项:" + JSON.toJSONString(frRest));
} else if (areaEntity.getAreaLevel() > 3) {
//街道，镇，乡
Rest<String> themeTownRest = siteThemeService.syncTownThemeBySiteId(siteEntity, null);
log.info("同步乡镇站点主题:" + JSON.toJSONString(themeTownRest));
if (themeTownRest.getCode() == YesNoEnum.YES.getValue()) {
siteThemeMatterService.deleteGovBySiteId(siteEntity.getId(), null);
String dxType = DxTypeEnum.街道镇服务.getValue();
if (areaEntity.getAreaLevel() == 5) {
dxType = DxTypeEnum.乡村服务.getValue();
}
Rest<String> townThemeRest = siteThemeMatterService.syncTownThemeMatterBySiteId(siteEntity, dxType, null);
log.info("同步站点乡镇主题事项:" + JSON.toJSONString(townThemeRest));
} else {
try {
// cacheService.del(RedisCacheKeys.getSyncMatterLockKey() + siteEntity.getAreaCode(), siteEntity.getAreaCode());
log.info("同步站点乡镇主题事项失败:" + themeTownRest.getData());
}catch (Exception e){
log.error("同步站点乡镇主题事项失败",e);
}
}
}
log.info("同步站点事项结束.....");
}
@Override
public void stopTask(ITask task) throws AppException {
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ bf21fd81
......@@ -1196,7 +1196,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
log.error(String.format("设置值异常！key:%s,value:%s,orginKey:%s", value, m.getValue(), m.getKey()));
}
}
} else {
}
/*else {
//未配置的属性映射添加到扩展表中
//属性保存到扩展表中
MatterExtEntity matterExtEntity = new MatterExtEntity();
......@@ -1211,14 +1212,14 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
matterExtEntity.setCreateUserId(1L);
matterExtEntities.add(matterExtEntity);
sortN++;
}
}*/
}
if (!ObjectUtils.isEmpty(matterExtEntities)) {
/* if (!ObjectUtils.isEmpty(matterExtEntities)) {
//先删除后添加
matterExtService.deleteByMatterId(matterEntity.getId(), null);
matterExtService.save(matterExtEntities, null);
}
}*/
}
......
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