From d4addf82cbc987e5322e787adffd09b3fc2da979 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 23 九月 2025 16:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index c43bd2b..4da47ed 100644
--- a/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -242,9 +242,11 @@
if(objIndex == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+
String flt = objIndex.getTemplate();//妯＄増鍚嶇О
String html = objIndex.getHtml();//椤甸潰鍚嶇О
String domain = queryByCode(Constants.SYSTEM,Constants.WEB_DOMAIN).getCode();
+ String gitUrl = queryByCode(Constants.SYSTEM,Constants.GIT_CODR_URL).getCode();
String htmlPath = queryByCode(Constants.SYSTEM,Constants.STATIC_PAGES_PATH).getCode();
// domain = ".";
// htmlPath = "D://static/";
@@ -254,12 +256,17 @@
}
Map<String,Object> dataMap = new HashMap<>();
dataMap.put("webDomain",domain);
+ dataMap.put("gitCodeUrl",gitUrl);
dataMap.put("navIndex",objIndex.getNavIndex());
List<Seo> seoList = seoMapper.selectList(new LambdaQueryWrapper<Seo>().eq(Seo::getIsdeleted,Constants.ZERO));
Seo seo =getSeoByHtml(objIndex.getTemplate(),seoList);
dataMap.put("seo",seo);
- initDataMapByPage(objIndex,dataMap);
+ initDataMapByPage(dataMap);
if(objIndex.getKey() == Constants.PageIndex.dynamicsDetail.getKey() || objIndex.getKey() == Constants.PageIndex.casesDetail.getKey() ){
+ File f = new File(htmlPath+"dynamics/");
+ if(!f.exists()){
+ f.mkdirs();
+ }
List<Information> dataList =getInfomationListByType(objIndex.getKey() == Constants.PageIndex.dynamicsDetail.getKey() ?Constants.ZERO:Constants.ONE,null);
generateDetailsHtml(dataList,dataMap,flt,htmlPath+html);//鍗曟枃浠舵暟鎹�
}else
@@ -283,6 +290,75 @@
//鎵�灞炴ā鍧� 0琛屼笟璧勮銆�1杩愯惀缁忛獙銆�2鍔熻兘浠嬬粛銆�3甯傚満淇℃伅
dataMap.put("yunyingJy", getModelFromListByModule( zixunList ,Constants.ONE));
dataMap.put("gongnengJs", getModelFromListByModule( zixunList ,Constants.TWO));
+ dataMap.put("hangyeZx", getModelListFromListByModule( zixunList ,Constants.ZERO));
+ dataMap.put("shichangXx", getModelListFromListByModule( zixunList ,Constants.THREE));
+ }
+ generateSingleHtml(dataMap,flt,htmlPath+html);//鍗曟枃浠舵暟鎹�
+ }
+ return null;
+ }
+ @Override
+ public String createMobilePage(Integer pageIndex) {
+ Constants.MobilePageIndex objIndex = Constants.MobilePageIndex.getObj(pageIndex);
+ if(objIndex == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String flt = objIndex.getTemplate();//妯＄増鍚嶇О
+ String html = objIndex.getHtml();//椤甸潰鍚嶇О
+ String domain = queryByCode(Constants.SYSTEM,Constants.WEB_DOMAIN_MOBILE).getCode();
+ String htmlPath = queryByCode(Constants.SYSTEM,Constants.STATIC_PAGES_PATH_MOBILE).getCode();
+ File docFile = new File( htmlPath);
+ if(!docFile.exists()){
+ docFile.mkdirs();
+ }
+ Map<String,Object> dataMap = new HashMap<>();
+ dataMap.put("webDomain",domain);
+ dataMap.put("navIndex",objIndex.getNavIndex());
+ dataMap.put("template",flt);
+ List<Seo> seoList = seoMapper.selectList(new LambdaQueryWrapper<Seo>().eq(Seo::getIsdeleted,Constants.ZERO));
+ Seo seo =getSeoByHtml(objIndex.getTemplate(),seoList);
+ dataMap.put("seo",seo);
+ initDataMapByPage(dataMap);
+ if(objIndex.getKey() == Constants.MobilePageIndex.dynamicDetail.getKey() || objIndex.getKey() == Constants.PageIndex.casesDetail.getKey() ){
+ File f = new File(htmlPath+"dynamics/");
+ if(!f.exists()){
+ f.mkdirs();
+ }
+ List<Information> dataList =getInfomationListByType(objIndex.getKey() == Constants.MobilePageIndex.dynamicDetail.getKey() ?Constants.ZERO:Constants.ONE,null);
+ generateDetailsHtml(dataList,dataMap,flt,htmlPath+html);//鍗曟枃浠舵暟鎹�
+ }else if(objIndex.getKey() == Constants.MobilePageIndex.bannerDetails.getKey() ){
+ List<Carousel> dataList = carouselMapper.selectList(new LambdaQueryWrapper<Carousel>()
+ .eq(Carousel::getIsdeleted,Constants.ZERO)
+ .eq(Carousel::getJumpType,Constants.ONE)//澶栭摼
+ .orderByDesc(Carousel::getSortnum ,Carousel::getCreateDate));
+ generateBannerDetailsHtml(dataList,dataMap,flt,htmlPath+html);//鍗曟枃浠舵暟鎹�
+ }else if(objIndex.getKey() == Constants.MobilePageIndex.dynamics.getKey() ){
+ List<Information> zixunList = getInfomationListByType( Constants.ZERO,null);
+ //鎵�灞炴ā鍧� 0琛屼笟璧勮銆�1杩愯惀缁忛獙銆�2鍔熻兘浠嬬粛銆�3甯傚満淇℃伅
+
+ dataMap.put("gongnengJs", getModelListFromListByModule( zixunList ,Constants.TWO));
+ dataMap.put("hangyeZx", getModelListFromListByModule( zixunList ,Constants.ZERO));
+ dataMap.put("shichangXx", getModelListFromListByModule( zixunList ,Constants.THREE));
+ for (int i = 0; i < 4; i++) {
+ dataMap.put("pageTitle",i==0?"琛屼笟璧勮":(i==1?"杩愯惀缁忛獙":(i==2?"鍔熻兘浠嬬粛":"甯傚満淇℃伅")));
+ dataMap.put("dataList", getModelListFromListByModule( zixunList,i));
+ generateSingleHtml(dataMap,flt,htmlPath+(html.replace("${type}",i+"")));//鍗曟枃浠舵暟鎹�
+ }
+ }else{
+ if(objIndex.getKey() == Constants.MobilePageIndex.index.getKey()){
+ //濡傛灉鏄椤�
+ dataMap.put("bannerList", carouselMapper.selectList(new LambdaQueryWrapper<Carousel>()
+ .eq(Carousel::getIsdeleted,Constants.ZERO)
+ .orderByDesc(Carousel::getSortnum ,Carousel::getCreateDate)));
+ dataMap.put("caseList", getInfomationListByType( Constants.ONE,null));
+ }
+ if(objIndex.getKey() == Constants.MobilePageIndex.index.getKey()
+ ||objIndex.getKey() == Constants.MobilePageIndex.dynamicIndex.getKey()){
+ //濡傛灉鏄椤�
+ List<Information> zixunList = getInfomationListByType( Constants.ZERO,null);
+ //鎵�灞炴ā鍧� 0琛屼笟璧勮銆�1杩愯惀缁忛獙銆�2鍔熻兘浠嬬粛銆�3甯傚満淇℃伅
+ dataMap.put("yunyingJy", getModelListFromListByModule( zixunList ,Constants.ONE));
+ dataMap.put("gongnengJs", getModelListFromListByModule( zixunList ,Constants.TWO));
dataMap.put("hangyeZx", getModelListFromListByModule( zixunList ,Constants.ZERO));
dataMap.put("shichangXx", getModelListFromListByModule( zixunList ,Constants.THREE));
}
@@ -346,6 +422,10 @@
}
for(Information data :dataList){
dataMap.put("data",data);
+ if(Constants.equalsInteger(data.getType(),Constants.ZERO)){
+ int i = Constants.formatIntegerNum(data.getModule());
+ dataMap.put("pageTitle",i==0?"琛屼笟璧勮":(i==1?"杩愯惀缁忛獙":(i==2?"鍔熻兘浠嬬粛":"甯傚満淇℃伅")));
+ }
String tt =htmlPath.replace("${id}",data.getId()+"");
generateSingleHtml(dataMap,flt,tt);//鍗曟枃浠舵暟鎹�
}
@@ -380,7 +460,7 @@
}
}
- private void initDataMapByPage(Constants.PageIndex objIndex, Map<String, Object> dataMap) {
+ private void initDataMapByPage(Map<String, Object> dataMap) {
dataMap.put("bottom", getFoodDataVO());//缃戠珯搴曢儴淇℃伅
}
@@ -401,6 +481,12 @@
String path = findDictDataByLabel(dictDataList,Constants.FILE_DIR);
footDataVO.setFileDir(path);
footDataVO.setFootWords(findDictDataByLabel(dictDataList,Constants.FOOT_WORDS));
+ String temp = footDataVO.getFootWords();
+ footDataVO.setFootWords1(temp);
+ if(StringUtils.indexOf(temp,"dmtt.run")>0){
+ footDataVO.setFootWords1(temp.substring(0,StringUtils.indexOf(temp,"dmtt.run")));
+ footDataVO.setFootWords2(temp.substring(StringUtils.indexOf(temp,"dmtt.run") + "dmtt.run".length()));
+ }
footDataVO.setQyemail(findDictDataByLabel(dictDataList,Constants.QYEMAIL));
footDataVO.setFootImgUrl(findDictDataByLabel(dictDataList,Constants.FOOT_IMGURL));
footDataVO.setFootFullImgUrl(path+ footDataVO.getFootImgUrl());
@@ -429,7 +515,6 @@
return footDataVO;
}
-
private String findDictDataByLabel(List<SystemDictData> dictDataList, String footWords) {
if(dictDataList!=null){
for(SystemDictData data:dictDataList){
--
Gitblit v1.9.3