添加同步事项任务

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java

@@ -48,24 +48,20 @@ 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;
-
-    private SiteEntity siteEntity;
-
-    private Context context;
-
+    @Autowired
     private ICacheService cacheService;
 
 
@@ -83,9 +79,9 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
     private void syncMatter(SiteEntity siteEntity) throws AppException {
         AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode());
         log.info("同步站点事项开始.....");
-        Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity, context);
+        Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity, null);
         log.info("同步站点部门结果:" + JSON.toJSONString(deptRest));
-        Rest<String> rest = siteService.syncMatterBySiteId(siteEntity, context);
+        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()));
@@ -96,9 +92,6 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
             //查询站点事项相关
             List<SiteEntity> siteEntities = siteService.find(new SiteQuery().areaCode(siteEntity.getAreaCode()));
             //删除站点与政务事项相关项
-/*            for (SiteEntity site : siteEntities) {
-                siteMatterService.deleteBysiteIdAndSource(site.getId(), SourceEnum.政务网.getValue(), context);
-            }*/
             //重新添加
             if (!ObjectUtils.isEmpty(siteEntities)) {
                 log.info("同步站点事项到站点.....");
@@ -112,7 +105,7 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
                         continue;
                     }
                     List<SiteMatterEntity> siteMatterList = matterEntityList.stream().map(item -> {
-                        return matterService.switchMatterToSiteMatter(item, site, context).getData();
+                        return matterService.switchMatterToSiteMatter(item, site, null).getData();
                     }).filter(f -> f != null).collect(Collectors.toList());
 
                     List<List<SiteMatterEntity>> partition = ListUtil.partition(siteMatterList, 100);
@@ -124,9 +117,9 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
             }
             log.info("同步站点事项详细条数....." + unSyncDetailMatterList.size());
             unSyncDetailMatterList.parallelStream().forEach(matterEntity -> {
-                matterService.buildMatterDetail(matterEntity, context);
+                matterService.buildMatterDetail(matterEntity, null);
                 matterEntity.setUpdateTime(new Date());
-                matterService.update(matterEntity, context);
+                matterService.update(matterEntity, null);
             });
         }
         log.info("同步站点主题事项开始.....");
@@ -134,30 +127,30 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
         //判断站点区域乡镇情况
         if (areaEntity.getAreaLevel() <= 3) {
             //省，市，区
-            Rest<String> themeRest = siteThemeService.syncThemeBySiteId(siteEntity, context);
+            Rest<String> themeRest = siteThemeService.syncThemeBySiteId(siteEntity, null);
             log.info("同步站点主题:" + JSON.toJSONString(themeRest));
             log.info("同步站点个人主题事项开始.....");
-            siteThemeMatterService.deleteGovBySiteId(siteEntity.getId(), context);
-            Rest<String> grRest = siteThemeMatterService.syncThemeMatterBySiteId(siteEntity.getId(), "2", context);
+            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", context);
+            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, context);
+            Rest<String> themeTownRest = siteThemeService.syncTownThemeBySiteId(siteEntity, null);
             log.info("同步乡镇站点主题:" + JSON.toJSONString(themeTownRest));
             if (themeTownRest.getCode() == YesNoEnum.YES.getValue()) {
-                siteThemeMatterService.deleteGovBySiteId(siteEntity.getId(), context);
+                siteThemeMatterService.deleteGovBySiteId(siteEntity.getId(), null);
                 String dxType = DxTypeEnum.街道镇服务.getValue();
                 if (areaEntity.getAreaLevel() == 5) {
                     dxType = DxTypeEnum.乡村服务.getValue();
                 }
-                Rest<String> townThemeRest = siteThemeMatterService.syncTownThemeMatterBySiteId(siteEntity, dxType, context);
+                Rest<String> townThemeRest = siteThemeMatterService.syncTownThemeMatterBySiteId(siteEntity, dxType, null);
                 log.info("同步站点乡镇主题事项:" + JSON.toJSONString(townThemeRest));
             } else {
                 try {
-                    cacheService.del(RedisCacheKeys.getSyncMatterLockKey() + siteEntity.getAreaCode(), siteEntity.getAreaCode());
+                  //  cacheService.del(RedisCacheKeys.getSyncMatterLockKey() + siteEntity.getAreaCode(), siteEntity.getAreaCode());
                     log.info("同步站点乡镇主题事项失败:" + themeTownRest.getData());
                 }catch (Exception e){
                     log.error("同步站点乡镇主题事项失败",e);
@@ -166,9 +159,6 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
             }
         }
         log.info("同步站点事项结束.....");
-
-
-
     }
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -204,7 +204,7 @@ Content-Type: application/json
 
 {
   "algorithm": "SM4",
-  "content": "ererfeiisgod",
+  "content": "ererfeiisgod好",
   "key": "QZTiVtyFIUjMCVLs",
   "password": "QZTiVtyFIUjMCVLs",
   "url": "https://cdsmk.cdrsigc.com/engine/rest/99999800009"
@@ -216,7 +216,7 @@ Content-Type: application/json
 
 {
   "algorithm": "SM4",
-  "content": "tbP0GEuSqSboA8qHissswQ==",
+  "content": "7m4VYo3j11U7O5ssPZ0HSA==",
   "key": "QZTiVtyFIUjMCVLs",
   "password": "QZTiVtyFIUjMCVLs"
 }
\ No newline at end of file