修改同步事项

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

@@ -26,7 +26,10 @@ import com.mortals.xhx.feign.skin.ISkinFillFeign;
 import com.mortals.xhx.feign.skin.ISkinSampleFeign;
 import com.mortals.xhx.module.app.model.AppEntity;
 import com.mortals.xhx.module.app.model.AppQuery;
+import com.mortals.xhx.module.app.model.AppVersionEntity;
+import com.mortals.xhx.module.app.model.AppVersionQuery;
 import com.mortals.xhx.module.app.service.AppService;
+import com.mortals.xhx.module.app.service.AppVersionService;
 import com.mortals.xhx.module.model.model.ModelEntity;
 import com.mortals.xhx.module.model.model.ModelQuery;
 import com.mortals.xhx.module.model.service.ModelService;
@@ -93,6 +96,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
     private AppService appService;
     @Autowired
     private ModelService modelService;
+    @Autowired
+    private AppVersionService appVersionService;
 
     @Override
     protected void validData(SkinBaseEntity entity, Context context) throws AppException {
@@ -339,7 +344,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
 
                             File cssFile = new File(cssFileUrlPath);
 
-                            log.info("cssFileUrl:{} ,存在:{}", cssFileUrl,cssFile.exists());
+                            log.info("cssFileUrl:{} ,存在:{}", cssFileUrl, cssFile.exists());
                             if (cssFile.exists()) {
                                 zip.putNextEntry(new ZipEntry(StrUtil.removePrefix(cssFileUrlPath, "/")));
                                 IOUtils.write(FileUtil.readBytes(cssFile), zip);
@@ -353,7 +358,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
                     zip.flush();
                     zip.closeEntry();
                 } catch (Exception e) {
-                   // log.error("异常", e.getMessage());
+                    // log.error("异常", e.getMessage());
                 }
             }
 
@@ -442,6 +447,30 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             }
         }
 
+        //应用版本
+        List<Long> appIdList = appService.find(new AppQuery().siteId(1L)).stream().map(i -> i.getId()).collect(Collectors.toList());
+        AppVersionQuery appVersionQuery = new AppVersionQuery();
+        if (!ObjectUtils.isEmpty(appIdList)) {
+            appVersionQuery.setAppIdList(appIdList);
+        }
+        appVersionQuery.setUsed(1);
+        List<AppVersionEntity> appVersionEntities = appVersionService.find(appVersionQuery);
+        for (AppVersionEntity appVersionEntity : appVersionEntities) {
+            String filePath = appVersionEntity.getFilePath();
+            filePath = uploadService.getFilePath(filePath);
+            File file = new File(filePath);
+            if (file.exists()) {
+                try {
+                    zip.putNextEntry(new ZipEntry(StrUtil.removePrefix(filePath, "/")));
+                    IOUtils.write(FileUtil.readBytes(file), zip);
+                    zip.flush();
+                    zip.closeEntry();
+                } catch (Exception e) {
+                    log.error("异常", e.getMessage());
+                }
+            }
+        }
+
 
         IOUtils.closeQuietly(zip);
         return Rest.ok(outputStream.toByteArray());

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

@@ -109,9 +109,20 @@ POST {{baseUrl}}/site/getAreaSitesByAreaLevel
 Content-Type: application/json
 
 {
-  "areaLevel":2
+
+  "areaLevelList": [3,4,5]
 }
 
+###根据区域等级获取站点列表
+POST {{baseUrl}}/site/getSitesGroupByAreaLevel
+Content-Type: application/json
+
+{
+  "areaLevel":3,
+  "areaLevelList": [3]
+}
+
+
 ###站点列表
 POST {{baseUrl}}/site/getAreaSitesBySite
 Content-Type: application/json