补充定时任务参数设置

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/job/%ITEM%JobHandler.java.ftl

@@ -30,9 +30,9 @@ public class ${item.codeName}JobHandler implements IJobsHandler {
     @Override
     public JobsResponse execute(String tenantId, String param) throws JobsException {
         <#if hasDEAction>
-        ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName} entity=new ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName}();
-        entity.set("tenantid",tenantId);
-        entity.set("param",param);
+        ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName} entity = Setting.getEntity(param , new ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName}());
+        entity.set("tenantid", tenantId);
+        entity.set("param", param);
         ${srfcaseformat(de.getCodeName(),'l_u2lC')}Service.${srfmethodname(deaction.getCodeName())}(entity);
         </#if>
         log.info("执行 DemoJobHandler tenantId=" + tenantId + ",param=" + param);

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/helper/RuleUtils.java.ftl

@@ -3,7 +3,6 @@ TARGET=PSSYSTEM
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.util.helper;
 
-
 import ${pub.getPKGCodeName()}.util.domain.EntityBase;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
@@ -315,6 +314,13 @@ public class RuleUtils
 	}
 	public static boolean ge(Object exp, Object finalObject)
 	{
+		if(ObjectUtils.isEmpty(exp)){
+			return false;
+		}
+		if(ObjectUtils.isEmpty(finalObject)){
+			return false;
+		}
+
 		return (!(lt(exp, finalObject)));
 	}
 
@@ -324,6 +330,12 @@ public class RuleUtils
 	}
 	public static boolean le(Object exp, Object finalObject)
 	{
+		if(ObjectUtils.isEmpty(exp)){
+			return false;
+		}
+		if(ObjectUtils.isEmpty(finalObject)){
+			return false;
+		}
 		return (!(gt(exp, finalObject)));
 	}
 
@@ -333,6 +345,15 @@ public class RuleUtils
 	}
 	public static boolean notin(Object expObj, Object finalObject)
 	{
+
+		if (ObjectUtils.isEmpty(finalObject))
+			return true;
+		if (ObjectUtils.isEmpty(expObj))
+			return false;
+		String tvs=expObj.toString().trim();
+		if(StringUtils.isEmpty(tvs)){
+			return false;
+		}
 		return (!in(expObj,finalObject));
 	}
 	public static boolean in(Object expObj, Object object, String members)
@@ -343,7 +364,8 @@ public class RuleUtils
 	{
         if (ObjectUtils.isEmpty(finalObject))
 			return false;
-
+		if (ObjectUtils.isEmpty(expObj))
+			return false;
 		String tvs=expObj.toString().trim();
 		if(StringUtils.isEmpty(tvs)){
 			return false;
@@ -400,6 +422,16 @@ public class RuleUtils
 	}
 	public static boolean notmatchor(Object expObj, Object obj)
 	{
+		if(ObjectUtils.isEmpty(obj)){
+			return true;
+		}
+		if(ObjectUtils.isEmpty(expObj)){
+			return false;
+		}
+		String exp=expObj.toString().trim();
+		if(StringUtils.isEmpty(exp)){
+			return false;
+		}
 		return (!matchor(expObj,obj));
 	}
 
@@ -409,6 +441,16 @@ public class RuleUtils
 	}
 	public static boolean notmatchand(Object expObj, Object finalObject)
 	{
+		if(ObjectUtils.isEmpty(finalObject)){
+			return true;
+		}
+		if(ObjectUtils.isEmpty(expObj)){
+			return false;
+		}
+		String exp=expObj.toString().trim();
+		if(StringUtils.isEmpty(exp)){
+			return false;
+		}
 		return (!matchand(expObj,finalObject));
 	}
 
@@ -418,9 +460,12 @@ public class RuleUtils
 	}
 	public static boolean matchor(Object expObj, Object obj)
 	{
-		if(obj==null){
+		if(ObjectUtils.isEmpty(obj)){
             return false;
 		}
+		if(ObjectUtils.isEmpty(expObj)){
+			return false;
+		}
 		String exp=expObj.toString().trim();
 		if(StringUtils.isEmpty(exp)){
 			return false;
@@ -441,8 +486,11 @@ public class RuleUtils
 
 	public static boolean leftmatchor(Object expObj, Object obj)
 	{
-		if(obj==null){
-            return false;
+		if(ObjectUtils.isEmpty(obj)){
+			return false;
+		}
+		if(ObjectUtils.isEmpty(expObj)){
+			return false;
 		}
 		String exp=expObj.toString().trim();
 		if(StringUtils.isEmpty(exp)){
@@ -465,8 +513,11 @@ public class RuleUtils
 
 	public static boolean rightmatchor(Object expObj, Object obj)
 	{
-		if(obj==null){
-            return false;
+		if(ObjectUtils.isEmpty(obj)){
+			return false;
+		}
+		if(ObjectUtils.isEmpty(expObj)){
+			return false;
 		}
 		String exp=expObj.toString().trim();
 		if(StringUtils.isEmpty(exp)){
@@ -493,10 +544,10 @@ public class RuleUtils
 	}
 	public static boolean matchand(Object expObj,Object obj)
 	{
-		if(obj==null){
-            return false;
+		if(ObjectUtils.isEmpty(obj)){
+			return false;
 		}
-		if(expObj==null){
+		if(ObjectUtils.isEmpty(expObj)){
 			return false;
 		}
 		String exp=expObj.toString().trim();
@@ -583,4 +634,56 @@ public class RuleUtils
 		}
 		return acts;
 	}
+
+
+	public static boolean inc2s(String tvs, Object finalObject)
+	{
+		if (ObjectUtils.isEmpty(finalObject))
+			return false;
+
+		if(StringUtils.isEmpty(tvs))
+			return false;
+
+		if (finalObject instanceof String)
+		{
+			tvs="s:"+tvs;
+		}
+		else
+			return false;
+
+		List acts = parseTvs(tvs);
+
+
+		for (Iterator localIterator = acts.iterator(); localIterator.hasNext();)
+		{
+			Object act = localIterator.next();
+			if (equal(c2s(act.toString()),c2s(finalObject.toString())))
+				return true;
+		}
+
+		return false;
+	}
+
+	public static String c2s(String str)
+	{
+		if(str==null)
+			return null;
+		if(str.length()<300)
+		{
+			str=str.trim();//１２３４５６７８９０（）【】〔2018〕
+			str=str.replace("１","1").replace("２","2").replace("３","3").replace("４","4").
+					replace("５","5").replace("６","6").replace("７","7")
+					.replace("８","8").replace("９","9").replace("０","0")
+					.replace("（","〔").replace("）","〕")
+					.replace("(","〔").replace(")","〕")
+					.replace("【","〔").replace("】","〕")
+					.replace("[","〔").replace("]","〕");
+		}
+		return str;
+	}
+
+	public static boolean notinc2s(String tvs, Object finalObject)
+	{
+		return (!inc2s(tvs,finalObject));
+	}
 }
\ No newline at end of file

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/helper/Setting.java.ftl

+<#ibiztemplate>
+TARGET=PSSYSTEM
+</#ibiztemplate>
+package ${pub.getPKGCodeName()}.util.helper;
+
+import ${pub.getPKGCodeName()}.util.domain.EntityBase;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@Accessors(chain = true)
+public class Setting {
+    private String property;
+    private String value;
+
+
+    public static String getValue(String configString,String propertyName)
+    {
+        return DataObject.getStringValue(getMap(configString).get(propertyName),"");
+    }
+
+    public static <T extends EntityBase> T getEntity(String configString,T entityBase)
+    {
+        if(entityBase!=null) {
+            Map map=getMap(configString);
+            map.keySet().forEach(key->{
+                entityBase.set(key.toString(),map.get(key));
+            });
+        }
+        return entityBase;
+    }
+
+    public static Map getMap(String configString)
+    {
+        Map map=new HashMap();
+        map.put("param",configString);
+        if(!(StringUtils.isEmpty(configString)))
+        {
+            try
+            {
+                Object obj=JSON.parse(configString);
+                if(obj==null)
+                    return map;
+                else if (obj instanceof JSONArray)
+                {
+                    List<Setting> settings= JSONArray.parseArray(configString,Setting.class);
+                    for(Setting setting:settings)
+                        map.put(setting.getProperty(),setting.getValue());
+                }
+                else if (obj instanceof JSONObject)
+                {
+                    JSONObject jo = (JSONObject)obj;
+                    jo.keySet().forEach(key->{
+                        map.put(key,jo.get(key));
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                if(configString.indexOf("=")>0)
+                {
+                    Properties proper = new Properties();
+                    try {
+                        proper.load(new StringReader(configString)); //把字符串转为reader
+                    } catch (IOException e) {
+                    }
+                    Enumeration enum1 = proper.propertyNames();
+                    while (enum1.hasMoreElements()) {
+                        String strKey = (String) enum1.nextElement();
+                        String strValue = proper.getProperty(strKey);
+                        map.put(strKey, strValue);
+                    }
+                }
+
+            }
+        }
+        return map;
+    }
+
+
+}