reset逻辑修复

ibiz-boot-starter/src/main/java/net/ibizsys/central/plugin/boot/core/domain/BaseData.java

@@ -65,7 +65,7 @@ public class BaseData  implements IEntityDTO  {
 
     public void setEnableAny(Boolean enableAny)
     {
-        this.actionInputDTO=enableAny.booleanValue();
+        this.enableAny=enableAny.booleanValue();
     }
 
     @Override
@@ -419,15 +419,13 @@ public class BaseData  implements IEntityDTO  {
     @JSONField(serialize = false)
     public void resetAll() {
         getMap().keySet().forEach(key->{
-            if(!key.equals("map"))
+            if(!_SYSTEMPROP.contains(key))
                 map.put(key,null);
         });
         this.paramMap.clear();
         this.focusNull.clear();
     }
 
-
-
     public void copyTo(IEntity iEntity) {
         copyTo(iEntity, false);
     }
@@ -770,8 +768,10 @@ public class BaseData  implements IEntityDTO  {
     public Map<String, Object> toMap()
     {
         Map<String, Object> map = new HashMap<>();
-        map.putAll((JSONObject)JSON.toJSON(this));
-        focusNull.forEach(item->map.put(item,null));
+        map.putAll(JSON.parseObject(JSON.toJSONString(this)));
+        focusNull.forEach(item->{
+            map.put(item,null);
+        });
         return map;
 
     }
@@ -891,6 +891,7 @@ public class BaseData  implements IEntityDTO  {
         return TypeUtils.castToJavaBean(objValue,clazz);
     }
 
+    private static Set<String> _SYSTEMPROP=new BaseData().getMap().keySet();
 
 }
 

ibiz-boot-starter/src/main/java/net/ibizsys/central/plugin/boot/core/service/IServiceApiService.java

+package net.ibizsys.central.plugin.boot.core.service;
+
+import net.ibizsys.central.dataentity.IDataEntityRuntime;
+import net.ibizsys.central.dataentity.IDataEntityRuntimeContext;
+import net.ibizsys.central.plugin.boot.core.domain.BaseData;
+import net.ibizsys.central.plugin.boot.core.filter.BaseFilter;
+import net.ibizsys.central.plugin.boot.core.helper.StringAdvUtils;
+import net.ibizsys.central.plugin.boot.core.runtime.IBootService;
+import net.ibizsys.central.plugin.boot.core.runtime.IBootSystemRuntime;
+import net.ibizsys.model.dataentity.action.IPSDEAction;
+import net.ibizsys.model.dataentity.ds.IPSDEDataSet;
+import org.springframework.data.domain.Page;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+public interface IServiceApiService<T extends BaseData, F extends BaseFilter> extends IBaseService<T,F>{
+
+
+
+
+    default Object onRealAction(String strActionName,Object arg)  throws Throwable{
+        return this.getDataEntityRuntimeContext().executeActionReal(strActionName, null, new Object[]{arg}, null);
+    }
+
+
+    default Object onRealFetch(String dsName,F arg) throws Throwable{
+        return this.getDataEntityRuntimeContext().fetchDataSetReal("DEFAULT", arg.getDataSet(), new Object[]{arg}, null);
+    }
+
+
+
+    default <K extends Serializable> T onGet(K key) throws Throwable {
+        return (T)onRealAction("Get",key);
+    }
+
+
+    default T onGetDraft(T dto) throws Throwable {
+        return (T)onRealAction("GetDraft",dto);
+    }
+
+
+    default Integer onCheckKey(T dto) throws Throwable {
+        return (Integer) onRealAction("CheckKey",dto);
+    }
+
+
+    default Page<T> onFetchDefault(F dto) throws Throwable {
+        return (Page) onRealFetch("DEFAULT",dto);
+    }
+
+    default List<T> selectDefault(F dto) throws Throwable {
+        return (List)this.getRuntimeService().getDataEntityRuntime().selectDataQuery("DEFAULT", dto);
+    }
+
+    default List<T> selectSimple(F dto) throws Throwable {
+        return (List)this.getRuntimeService().getDataEntityRuntime().selectDataQuery("SIMPLE", dto);
+    }
+
+    default List<T> selectView(F dto) throws Throwable {
+        return (List)this.getRuntimeService().getDataEntityRuntime().selectDataQuery("VIEW", dto);
+    }
+
+}