公式相关调整

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/FormulaBean.java

@@ -26,6 +26,7 @@ public class FormulaBean {
     private Integer batch;
     private Integer outm;
     private Integer scope;
+    private Long projectId;
     public Formula toFormula(){
         Formula f= new Formula();
         BeanUtils.copyProperties(this,f);

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ElementFormulaMapping.java

@@ -22,4 +22,5 @@ public class ElementFormulaMapping extends BaseEntity {
     private Long nodeId;
     @Size(max = 20)
     private Long formulaId;
+    private Long projectId;
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -36,6 +36,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.FileNotFoundException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -90,12 +91,15 @@ public class FormulaController {
                          efm.setFormulaId(fa.getId());
                          efm.setNodeId(f.getNodeId());
                          efm.setElementId(f.getElementId());
+                         efm.setProjectId(f.getProjectId());
                          this.elementFormulaMappingService.save(efm);
+                         /*假如不存在projectId则认为是系统级模版公式，必须同步给所有项目TODO*/
                          return R.success("新增成功");
                      }else{
-                       return   R.fail("保存不成功，请检查nodeId字段是否为空") ;
+                       return   R.fail("保存不成功，请检查projectId、nodeId字段是否为空") ;
                      }
                  }else{
+                     /*假如不存在projectId则认为是系统级模版公式，必须同步给所有项目TODO*/
                      return  R.status(this.service.save(fa));
                  }
              }else{
@@ -105,6 +109,8 @@ public class FormulaController {
         return R.fail("保存不成功，请检查elementId、formula、scope字段是否为空");
     }
 
+
+
     /**
      * 删除
      */
@@ -133,7 +139,12 @@ public class FormulaController {
              }
          }else if(f.isPart()){
              if(f.getElementId()!=null&&f.getNodeId()!=null) {
-                 ElementFormulaMapping efm = this.elementFormulaMappingService.getOne(Wrappers.<ElementFormulaMapping>lambdaQuery().eq(ElementFormulaMapping::getElementId, f.getElementId()).eq(ElementFormulaMapping::getNodeId, f.getNodeId()));
+                 ElementFormulaMapping efm =null;
+                 if(f.getProjectId()!=null){
+                   efm  = this.elementFormulaMappingService.getOne(Wrappers.<ElementFormulaMapping>lambdaQuery().eq(ElementFormulaMapping::getElementId, f.getElementId()).eq(ElementFormulaMapping::getNodeId, f.getNodeId()).eq(ElementFormulaMapping::getProjectId,f.getProjectId()));
+                 }else{
+                   efm  = this.elementFormulaMappingService.getOne(Wrappers.<ElementFormulaMapping>lambdaQuery().eq(ElementFormulaMapping::getElementId, f.getElementId()).eq(ElementFormulaMapping::getNodeId, f.getNodeId()));
+                 }
                  if(efm!=null){
                      data=this.service.getById(efm.getFormulaId());
                  }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ElementFormulaMappingMapper.xml

@@ -13,6 +13,7 @@
         <result column="elementId" property="element_id"/>
         <result column="nodeId" property="node_id"/>
         <result column="formulaId" property="formula_id"/>
+        <result column="projectId" property="project_id"/>
     </resultMap>
 
 </mapper>