添加获取ibmmq 深度API

src/main/java/com/scbfkj/uni/api/UtilApi.java

@@ -0,0 +1,93 @@
+package com.scbfkj.uni.api;
+
+import com.scbfkj.uni.library.IbmmqUtil;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("util")
+public class UtilApi {
+
+    public static class IbmmqProp {
+        private String host;
+        private int port;
+        private int CCSID;
+        private String queueManager;
+        private String channel;
+        private String userName;
+        private String password;
+        private String queueName;
+
+        public String getHost() {
+            return host;
+        }
+
+        public void setHost(String host) {
+            this.host = host;
+        }
+
+        public int getPort() {
+            return port;
+        }
+
+        public void setPort(int port) {
+            this.port = port;
+        }
+
+        public int getCCSID() {
+            return CCSID;
+        }
+
+        public void setCCSID(int CCSID) {
+            this.CCSID = CCSID;
+        }
+
+        public String getChannel() {
+            return channel;
+        }
+
+        public void setChannel(String channel) {
+            this.channel = channel;
+        }
+
+        public String getUserName() {
+            return userName;
+        }
+
+        public void setUserName(String userName) {
+            this.userName = userName;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public void setPassword(String password) {
+            this.password = password;
+        }
+
+        public String getQueueName() {
+            return queueName;
+        }
+
+        public void setQueueName(String queueName) {
+            this.queueName = queueName;
+        }
+
+        public String getQueueManager() {
+            return queueManager;
+        }
+
+        public void setQueueManager(String queueManager) {
+            this.queueManager = queueManager;
+        }
+    }
+
+    @PostMapping("ibmmq/depth")
+    public int ibmmqDepth(@RequestBody(required = true) IbmmqProp prop) {
+        return IbmmqUtil.getDepth(prop.getHost(), prop.getPort(), prop.getCCSID(), prop.getQueueManager(), prop.getChannel(), prop.getQueueName(), prop.getUserName(), prop.getPassword());
+    }
+}

src/main/java/com/scbfkj/uni/library/IbmmqUtil.java

@@ -0,0 +1,37 @@
+package com.scbfkj.uni.library;
+
+import com.ibm.mq.MQException;
+import com.ibm.msg.client.jakarta.wmq.compat.base.internal.MQC;
+import com.ibm.msg.client.jakarta.wmq.compat.base.internal.MQEnvironment;
+import com.ibm.msg.client.jakarta.wmq.compat.base.internal.MQQueue;
+import com.ibm.msg.client.jakarta.wmq.compat.base.internal.MQQueueManager;
+
+public class IbmmqUtil {
+
+    public static int getDepth(String host, int port, int ccsid, String queueManager, String channel,String queueName, String username, String password) {
+    MQQueueManager qMgr = null;
+    try {
+        MQEnvironment.hostname = host;
+        MQEnvironment.port = port;
+        MQEnvironment.CCSID = ccsid;
+        MQEnvironment.channel = channel;
+        MQEnvironment.userID = username;
+        MQEnvironment.password = password;
+
+        qMgr = new MQQueueManager(queueManager);
+        MQQueue queue = qMgr.accessQueue(queueName, MQC.MQOO_INQUIRE | MQC.MQOO_INPUT_SHARED);
+        return queue.getCurrentDepth();
+    } catch (MQException e) {
+        e.printStackTrace();
+        return -1;
+    } finally {
+        if (qMgr != null) {
+            try {
+                qMgr.disconnect();
+            } catch (MQException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
+}

src/main/java/com/scbfkj/uni/library/script/JsScriptEngineUtil.java

@@ -25,34 +25,38 @@ public final class JsScriptEngineUtil {
                 return JSON.stringify(value);
             }
             """;
-
-
-    private static final KeyedObjectPool<String, Value> scriptPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<>() {
+    private static final String ARGS = """
+            let args = JSON.parse(params)
+            """;
+    private static final KeyedObjectPool<String, Source> sourcePool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<>() {
         @Override
-        public Value create(String script) throws Exception {
-            return Context.create("js").eval(Source.create("js", script));
+        public Source create(String script) {
+            return Source.create("js", script);
         }
 
         @Override
-        public PooledObject<Value> wrap(Value value) {
+        public PooledObject<Source> wrap(Source value) {
             return new DefaultPooledObject<>(value);
         }
 
         @Override
-        public void destroyObject(String key, PooledObject<Value> p) throws Exception {
+        public void destroyObject(String key, PooledObject<Source> p) throws Exception {
             super.destroyObject(key, p);
         }
     }, new GenericKeyedObjectPoolConfig<>());
 
 
-    public static Map<String, Object> eval( Object ...args) throws Exception {
-        Value function = null;
-        String script = ((String) args[0]);
-        List<Object> arg = Arrays.stream(args).skip(1).toList();
-        try {
-            function = scriptPool.borrowObject(script);
+    public static Map<String, Object> eval(String script, List<Map<String, Object>> args) throws Exception {
+
+        String sc = ARGS + script;
+
+        Source source = sourcePool.borrowObject(sc);
+        try (Context context = Context.create("js")) {
+            Value bindings = context.getBindings("js");
+            bindings.putMember("params", DataFormatUtil.toString(args));
+            Value function = context.eval(source);
             if (function.canExecute()) {
-                Value result = function.execute(arg.stream().map(Value::asValue).toArray());
+                Value result = function.execute();
                 return UniReturnUtil.success(toHostObject(result));
             } else {
                 return UniReturnUtil.success(toString(function));
@@ -62,8 +66,8 @@ public final class JsScriptEngineUtil {
             e.printStackTrace();
             throw e;
         } finally {
-            if (Objects.nonNull(function)) {
-                scriptPool.returnObject(script, function);
+            if (Objects.nonNull(source)) {
+                sourcePool.returnObject(sc, source);
             }
         }
     }
@@ -78,11 +82,13 @@ public final class JsScriptEngineUtil {
     }
 
     private static String toString(Value value) throws Exception {
-        Value function = scriptPool.borrowObject(TO_STRING_SCRIPT);
-        try {
+        Source source = sourcePool.borrowObject(TO_STRING_SCRIPT);
+        try (Context context = Context.create("js")) {
+            Value function = context.eval(source);
+
             return function.execute(value).asString();
         } finally {
-            scriptPool.returnObject(TO_STRING_SCRIPT, function);
+            sourcePool.returnObject(TO_STRING_SCRIPT, source);
         }
     }
 }

src/main/java/com/scbfkj/uni/process/DataBase.java

@@ -122,7 +122,6 @@ public class DataBase {
                 try (Connection connection = dataSourcePool.getConnection();
                      PreparedStatement preparedStatement = connection.prepareStatement(sql)
                 ) {
-                    List<Integer> result = new ArrayList();
                     int index = 0;
                     try {
                         while (argsList.size() > index) {
@@ -134,10 +133,13 @@ public class DataBase {
                             index++;
                         }
                         int[] ints = preparedStatement.executeBatch();
+
                         return ints;
                     } catch (SQLException e) {
                         connection.rollback();
                         throw e;
+                    }finally {
+                        connection.commit();
                     }
                 }
             } else {

src/main/java/com/scbfkj/uni/service/DataProcessService.java

@@ -114,7 +114,6 @@ public class DataProcessService {
                 long startTime = System.currentTimeMillis();
                 algorithmlibraryid = algorithmLibrary.get("algorithmlibraryid");
                 Object preConditions = algorithmLibrary.get("preconditions");
-                Object preparameterset = algorithmLibrary.get("preparameterset");
                 HashMap<String, Object> data = new HashMap<>();
 //                记录生命周期ID
                 data.put("lifecycleid", lifecycleid);
@@ -131,10 +130,10 @@ public class DataProcessService {
 
                     String preCode;
 //                    前置算法参数
-                    List<Object> params = new ArrayList<>(getParams(Optional.ofNullable(preparameterset).map(DataFormatUtil::toString).orElse(null), source));
+//                    List<Object> params = new ArrayList<>(getParams(Optional.ofNullable(preparameterset).map(DataFormatUtil::toString).orElse(null), source));
 
-                    params.add(0, DataFormatUtil.toString(preConditions));
-                    Map<String, Object> eval = JsScriptEngineUtil.eval(params.toArray());
+//                    params.add(0, DataFormatUtil.toString(preConditions));
+                    Map<String, Object> eval = JsScriptEngineUtil.eval(preConditions.toString(), resource);
 
                     preData.put("preResult", eval);
                     if (!Objects.equals(eval.get("code"), "0")) {
@@ -145,7 +144,7 @@ public class DataProcessService {
 
                     preData.put("preCode", preCode);
 //                    记录前置条件结果
-                    preData.put("preParameters", params);
+//                    preData.put("preParameters", params);
 //                    直接结束后续算法
                     if (Objects.equals("2", preCode)) {
                         break;
@@ -161,121 +160,99 @@ public class DataProcessService {
                 }
 
                 resource.add(data);
-                Object parameterSet = algorithmLibrary.get("parameterset");
-                Object dataSourceId = algorithmLibrary.get("datasourceid");
-                List<Map<String, Object>> datasourceList = DATA_BASE.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid=?", dataSourceId);
-                Map<String, Object> datasource = datasourceList.isEmpty() ? null : datasourceList.get(0);
-                List<Map<String, Object>> params = DATA_BASE.query(Config.getCenterConnectionStr(), """
+
+                Object algorithmsourcelibraryid = algorithmLibrary.get("algorithmsourcelibraryid");
+//                if (Objects.nonNull(algorithmsourcelibraryid) && !algorithmsourcelibraryid.toString().trim().isEmpty()) {
+
+                List<Map<String, Object>> algorithmsourcelibraryList = DATA_BASE.query(Config.getCenterConnectionStr(), "select * from algorithmsourcelibrary where id=? ", algorithmsourcelibraryid);
+                Map<String, Object> algorithmsourcelibrary = algorithmsourcelibraryList.get(0);
+
+                HashMap<String, Object> configMap = new HashMap<>();
+                Object methodName = algorithmsourcelibrary.get("code");
+                configMap.put("methodName", methodName);
+                configMap.put("path", algorithmsourcelibrary.get("filepath"));
+                Object className = algorithmsourcelibrary.get("library");
+                configMap.put("className", className);
+                Map<String, Object> result;
+                if ("com.scbfkj.uni.library.script.JsScriptEngineUtil".equals(className) && "eval".equals(methodName)) {
+                    String expressionStr = algorithmLibrary.get("computingexpression").toString();
+                    result = JsScriptEngineUtil.eval(expressionStr, resource);
+                } else {
+                    List<Map<String, Object>> params = DATA_BASE.query(Config.getCenterConnectionStr(), """
                         select
                         algorithmparametersid, algorithmlibraryid, parametername, subscriptionexpressions, parametertype, datasource
                         from algorithmparameters where algorithmlibraryid =?""", algorithmlibraryid.toString());
 
 //        获取入参列表
-                List<Object> parameters = new ArrayList<>();
-                for (Map<String, Object> param : params) {
-                    Object o = param.get("datasource");
-                    Object subscriptionExpressions = param.get("subscriptionexpressions");
-                    Object parameterType = param.get("parametertype");
-                    if ("0".equals(o)) {
-
-
-                    } else if ("1".equals(o)) {
-                        Object o1 = algorithmLibrary.get(subscriptionExpressions);
-                        switch (parameterType.toString()) {
-                            case "String" -> {
-                                parameters.add(DataFormatUtil.toString(o1));
-                            }
-                            case "Array" -> {
-                                parameters.add(DataFormatUtil.toList(o1));
+                    List<Object> parameters = new ArrayList<>();
+                    for (Map<String, Object> param : params) {
+                        Object o = param.get("datasource");
+                        Object subscriptionExpressions = param.get("subscriptionexpressions");
+                        Object parameterType = param.get("parametertype");
+                        if ("0".equals(o)) {
+
+
+                        } else if ("1".equals(o)) {
+                            Object o1 = algorithmLibrary.get(subscriptionExpressions);
+                            switch (parameterType.toString()) {
+                                case "String" -> {
+                                    parameters.add(DataFormatUtil.toString(o1));
+                                }
+                                case "Array" -> {
+                                    parameters.add(DataFormatUtil.toList(o1));
+                                }
+                                case "Map" -> {
+                                    parameters.add(DataFormatUtil.toMap(o1));
+                                }
+                                case "Number" -> {
+                                    parameters.add(NumberFormat.getInstance().parse(o1.toString()));
+                                }
+                                default -> {
+                                    throw new RuntimeException("参数数据类型错误");
+                                }
                             }
-                            case "Map" -> {
-                                parameters.add(DataFormatUtil.toMap(o1));
-                            }
-                            case "Number" -> {
-                                parameters.add(NumberFormat.getInstance().parse(o1.toString()));
-                            }
-                            default -> {
-                                throw new RuntimeException("参数数据类型错误");
-                            }
-                        }
 
-                    } else if ("2".equals(o)) {
-
-                        switch (parameterType.toString()) {
-                            case "String" -> {
-                                parameters.add(DataFormatUtil.toString(subscriptionExpressions));
-                            }
-                            case "Array" -> {
-                                parameters.add(DataFormatUtil.toList(subscriptionExpressions));
-                            }
-                            case "Map" -> {
-                                parameters.add(DataFormatUtil.toMap(subscriptionExpressions));
-                            }
-                            case "Number" -> {
-                                parameters.add(NumberFormat.getInstance().parse(subscriptionExpressions.toString()));
-                            }
-                            default -> {
-                                throw new RuntimeException("参数数据类型错误");
+                        } else if ("2".equals(o)) {
+
+                            switch (parameterType.toString()) {
+                                case "String" -> {
+                                    parameters.add(DataFormatUtil.toString(subscriptionExpressions));
+                                }
+                                case "Array" -> {
+                                    parameters.add(DataFormatUtil.toList(subscriptionExpressions));
+                                }
+                                case "Map" -> {
+                                    parameters.add(DataFormatUtil.toMap(subscriptionExpressions));
+                                }
+                                case "Number" -> {
+                                    parameters.add(NumberFormat.getInstance().parse(subscriptionExpressions.toString()));
+                                }
+                                default -> {
+                                    throw new RuntimeException("参数数据类型错误");
+                                }
                             }
+                        } else if ("3".equals(o)) {
+                            parameters.addAll(getParams(parameterType + ".$.args" + subscriptionExpressions.toString(), source));
                         }
-                    } else if ("3".equals(o)) {
-                        parameters.addAll(getParams(parameterType + ".$.args" + subscriptionExpressions.toString(), source));
-                    }
-
-                }
-                if (Objects.nonNull(parameterSet)) {
-                    source.put("datasource", datasource);
-//                    算法参数配置 获取算法参数 组合成String.$.datasource.host;;String.$.datasource.port;;String.$.datasource.username;;String.$.datasource.password;;List.$.args[0].result.returnData
-
 
-//                  从algorithmlibrary 的parameterSet  获取算法参数
-                    if (Objects.nonNull(parameterSet)) {
-                        parameters.addAll(getParams(parameterSet.toString(), source));
                     }
-//                    算法入参
+                    data.put("parameters", parameters);
+                    result = JavaScriptEngineUtil.invoke(configMap, methodName.toString(), parameters.toArray());
                 }
-                data.put("parameters", parameters);
-                Object algorithmsourcelibraryid = algorithmLibrary.get("algorithmsourcelibraryid");
-                if (Objects.nonNull(algorithmsourcelibraryid) && !algorithmsourcelibraryid.toString().trim().isEmpty()) {
-
-                    List<Map<String, Object>> algorithmsourcelibraryList = DATA_BASE.query(Config.getCenterConnectionStr(), "select * from algorithmsourcelibrary where id=? ", algorithmsourcelibraryid);
-                    Map<String, Object> algorithmsourcelibrary = algorithmsourcelibraryList.get(0);
-
-                    HashMap<String, Object> configMap = new HashMap<>();
-                    Object methodName = algorithmsourcelibrary.get("code");
-                    configMap.put("methodName", methodName);
-                    configMap.put("path", algorithmsourcelibrary.get("filepath"));
-                    Object className = algorithmsourcelibrary.get("library");
-                    configMap.put("className", className);
-                    Map<String, Object> result;
-                    if ("com.scbfkj.uni.library.script.JsScriptEngineUtil".equals(className) && "eval".equals(methodName)) {
-                        result = JsScriptEngineUtil.eval(parameters.toArray());
-                    } else {
-                        result = JavaScriptEngineUtil.invoke(configMap, methodName.toString(), parameters.toArray());
-                    }
-
-                    if ("0".equals(result.get("code"))) {
-                        Object returnData = result.get("returnData");
-                        if (returnData instanceof Map<?, ?> d) {
-                            if (Objects.isNull(result.get("code"))) {
-                                algorithmResult = result;
-
-                            } else {
-                                algorithmResult = (Map<String, Object>) d;
-
-                            }
-                        } else {
+                if ("0".equals(result.get("code"))) {
+                    Object returnData = result.get("returnData");
+                    if (returnData instanceof Map<?, ?> d) {
+                        if (Objects.isNull(result.get("code"))) {
                             algorithmResult = result;
-
+                        } else {
+                            algorithmResult = (Map<String, Object>) d;
                         }
                     } else {
-                        message = result.get("message").toString();
-                        throw new RuntimeException(message);
+                        algorithmResult = result;
                     }
-
                 } else {
-                    Object type = algorithmLibrary.get("algorithmtype");
-                    algorithmResult = processByAlgorithm(type, parameters);
+                    message = result.get("message").toString();
+                    throw new RuntimeException(message);
                 }
 //                    算法执行结果
                 data.put("result", algorithmResult);
@@ -360,9 +337,9 @@ public class DataProcessService {
                 return JavaScriptEngineUtil.invoke((Map<String, Object>) parameters.get(0), DataFormatUtil.toString(parameters.get(1)), parameters.subList(2, parameters.size()).toArray());
             }
             // JS表达式
-            case "2", "JS" -> {
-                return JsScriptEngineUtil.eval(parameters.toArray());
-            }
+//            case "2", "JS" -> {
+//                return JsScriptEngineUtil.eval(DataFormatUtil.toString(parameters.get(0)),);
+//            }
             // 数据库
             case "3", "DB" -> {
                 // 下放到Database中处理数据

src/main/resources/application-hw.yml

@@ -0,0 +1,12 @@
+app:
+  container:
+    code: dev
+  debug: true
+  security:
+    encrypt: false
+    enable: false
+db:
+  center:
+    config: '{"jdbcUrl":"jdbc:mysql://110.41.163.116:3306/systemset","username":"root","password":"523670","driverClassName":"com.mysql.cj.jdbc.Driver"}'
+  security:
+    config: '{"jdbcUrl":"jdbc:mysql://110.41.163.116:3306/uniauth","username":"root","password":"523670","driverClassName":"com.mysql.cj.jdbc.Driver"}'