Merge branch 'dev_upgrade-1225' into dev_upgrade-1225-wjk

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PlanRule.java

@@ -36,5 +36,17 @@ public class PlanRule extends BasicEntity {
     @Column(name="is_delete")
     private Boolean isDelete;
 
+    /**
+     * 是否删除
+     */
+    @Column(name="rule_name")
+    private String ruleName;
+
+    /**
+     * 是否删除
+     */
+    @Column(name="pic_url")
+    private String picUrl;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

@@ -78,8 +78,8 @@ public class ContingencyPlanController extends BaseController {
     @GetMapping(value = "/page", produces = "application/json;charset=UTF-8")
     public ResponseModel pageFilter(@RequestParam(value = "current") int current,
                                      @RequestParam(value = "planName", required = false) String planName,
-                                     @RequestParam(value = "classifyId", required = false) Long[] classifyId,
-                                     @RequestParam(value = "planRange", required = false) String[] planRange,
+                                     @RequestParam(value = "classifyId", required = false) Long classifyId,
+                                     @RequestParam(value = "planRange", required = false) List<String> planRange,
                                      @RequestParam(value = "editOrgName", required = false) String editOrgName,
                                      @RequestParam(value = "implementationTimeLeft", required = false) Date implementationTimeLeft,
                                      @RequestParam(value = "implementationTimeRight", required = false) Date implementationTimeRight,

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanClassifyTreeController.java

 package com.yeejoin.amos.fas.business.controller;
 
-import com.yeejoin.amos.fas.business.service.intfc.PlanClassifyTreeService;
+import com.yeejoin.amos.fas.business.service.intfc.IPlanClassifyTreeService;
 import com.yeejoin.amos.fas.business.vo.PlanClassifyTreeVo;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
@@ -20,7 +20,7 @@ import java.util.Collection;
 public class PlanClassifyTreeController extends BaseController {
 
 	@Autowired
-	private  PlanClassifyTreeService planClassifyTreeService;
+	private IPlanClassifyTreeService planClassifyTreeService;
 
 	@ApiOperation(value = "创建分类")
 	@RequestMapping(value = "/save", method = RequestMethod.POST)

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanDetailMapper.java

@@ -36,12 +36,12 @@ public interface PlanDetailMapper {
      * 筛选预案获得总数
      * @return
      */
-    Integer filterCount(@Param("planName") String planName, @Param("classifyId") Long[] classifyId, @Param("planRange") String[] planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight);
+    Integer filterCount(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight);
 
     /**
      * 筛选预案获得分页记录
      * @return
      */
-    List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") Long[] classifyId, @Param("planRange") String[] planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size);
+    List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanClassifyTreeDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import com.yeejoin.amos.fas.business.vo.PlanClassifyTreeVo;
 import com.yeejoin.amos.fas.dao.entity.PlanClassifyTree;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -13,4 +14,6 @@ public interface IPlanClassifyTreeDao extends BaseDao<PlanClassifyTree, Long> {
     @Query(value = "select * from c_plan_classify_tree  where parent_id = ?1",nativeQuery = true)
     List<PlanClassifyTree> findByParentId(Long parentId);
 
+    @Query(value = "select * from c_plan_classify_tree",nativeQuery = true)
+    List<PlanClassifyTree> getAll();
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanDocDao.java

@@ -18,5 +18,7 @@ public interface IPlanDocDao extends BaseDao<PlanDoc, Long> {
 
     List<PlanDoc> getPlanDocsByPlanId(Long planId);
 
+    List<PlanDoc> findAllByPlanIdIn(List<Long> planId);
+
     List<PlanDoc> findAllByIsDelete(Boolean isDelete);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanEquipmentDao.java

@@ -24,4 +24,6 @@ public interface IPlanEquipmentDao extends BaseDao<PlanEquipment, Long> {
     List<PlanEquipment> findByPlanId(Long planId);
 
     List<PlanEquipment> findAllByIsDelete(Boolean isDelete);
+
+    List<PlanEquipment> findAllByPlanIdIn(List<Long> planId);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanOperationRecordDao.java

@@ -16,6 +16,11 @@ import java.util.List;
 public interface IPlanOperationRecordDao extends BaseDao<PlanOperationRecord, Long> {
     @Query(value="SELECT * from c_plan_operation_record where batch_no = ?1 AND is_delete = 0 ", nativeQuery = true)
     PlanOperationRecord findByBatchNo(String batchNo);
+
     @Query(value="SELECT * from c_plan_operation_record where plan_id = ?1 AND is_delete = 0 AND status = 0 ORDER BY create_date DESC", nativeQuery = true)
-    List<PlanOperationRecord> findByPlanId(Long planId);
+    List<PlanOperationRecord> findByPlanId1(Long planId);
+
+
+    int countByPlanId(Long planId);
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanRuleDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import com.yeejoin.amos.fas.dao.entity.PlanDoc;
 import com.yeejoin.amos.fas.dao.entity.PlanRule;
 import org.springframework.stereotype.Repository;
 
@@ -20,4 +21,6 @@ public interface IPlanRuleDao  extends BaseDao<PlanRule, Long>{
     List<PlanRule> getPlanDocsByPlanId(Long planId);
 
     List<PlanRule> findAllByIsDelete(Boolean isDelete);
+
+    List<PlanRule> findAllByPlanIdIn(List<Long> planIds);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanClassifyTreeServiceImpl.java

 package com.yeejoin.amos.fas.business.service.impl;
 
 import com.yeejoin.amos.fas.business.dao.repository.IPlanClassifyTreeDao;
-import com.yeejoin.amos.fas.business.service.intfc.PlanClassifyTreeService;
+import com.yeejoin.amos.fas.business.service.intfc.IPlanClassifyTreeService;
 import com.yeejoin.amos.fas.business.vo.PlanClassifyTreeVo;
 import com.yeejoin.amos.fas.dao.entity.PlanClassifyTree;
 import org.springframework.beans.BeanUtils;
@@ -15,13 +15,13 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import java.util.*;
 
 /**
- *@program: YeeAmosFireAutoSysRoot
- *@description: 预案分类树实现类
- *@author: wujunkai
- *@create: 2021-01-14 14:59
+ * @program: YeeAmosFireAutoSysRoot
+ * @description: 预案分类树实现类
+ * @author: wujunkai
+ * @create: 2021-01-14 14:59
  */
 @Service("PlanClassifyTreeService")
-public class PlanClassifyTreeServiceImpl  implements PlanClassifyTreeService {
+public class PlanClassifyTreeServiceImpl implements IPlanClassifyTreeService {
     public static final Long ROOT = 0L;
 
     @Autowired
@@ -45,11 +45,11 @@ public class PlanClassifyTreeServiceImpl  implements PlanClassifyTreeService {
 
     @Override
     public Collection<PlanClassifyTreeVo> getTree() {
-        List<PlanClassifyTree> list =planClassifyTreeDao.findAll();
+        List<PlanClassifyTree> list = planClassifyTreeDao.findAll();
         List<PlanClassifyTreeVo> voList = new ArrayList<>();
-        for (PlanClassifyTree planClassifyTree:list) {
+        for (PlanClassifyTree planClassifyTree : list) {
             PlanClassifyTreeVo planClassifyTreeVo = new PlanClassifyTreeVo();
-            BeanUtils.copyProperties(planClassifyTree,planClassifyTreeVo);
+            BeanUtils.copyProperties(planClassifyTree, planClassifyTreeVo);
             voList.add(planClassifyTreeVo);
         }
         Map<Object, PlanClassifyTreeVo> map = Bean.listToMap(voList, "id", PlanClassifyTree.class);
@@ -117,4 +117,18 @@ public class PlanClassifyTreeServiceImpl  implements PlanClassifyTreeService {
         resList.add(currentPlanClassifyTree);
     }
 
+    @Override
+    public Collection<PlanClassifyTreeVo> getAllChildIncludeMe(Long root) {
+        List<PlanClassifyTreeVo> treeDaoAll = Bean.toModels(planClassifyTreeDao.getAll(), PlanClassifyTreeVo.class);
+        Collection<PlanClassifyTreeVo> treeList = TreeBuilder.bulid(treeDaoAll, root);
+        if (!ROOT.equals(root)) {
+            PlanClassifyTree classifyTree = planClassifyTreeDao.findById(root).orElse(null);
+            if (null != classifyTree) {
+                PlanClassifyTreeVo classifyTreeVo = Bean.toModel(classifyTree, new PlanClassifyTreeVo());
+                classifyTreeVo.setChildren(treeList);
+                return Arrays.asList(classifyTreeVo);
+            }
+        }
+        return treeList;
+    }
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -22,7 +22,7 @@ import java.util.Map;
 public interface IContingencyPlanService {
 
     String DELETE_SYNC_PLAN_DOC = "DELETE_SYNC_PLAN_DOC";
-    String DELETE_SYNC_PLAN_RULE = "DELETE_SYNC_PLAN_RULE";
+    String DELETE_SYNC_PLAN_RULE = "urule/package/remove";
     String DELETE_SYNC_PLAN_EQUIP = "DELETE_SYNC_PLAN_EQUIP";
 
     ContingencyPlanResponseVo   planStart(ContingencyPlanParamVo vo, Toke toke);
@@ -86,7 +86,7 @@ public interface IContingencyPlanService {
      * @param implementationTimeRight 实施时间右界限
      * @return Page
      */
-    Page<PlanDetailVo> pageFilter(Page page, String planName, Long[] classifyId, String[] planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight);
+    Page<PlanDetailVo> pageFilter(Page page, String planName, Long classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight);
 
     /**
      * 查询预案使用的文档ID

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/PlanClassifyTreeService.java → YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IPlanClassifyTreeService.java

@@ -4,17 +4,25 @@ import com.yeejoin.amos.fas.business.vo.PlanClassifyTreeVo;
 import com.yeejoin.amos.fas.dao.entity.PlanClassifyTree;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @author wjk
  * @date 2021-01-14
  * 预案分类树
  */
-public interface PlanClassifyTreeService  {
+public interface IPlanClassifyTreeService {
 
     PlanClassifyTree save(PlanClassifyTree model);
 
     void delete(String ids);
 
     Collection<PlanClassifyTreeVo> getTree();
+
+    /**
+     * 获取所有子项（包含自身）
+     * @param root 根节点ID
+     * @return
+     */
+    Collection<PlanClassifyTreeVo> getAllChildIncludeMe(Long root);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/TreeUtil.java

+package com.yeejoin.amos.fas.business.util;
+
+import org.typroject.tyboot.core.foundation.utils.TreeNode;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * <h1><h1>
+ *
+ * @author tiantao
+ * @date 2020/12/7 14:23
+ */
+public class TreeUtil {
+
+    public static<T extends TreeNode>  List<T> getAllChildren(Collection<T> trees) {
+        List<T> childrenNodes = new ArrayList<>();
+        if (!ValidationUtil.isEmpty(trees)) {
+            trees.forEach(node->{
+                childrenNodes.add(node);
+                if (!ValidationUtil.isEmpty(node.getChildren())) {
+                    childrenNodes.addAll(getAllChildren(node.getChildren()));
+                }
+            });
+        }
+        return childrenNodes;
+    }
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/PlanClassifyTreeVo.java

@@ -33,7 +33,7 @@ public class PlanClassifyTreeVo extends PlanClassifyTree implements TreeNode<Pla
 
     @Override
     public void setChildren(Collection<PlanClassifyTreeVo> collection) {
-        this.children  = children;
+        this.children  = collection;
     }
 
     @Override