Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDynamicFormController.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller;
 import cn.estsh.i3plus.icloud.form.sdk.IFormDynamicFormCloud;
 import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.base.dynamic.DynamicEntity;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
 import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty;
 import cn.estsh.i3plus.pojo.form.bean.BfDataSource;
@@ -16,6 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.swing.BakedArrayList;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -206,4 +208,87 @@ public class DemoDynamicFormController {
 
         return ResultBean.success("删除成功");
     }
+
+    /**
+     * 根据条件修改动态数据
+     * @return
+     */
+    @PutMapping("/batch-update-dynamic-entity")
+    @ApiOperation("根据条件修改动态数据")
+    public BaseResultBean batchUpdateDynamicEntity(){
+        // 修改必须传递id
+        // 修改参数
+        Map<String,Object> params = new HashedMap();
+        params.put("configCode","配置代码");
+        params.put("configDescription","配置代码6");
+        params.put("configType",10088);
+        // 修改条件
+        List<BfDataObjectProperty> dataObjectPropertyList = new ArrayList<>();
+        BfDataObjectProperty dataObjectProperty = new BfDataObjectProperty();
+        // 条件列
+        dataObjectProperty.setPropertyCode("id");
+        // 条件参数
+        List<Object> objectList = new ArrayList<>();
+        objectList.add(1136674711043313664L);
+        objectList.add(1136674929583329280L);
+        objectList.add(1136675310530990080L);
+
+        // 单参数 传PropertyFormValue属性
+        dataObjectProperty.setPropertyFormValue("y");
+        // 如果条件表达式使用in 则传递 PropertyFormValueList 属性
+        dataObjectProperty.setPropertyFormValueList(objectList);
+
+        // 条件表达式
+        dataObjectProperty.setObjectColumnCustomWhere(BlockFormEnumUtil.CONDITIONAL_OPERATOR.IN.getValue());
+        dataObjectPropertyList.add(dataObjectProperty);
+
+
+
+        CloudFormModel cloudFormModel = new CloudFormModel();
+        cloudFormModel.setSourceCode("form_test");
+        cloudFormModel.setDataObjectCode("sys_config");
+        cloudFormModel.setUpdate(params);
+        cloudFormModel.setUpdateConditionList(dataObjectPropertyList);
+
+        // 新增
+        return formDynamicFormCloud.updateBatch(cloudFormModel);
+    }
+
+
+    /**
+     * 根据条件删除动态数据
+     * @return
+     */
+    @PutMapping("/batch-delete-dynamic-entity")
+    @ApiOperation("根据条件删除动态数据")
+    public BaseResultBean batchDeleteDynamicEntity(){
+        List<BfDataObjectProperty> dataObjectPropertyList = new ArrayList<>();
+        BfDataObjectProperty dataObjectProperty = new BfDataObjectProperty();
+        // 条件列
+        dataObjectProperty.setPropertyCode("id");
+        // 条件参数
+        List<Object> objectList = new ArrayList<>();
+        objectList.add(1136677206129905664L);
+        objectList.add(1136677273360404480L);
+//        objectList.add(1136675310530990080L);
+
+        // 单参数 传PropertyFormValue属性
+        dataObjectProperty.setPropertyFormValue(1136677426431528960L);
+        // 如果条件表达式使用in 则传递 PropertyFormValueList 属性
+        dataObjectProperty.setPropertyFormValueList(objectList);
+
+        // 条件表达式
+        dataObjectProperty.setObjectColumnCustomWhere(BlockFormEnumUtil.CONDITIONAL_OPERATOR.EQUAL.getValue());
+        dataObjectPropertyList.add(dataObjectProperty);
+
+
+
+        CloudFormModel cloudFormModel = new CloudFormModel();
+        cloudFormModel.setSourceCode("form_test");
+        cloudFormModel.setDataObjectCode("sys_config");
+        cloudFormModel.setDeleteConditionList(dataObjectPropertyList);
+
+        // 新增
+        return formDynamicFormCloud.deleteBatch(cloudFormModel);
+    }
 }