修改皮肤

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

@@ -237,13 +237,13 @@ public class MatterHtmlParseUtil {
 
 
     public static void main(String[] args) {
-/*        String url = "http://www.sczwfw.gov.cn/jiq/interface/item/tags";
+        String url = "http://www.sczwfw.gov.cn/jiq/interface/item/tags";
         HashMap<String, String> params = new HashMap<>();
-        params.put("dxType", "21");
-        params.put("areaCode", "510107000000");
+        params.put("dxType", "54");
+        params.put("areaCode", "511503003999");
         params.put("deptCode", "");
         params.put("searchtext", "");
-        params.put("pageno", "5");
+        params.put("pageno", "1");
         params.put("taskType", "");
         Rest<List<MatterEntity>> rest = MatterHtmlParseUtil.getMatterList(params, url);
 

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

@@ -152,8 +152,13 @@ public class SyncGovMatterDetailThread implements Runnable {
                 Rest<String> townThemeRest = siteThemeMatterService.syncTownThemeMatterBySiteId(siteEntity, dxType, context);
                 log.info("同步站点乡镇主题事项:" + JSON.toJSONString(townThemeRest));
             } else {
-                cacheService.hdel(RedisCacheKeys.getSyncMatterLockKey() + siteEntity.getAreaCode(), siteEntity.getAreaCode());
-                log.info("同步站点乡镇主题事项失败:" + themeTownRest.getData());
+                try {
+                    cacheService.del(RedisCacheKeys.getSyncMatterLockKey() + siteEntity.getAreaCode(), siteEntity.getAreaCode());
+                    log.info("同步站点乡镇主题事项失败:" + themeTownRest.getData());
+                }catch (Exception e){
+                    log.error("同步站点乡镇主题事项失败",e);
+                }
+
             }
         }
         log.info("同步站点事项结束.....");

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

@@ -435,8 +435,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         PageInfo pageInfo = new PageInfo();
         pageInfo.setCurrPage(1);
         pageInfo.setPrePageResult(10);
-
-
         return siteEntities;
     }
 

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

@@ -160,27 +160,18 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
         try {
             if (!ObjectUtils.isEmpty(site.getSiteName())) {
-                // SiteEntity siteEntity = this.service.selectOne(new SiteQuery().siteName(site.getSiteName()));
                 List<SiteEntity> siteEntities = this.service.find(new SiteQuery().siteName(site.getSiteName()));
 
                 if (!ObjectUtils.isEmpty(siteEntities)) {
                     site.setAreaCodeList(siteEntities.stream().map(i -> i.getAreaCode()).collect(Collectors.toList()));
                 }
-
-        /*        if (!ObjectUtils.isEmpty(siteEntity)) {
-                    site.setAreaCode(siteEntity.getAreaCode());
-                }*/
             }
             if (!ObjectUtils.isEmpty(site.getAreaName())) {
-                //AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
                 List<AreaEntity> areaEntities = areaService.find(new AreaQuery().name(site.getAreaName()));
                 if (!ObjectUtils.isEmpty(areaEntities)) {
-                    // site.setAreaCode(areaEntity.getAreaCode());
                     site.setAreaCodeList(areaEntities.stream().map(i -> i.getAreaCode()).collect(Collectors.toList()));
                 }
             }
-
-
             if (ObjectUtils.isEmpty(site.getAreaCodeList())) {
                 site.setAreaCodeList(Arrays.asList(site.getAreaCode()));
             }
@@ -189,9 +180,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
             }).distinct().collect(Collectors.toList());
             //List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
 
-            if (!ObjectUtils.isEmpty(site.getSiteName())) {
+/*            if (!ObjectUtils.isEmpty(site.getSiteName())) {
                 siteEntityList = siteEntityList.stream().filter(item -> site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList());
-            }
+            }*/
             if (!ObjectUtils.isEmpty(getContext()) && !ObjectUtils.isEmpty(getContext().getUser())) {
                 recordSysLog(request, busiDesc + " 【成功】");
             }

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -222,7 +222,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
 
             InputStream inputStream = new ByteArrayInputStream(sw.toString().getBytes(Constant.UTF8));
             MultipartFile file = getMultipartFile(inputStream, "file.css");
-            String filePath = uploadService.saveFileUpload(file, "file/fileupload", context.getUser());
+            String filePath = uploadService.saveFileUpload(file, "/file/fileupload", context.getUser());
             entity.setCssFilePath(filePath);
 
         } catch (Exception e) {

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

@@ -90,7 +90,7 @@ POST {{baseUrl}}/site/getFlatSitesByAreaCode
 Content-Type: application/json
 
 {
-  "areaCode":"511502000000"
+  "siteName": "%高新%"
 }
 
 ###根据区域等级获取站点列表
@@ -98,7 +98,7 @@ POST {{baseUrl}}/site/getAreaSitesByAreaLevel
 Content-Type: application/json
 
 {
-  "siteName":"徐州区办事处"
+  "siteName":"%高新%"
 }
 
 ###站点列表
@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":1
+  "id":23
 }