添加生成markdown

base-manager/src/main/bin/deploy.sh

@@ -58,6 +58,7 @@ build_service() {
   echo "[Service]" >>${SERVICE}
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
   echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
   echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
   echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
   echo "PrivateTmp=true" >>${SERVICE}

base-manager/src/main/java/com/mortals/xhx/module/base/service/BaseAreaService.java

 package com.mortals.xhx.module.base.service;
+
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.base.model.BaseAreaEntity;
+
+import java.util.List;
+
 /**
-* BaseAreaService
-*
-* 区域 service接口
-*
-* @author zxfei
-* @date 2022-11-22
-*/
-public interface BaseAreaService extends ICRUDService<BaseAreaEntity,Long>{
+ * BaseAreaService
+ * <p>
+ * 区域 service接口
+ *
+ * @author zxfei
+ * @date 2022-11-22
+ */
+public interface BaseAreaService extends ICRUDService<BaseAreaEntity, Long> {
 
     /**
      * 根据顶点名称生成子节点
-     * @param  baseAreaEntity
+     *
+     * @param baseAreaEntity
      * @param context
      */
     Rest<String> genSubAreaByRootName(BaseAreaEntity baseAreaEntity, Context context);
 
+
+    Rest<List<String>> getSubAreaByRootName(BaseAreaEntity baseAreaEntity, Context context);
+
 }
\ No newline at end of file

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

@@ -69,37 +69,24 @@ public class BaseAreaServiceImpl extends AbstractCRUDServiceImpl<BaseAreaDao, Ba
         return Rest.ok("初始化区域数据成功！");
     }
 
-
     /**
-     * 递归列表
+     * @param baseAreaEntity
+     * @param context
+     * @return
      */
-    private void recursionFn(List<BaseAreaEntity> list, BaseAreaEntity t) {
-        // 得到子节点列表
-        List<BaseAreaEntity> childList = getChildList(list, t);
-        t.setChildren(childList);
-        for (BaseAreaEntity tChild : childList) {
-            if (hasChild(list, tChild)) {
-                recursionFn(list, tChild);
-            }
-        }
-    }
+    @Override
+    public Rest<List<String>> getSubAreaByRootName(BaseAreaEntity baseAreaEntity, Context context) {
 
-    /**
-     * 得到子节点列表
-     */
-    private List<BaseAreaEntity> getChildList(List<BaseAreaEntity> list, BaseAreaEntity t) {
-        return list.stream().map(item -> {
-            if (!ObjectUtils.isEmpty(item.getPid()) && item.getPid() == t.getIid()) {
-                return item;
-            }
-            return null;
-        }).filter(f -> f != null).collect(Collectors.toList());
-    }
+        String areaCode = baseAreaEntity.getAreaCode();
+        String matchCode = areaCode.replaceAll("(0)+$", "");
+        matchCode = AreaMatchCodeUtil.getMatchCode(matchCode, baseAreaEntity.getAreaLevel());
+        BaseAreaQuery baseAreaQuery = new BaseAreaQuery();
+        baseAreaQuery.setAreaCode(matchCode + "%");
+        List<BaseAreaEntity> baseAreaEntityList =this.find(baseAreaQuery);
+        List<String> areaCodeList = baseAreaEntityList.stream().map(i -> i.getAreaCode()).collect(Collectors.toList());
 
-    /**
-     * 判断是否有子节点
-     */
-    private boolean hasChild(List<BaseAreaEntity> list, BaseAreaEntity t) {
-        return getChildList(list, t).size() > 0 ? true : false;
+
+        return Rest.ok(areaCodeList);
     }
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java

@@ -22,6 +22,11 @@ public class MatterVo extends BaseEntityLong {
     private List <String> eventTypeShowNotList;
 
 
+    private Integer isSub;
+
+    private String genFilePath;
+
+
 
 
 }
\ No newline at end of file

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

@@ -44,6 +44,7 @@ import com.mortals.xhx.module.site.service.SiteThemeService;
 import com.mortals.xhx.module.window.model.WindowMatterQuery;
 import com.mortals.xhx.module.window.service.WindowMatterService;
 import io.netty.handler.timeout.ReadTimeoutException;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,6 +52,7 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -1725,7 +1727,14 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                     fileName = baseAreaEntity.getName() + page + ".md";
                 }
 
-                String path = "E:\\md\\" + fileName;
+                String genFilePath = matterQuery.getGenFilePath();
+                String path = "";
+                if (ObjectUtils.isEmpty(genFilePath)) {
+                    path = genFilePath + fileName;
+                } else {
+                    path = "E:\\md\\" + fileName;
+                }
+
                 FileUtil.writeUtf8Lines(strList, path);
                 page++;
                 strList = new ArrayList<>();

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -14,6 +14,9 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.JointInfoShowEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
+import com.mortals.xhx.module.base.service.BaseAreaService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.service.MatterService;
@@ -29,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -53,6 +57,8 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     private SiteThemeService siteThemeService;
     @Autowired
     private MatterService matterService;
+    @Autowired
+    private BaseAreaService baseAreaService;
 
     public MatterController() {
         super.setModuleDesc("基础事项");
@@ -203,10 +209,10 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         int code = VALUE_RESULT_SUCCESS;
         try {
 
-        /*    Runnable runnable = new Runnable() {
-                *//**
-                 *
-                 *//*
+            /*    Runnable runnable = new Runnable() {
+             *//**
+             *
+             *//*
                 @Override
                 public void run() {
                     matterService.genMatterTxt(query, getContext());
@@ -239,7 +245,19 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         int code = VALUE_RESULT_SUCCESS;
         try {
 
-            this.service.genMatterMarkdown(query, getContext());
+            if (!ObjectUtils.isEmpty(query.getIsSub()) && YesNoEnum.YES.getValue() == query.getIsSub()) {
+                BaseAreaEntity baseAreaEntity = new BaseAreaEntity();
+                baseAreaEntity.setAreaCode(query.getAreaCode());
+                List<String> subAreaCodeList = baseAreaService.getSubAreaByRootName(baseAreaEntity, context).getData();
+
+                for (String subAreaCode : subAreaCodeList) {
+                    MatterQuery matterEntity = new MatterQuery();
+                    matterEntity.setAreaCode(subAreaCode);
+                    this.service.genMatterMarkdown(matterEntity, getContext());
+                }
+            }else{
+                this.service.genMatterMarkdown(query, getContext());
+            }
             model.put(MESSAGE_INFO, busiDesc + "成功");
 
         } catch (Exception e) {

portal-manager/src/main/bin/deploy.sh

@@ -65,6 +65,7 @@ build_service() {
   echo "[Service]" >>${SERVICE}
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
   echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
   echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
   echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
   echo "PrivateTmp=true" >>${SERVICE}

smart-gateway/src/main/bin/deploy.sh

@@ -51,6 +51,7 @@ build_service() {
   echo "[Service]" >>${SERVICE}
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
   echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
   echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
   echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
   echo "PrivateTmp=true" >>${SERVICE}