Skip to content

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

删除事项扩展表查询

parent bf21fd81
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 85 deletions
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java
View file @ cf626a9b
......@@ -76,9 +76,7 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
@Override
public Rest<String> doMatterBySiteId(SiteEntity siteEntity, Context context) {
AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode());
// List<MatterEntity> govMatterList = new ArrayList<>();
List<DeptEntity> deptEntities = deptService.find(new DeptQuery().siteId(siteEntity.getId()).source(SourceEnum.政务网.getValue()));
List<MatterEntity> govMatterList = deptEntities.parallelStream().flatMap(deptEntity -> {
HashMap<String, String> params = new HashMap<>();
params.put("areaCode", areaEntity.getAreaCode());
......@@ -124,7 +122,7 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
matterService.save(subList, context);
matterList = matterService.getDao().getMatterListByAreaCode(matterQuery.areaCode(siteEntity.getAreaCode()));
}
log.info("开始更新事项详细！");
for (MatterEntity matterEntity : matterList) {
Rest<String> rest = matterService.buildMatterDetail(matterEntity, null);
if (rest.getCode() == YesNoEnum.YES.getValue()) {
......@@ -132,44 +130,57 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
matterService.update(matterEntity, null);
}
}
// Rest<String> syncSiteMatterRest = siteMatterService.doSyncSiteMatter(siteEntity, context);
/* //查询站点事项相关
List<SiteEntity> siteEntities = siteService.find(new SiteQuery().areaCode(siteEntity.getAreaCode()));
if (!ObjectUtils.isEmpty(siteEntities)) {
log.info("同步站点事项到站点.....");
for (SiteEntity site : siteEntities) {
//判断是否已经有站点事项，如果有则不添加
Boolean bool = checkSiteMatter(site);
if (!bool) {
//添加站点事项 批量添加
List<SiteMatterEntity> siteMatterList = matterList.stream().map(item -> {
return matterService.switchMatterToSiteMatter(item, site, null).getData();
}).filter(f -> f != null).collect(Collectors.toList());
siteMatterService.save(siteMatterList);
}
}
log.info("同步站点事项到站点完成.....");
}*/
return Rest.ok();
}
/**
* 同步站点主题事项
*
* @param siteEntity
* @param context
* @return
*/
@Override
public Rest<String> doMatterThemeBySiteId(SiteEntity siteEntity, Context context) {
AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode());
//判断站点区域乡镇情况
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);
}
private Boolean checkSiteMatter(SiteEntity site) {
SiteMatterQuery siteMatterQuery = new SiteMatterQuery();
siteMatterQuery.setSiteId(site.getId());
siteMatterQuery.setSource(SourceEnum.政务网.getValue());
int count = siteMatterService.count(siteMatterQuery, null);
if (count > 0) {
return true;
}
}
return false;
return Rest.ok();
}
public List<MatterEntity> subListSet(List<MatterEntity> firstList, Set<String> secondSet) {
return firstList.parallelStream().filter(item -> !secondSet.contains(item.getMatterNo())).collect(Collectors.toList());
}
......@@ -218,54 +229,4 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
}
/**
* 同步站点主题事项
*
* @param siteEntity
* @param context
* @return
*/
@Override
public Rest<String> doMatterThemeBySiteId(SiteEntity siteEntity, Context context) {
AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode());
//判断站点区域乡镇情况
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);
}
}
}
return Rest.ok();
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ cf626a9b
......@@ -1025,7 +1025,6 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
if (ObjectUtils.isEmpty(matterEntity.getUrl())) {
return Rest.fail("事项url不能为空!");
}
Document dom = Jsoup.connect(matterEntity.getUrl()).timeout(60 * 1000).get();
// html = Jsoup.connect(matterEntity.getUrl()).get().body().html();
// html = HttpUtil.get(matterEntity.getUrl());
......@@ -1048,6 +1047,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
if (matterEditionLocal >= matterEditionRemote) {
return Rest.fail("本地事项版本大于等于远端，不需要更新！");
}
log.info("更新详细事项==>{},version==>{}",matterEntity.getMatterName(),matterEditionRemote);
//更新部门信息
DeptEntity extCache = deptService.getExtCache(matterEntity.getDeptCode());
matterEntity.setDeptName(extCache == null ? "" : extCache.getName());
......
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