修改门户资源鉴权

base-manager/src/main/java/com/mortals/xhx/common/utils/MatterDetailHtmlParseUtil.java

@@ -162,6 +162,7 @@ public class MatterDetailHtmlParseUtil {
                             String data = obj.getString("data");
                             if ("0".equals(code)) {
                                 fileEntity.setFileUrl(data);
+                                fileEntity.setLocalFileUrl(data);
                             }
                         }
 
@@ -200,6 +201,7 @@ public class MatterDetailHtmlParseUtil {
                             String data = obj.getString("data");
                             if ("0".equals(code)) {
                                 fileEntity.setFileUrl(data);
+                                fileEntity.setLocalFileUrl(data);
                             }
                         }
                         // fileEntity.setFileUrl(node.firstChild().attr("href").trim());

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java

@@ -99,7 +99,10 @@ public class SyncGovMatterDetailThread implements Runnable {
                 log.info("同步站点事项到站点.....");
                 for (SiteEntity site : siteEntities) {
                     //判断是否已经有站点事项，如果有则不添加
-                    int count = siteMatterService.count(new SiteMatterQuery().siteId(site.getId()), null);
+                    SiteMatterQuery siteMatterQuery = new SiteMatterQuery();
+                    siteMatterQuery.setSiteId(site.getId());
+                    siteMatterQuery.setSource(SourceEnum.政务网.getValue());
+                    int count = siteMatterService.count(siteMatterQuery, null);
                     if (count > 0) {
                         continue;
                     }

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

@@ -11,7 +11,9 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.matters.service.MattersService;
+import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.model.SiteMatterQuery;
+import com.mortals.xhx.module.site.model.SiteQuery;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import com.mortals.xhx.module.site.service.SiteService;
 import lombok.extern.slf4j.Slf4j;
@@ -32,12 +34,19 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
     private DeptService deptService;
     @Autowired
     private MatterService matterService;
+    @Autowired
+    private  SiteService siteService;
 
 
     @Override
     public void excuteTask(ITask task) throws AppException {
         log.info("开始同步事项列表！");
-        List<DeptEntity> deptEntities = deptService.find(new DeptQuery());
+
+        List<SiteEntity> siteEntities = siteService.find(new SiteQuery());
+        for (SiteEntity siteEntity : siteEntities) {
+            DeptQuery query = new DeptQuery();
+            query.setSiteId(siteEntity.getId());
+            List<DeptEntity> deptEntities = deptService.find(query);
         for (DeptEntity deptEntity : deptEntities) {
 
             MatterQuery matterQuery = new MatterQuery();
@@ -51,6 +60,8 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
             deptService.getDao().update(deptQuery, condition);
         }
 
+        }
+
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -260,6 +260,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         try {
             DeptEntity deptEntity = deptService.getExtCache(item.getDeptCode());
             SiteMatterEntity siteMatterEntity = new SiteMatterEntity();
+            siteMatterEntity.initAttrValue();
             //SiteEntity siteEntity = siteService.get(siteId);
             siteMatterEntity.setSiteId(siteEntity.getId());
             siteMatterEntity.setSiteName(siteEntity.getSiteName());

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java

@@ -297,6 +297,6 @@ public class SiteMatterEntity extends SiteMatterVo {
 
         this.hot = 0;
 
-        this.display = 0;
+        this.display =1;
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -760,6 +760,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             for (MatterEntity matterEntity : subList) {
                 DeptEntity deptCache = deptService.getExtCache(matterEntity.getDeptCode());
                 matterEntity.setDeptName(deptCache == null ? "" : deptCache.getName());
+                matterEntity.setCreateTime(new Date());
                 matterService.save(matterEntity, context);
             }
 

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.site.service.impl;
 
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
+import com.mortals.xhx.ManagerBaseApplication;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
@@ -12,6 +13,7 @@ import com.mortals.xhx.module.site.model.*;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.site.service.SiteThemeService;
+import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +25,7 @@ import com.mortals.xhx.module.site.dao.SiteThemeMatterDao;
 import com.mortals.xhx.module.site.service.SiteThemeMatterService;
 import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -37,6 +36,7 @@ import java.util.stream.Collectors;
  * @date 2022-11-23
  */
 @Service("siteThemeMatterService")
+@Slf4j
 public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThemeMatterDao, SiteThemeMatterEntity, Long> implements SiteThemeMatterService {
 
     @Autowired
@@ -82,7 +82,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
                 for (int i = 1; i <= pageNum; i++) {
                     params.put("pageno", String.valueOf(i));
                     Rest<List<MatterEntity>> restList = null;
-                    if ( "2".equals(userType)) {
+                    if ("2".equals(userType)) {
                         restList = MatterTypeHtmlParseUtil.getGrThemeMatterList(params, url);
                     } else if ("3".equals(userType)) {
                         restList = MatterTypeHtmlParseUtil.getFrThemeMatterList(params, url);
@@ -105,8 +105,8 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
                 siteMatterQuery.setSiteId(siteId);
                 siteMatterQuery.setMatterCodeList(matterCodeList);
                 List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(siteMatterQuery, context);
-                log.info(String.format("抓取数量:%s,本地数量:%s", allList.size(), siteMatterEntities.size()));
-                if (!ObjectUtils.isEmpty(siteMatterEntities)) {
+                log.info("siteId:{},抓取数量:{},本地数量:{}", siteId, allList.size(), siteMatterEntities.size());
+                if (!ObjectUtils.isEmpty(siteMatterEntities) ) {
                     List<SiteThemeMatterEntity> collect = siteMatterEntities.stream().map(siteMatterEntity -> {
                         SiteThemeMatterEntity siteThemeMatterEntity = new SiteThemeMatterEntity();
                         siteThemeMatterEntity.initAttrValue();
@@ -114,10 +114,13 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
                         siteThemeMatterEntity.setThemeCode(item.getThemeCode());
                         siteThemeMatterEntity.setThemeName(item.getThemeName());
                         siteThemeMatterEntity.setUserType(item.getUserType());
+                        siteThemeMatterEntity.setSiteId(siteEntity.getId());
+                        siteThemeMatterEntity.setSiteName(siteEntity.getSiteName());
+                        siteThemeMatterEntity.setCreateTime(new Date());
                         return siteThemeMatterEntity;
                     }).collect(Collectors.toList());
                     if (!ObjectUtils.isEmpty(collect)) {
-                        log.info("保存数量："+collect.size());
+                        log.info("保存数量：" + collect.size());
                         this.save(collect, context);
                     }
                 }
@@ -139,7 +142,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
         params.put("dxType", dxType);
         params.put("areaCode", siteEntity.getAreaCode());
         List<SiteThemeEntity> siteThemeEntities = siteThemeService.find(new SiteThemeQuery().siteId(siteEntity.getId()));
-        int sum=0;
+        int sum = 0;
         for (SiteThemeEntity item : siteThemeEntities) {
             params.put("theme", item.getThemeCode());
             params.put("userType", item.getUserType());
@@ -162,7 +165,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
                 if (count != total) {
                     log.info(String.format("获取数量异常,count:%s,total:%s,theme:%s", count, total, item.getThemeName()));
                 }
-                sum+=count;
+                sum += count;
             }
 
 
@@ -190,7 +193,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
                 }
             }
         }
-        return Rest.ok("乡镇主题更新完成","更新条数:"+sum);
+        return Rest.ok("乡镇主题更新完成", "更新条数:" + sum);
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -373,7 +373,7 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
      */
     @PostMapping({"list/allInfo"})
     @UnAuth
-    public Rest<Object> list(@RequestBody SiteQuery query) {
+    public Rest<Object> allListInfo(@RequestBody SiteQuery query) {
         Rest<Object> ret = new Rest();
         Map<String, Object> model = new HashMap();
         Context context = this.getContext();

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

@@ -23,12 +23,9 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 POST {{baseUrl}}/app/list
 Content-Type: application/json
 
-{
-  "page":1,
-  "size":10,
-  "idList": [10,9,8]
 
-}
+
+{"siteId":"22","page":1,"size":-1}
 
 
 ###自助终端应用更新与保存

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

@@ -20,7 +20,7 @@ POST {{baseUrl}}/matter/list
 Content-Type: application/json
 
 {
-  "siteId": 1,
+  "siteId": 22,
   "page": 1,
   "size": 2
 }

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

@@ -9,6 +9,17 @@ Content-Type: application/json
 }
 
 
+###站点列表
+POST {{baseUrl}}/site/interlist
+Content-Type: application/json
+
+{
+  "areaID":"d4dfbb9945b24d35890514f4709b861d",
+  "page":1,
+  "size":10
+}
+
+
 ###站点更新与保存
 POST {{baseUrl}}/site/save
 Content-Type: application/json
@@ -104,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":1
+  "id":22
 }
 
 

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

@@ -4,9 +4,9 @@ POST {{baseUrl}}/site/matter/list
 Content-Type: application/json
 
 {
-  "siteId": 1,
+  "siteId": 22,
   "page": 1,
-  "deptId": 414,
+  "deptId": 510,
   "display": 1,
   "source": 0,
   "size": 10

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

@@ -18,7 +18,7 @@ POST {{baseUrl}}/site/theme/list
 Content-Type: application/json
 
 {
-    "siteId":3,
+    "siteId":22,
     "page":1,
     "size":10
 }