对象化 DataProcessService

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

@@ -36,7 +36,7 @@ public class GenericApi {
         }
         body.put("event", event);
 
-        Map<String, Object> process = DataProcessService.process(body);
+        Map<String, Object> process = new DataProcessService().process(body);
         return ResponseEntity.ok(process);
     }
 
@@ -60,7 +60,7 @@ public class GenericApi {
         }
         Object serviceid = serviceinfoList.get(0).get("serviceid");
         body.put("serviceid", serviceid);
-        return ResponseEntity.ok(DataProcessService.process(body));
+        return ResponseEntity.ok(new DataProcessService().process(body));
     }
 
 }

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

@@ -15,8 +15,8 @@ public class DataBase {
 
     public static final Map<String, Map<String, Object>> cacheDatas = new Hashtable<>();
     public static final Map<String, HikariPool> dataSourcePools = new HashMap<>();
-    private static final Map<String, List<String>> columns = new HashMap<>();
-    private static List<Map<String, Object>> cacheConfigList = new ArrayList<>();
+    public static final Map<String, List<String>> columns = new HashMap<>();
+    public static List<Map<String, Object>> cacheConfigList = new ArrayList<>();
 
     public List<Map<String, Object>> queryBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
 

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

@@ -24,7 +24,7 @@ import static org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE;
 public class FTP {
     private static final int BUFFER_SIZE = 4096;
 
-    public static Map<String, Object> update(String connectionConfig, String targetPath, String sourcePath) {
+    public Map<String, Object> update(String connectionConfig, String targetPath, String sourcePath) {
         return null;
     }
 
@@ -35,7 +35,7 @@ public class FTP {
      * @param config ftp连接配置信息
      * @return ftp客户端
      */
-    private static FTPClient createFtpClient(Map<String, Object> config) throws Exception {
+    private FTPClient createFtpClient(Map<String, Object> config) throws Exception {
         FTPClient ftp = new FTPClient();
         int port = Objects.nonNull(config.get("port")) ? Integer.parseInt(Objects.toString(config.get("port"))) : 21;
         ftp.connect(Objects.toString(config.get("host")), port);
@@ -62,7 +62,7 @@ public class FTP {
      * @param connectionConfig 连接fpt的连接信息
      * @return
      */
-    public static Map<String, Object> download(String connectionConfig, String sourcePath) {
+    public Map<String, Object> download(String connectionConfig, String sourcePath) {
 
         Map connectionConfigMaps = DataFormatUtil.toMap(connectionConfig);
         FTPClient ftp = null;

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

@@ -32,9 +32,7 @@ public class ControlService {
             List<Map<String, Object>> serviceInfos = DATA_BASE.query(Config.getCenterConnectionStr(), SERVICEINFO_WHERE_CONTAINERCODE, containerCode);
 //        循环启动
 
-            Map<String, List<Map<String, Object>>> results = serviceInfos.stream()
-                    .map(it -> stop(it.get(SERVICE_ID).toString(), containerCode))
-                    .collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
+            Map<String, List<Map<String, Object>>> results = serviceInfos.stream().map(it -> stop(it.get(SERVICE_ID).toString(), containerCode)).collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
             return UniReturnUtil.success(results);
         } catch (Exception e) {
             return UniReturnUtil.fail(e);
@@ -46,9 +44,7 @@ public class ControlService {
 //        查询服务类型为主动采集的服务
         try {
             List<Map<String, Object>> serviceInfos = DATA_BASE.query(Config.getCenterConnectionStr(), SERVICEINFO_WHERE_CONTAINERCODE, containerCode);
-            Map<String, List<Map<String, Object>>> results = serviceInfos.stream()
-                    .map(it -> start(it.get(SERVICE_ID).toString(), containerCode))
-                    .collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
+            Map<String, List<Map<String, Object>>> results = serviceInfos.stream().map(it -> start(it.get(SERVICE_ID).toString(), containerCode)).collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
             return UniReturnUtil.success(results);
         } catch (Exception e) {
             return UniReturnUtil.fail(e);
@@ -101,8 +97,12 @@ public class ControlService {
 
         boolean isCancel = Objects.equals(cancel.get(CODE), "0");
         try {
-            if (isCancel)
+            if (isCancel) {
+                DataBase.columns.clear();
+                DataBase.cacheDatas.clear();
+                DataBase.cacheConfigList.clear();
                 updateServiceState(serviceId, containerCode, "0");
+            }
         } catch (Exception e) {
             return UniReturnUtil.fail(e);
         }
@@ -120,26 +120,17 @@ public class ControlService {
                 result = DATA_BASE.query(Config.getCenterConnectionStr(), "select containerid from container where containercode=?", containerCode);
                 Object containerid = result.isEmpty() ? null : result.get(0).get("containerid");
 
-                DATA_BASE.update(Config.getCenterConnectionStr(), "insert into  servicestate(serviceid,starttime,containercode,runstate,workpath,servicename,containerid) values (?,?,?,'1',?,?,?)",
-                        serviceId,
-                        DataFormatUtil.toString(LocalDateTime.now()),
-                        containerCode,
-                        new File(".").getAbsolutePath(), servicename, containerid);
+                DATA_BASE.update(Config.getCenterConnectionStr(), "insert into  servicestate(serviceid,starttime,containercode,runstate,workpath,servicename,containerid) values (?,?,?,'1',?,?,?)", serviceId, DataFormatUtil.toString(LocalDateTime.now()), containerCode, new File(".").getAbsolutePath(), servicename, containerid);
             } else {
                 String serviceStateId = mapList.get(0).get("servicestateid").toString();
-                DATA_BASE.update(Config.getCenterConnectionStr(), "update servicestate set starttime=?,runstate='1',workpath = ? where  servicestateid = ? and containercode =?",
-                        DataFormatUtil.toString(LocalDateTime.now()),
-                        new File(".").getAbsolutePath(),
-                        serviceStateId, containerCode);
+                DATA_BASE.update(Config.getCenterConnectionStr(), "update servicestate set starttime=?,runstate='1',workpath = ? where  servicestateid = ? and containercode =?", DataFormatUtil.toString(LocalDateTime.now()), new File(".").getAbsolutePath(), serviceStateId, containerCode);
             }
         } else {
             List<Map<String, Object>> mapList = DATA_BASE.query(Config.getCenterConnectionStr(), "select servicestateid, runstate from servicestate where stoptime is  null and  serviceid=? and containercode=? order by servicestateid desc", serviceId, containerCode);
 
             if (!mapList.isEmpty()) {
                 String serviceStateId = mapList.get(0).get("servicestateid").toString();
-                DATA_BASE.update(Config.getCenterConnectionStr(), "update servicestate set stoptime=?,runstate='0' where  servicestateid = ? and containercode =?",
-                        DataFormatUtil.toString(LocalDateTime.now()),
-                        serviceStateId, containerCode);
+                DATA_BASE.update(Config.getCenterConnectionStr(), "update servicestate set stoptime=?,runstate='0' where  servicestateid = ? and containercode =?", DataFormatUtil.toString(LocalDateTime.now()), serviceStateId, containerCode);
             }
         }
     }

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

@@ -21,13 +21,13 @@ import java.util.concurrent.Executors;
 
 public class DataProcessService {
 
-    private static final DataBase DATA_BASE = new DataBase();
-    private static final DatabaseScriptUtil DATABASE_SCRIPT_UTIL = new DatabaseScriptUtil();
     //    添加一个线程池
 // 创建一个固定大小的线程池，包含2个线程
     private static final ExecutorService executor = Executors.newWorkStealingPool();
+    private final DataBase DATA_BASE = new DataBase();
+    private final DatabaseScriptUtil DATABASE_SCRIPT_UTIL = new DatabaseScriptUtil();
 
-    public static Map<String, Object> process(Map<String, Object> inData) {
+    public Map<String, Object> process(Map<String, Object> inData) {
         String lifecycleid = null;
         List<Map<String, Object>> resource = new ArrayList<>();
         List<Map<String, Object>> preResource = new ArrayList<>();
@@ -340,7 +340,7 @@ public class DataProcessService {
      * @return 处理结果
      * @throws Exception
      */
-    public static Map<String, Object> processByAlgorithm(Object type, List<Object> parameters) throws Exception {
+    public Map<String, Object> processByAlgorithm(Object type, List<Object> parameters) throws Exception {
 
         switch (type.toString().toUpperCase()) {
             // java反射
@@ -376,7 +376,7 @@ public class DataProcessService {
      * @param source       jsonpath需要取值的数据源
      * @return
      */
-    public static List<Object> getParams(String parameterSet, Object source) {
+    public List<Object> getParams(String parameterSet, Object source) {
         List<Object> res;
         if (Objects.isNull(parameterSet)) {
             res = Collections.emptyList();

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

@@ -161,7 +161,7 @@ public class LoggerService {
                                         put("datacontent", datacontentStream.map(DataFormatUtil::toMap).map(dataContent -> ((Map<String, Object>) dataContent)).toList());
                                         put("event", "1");
                                     }});
-                                    DataProcessService.processByAlgorithm("3", parameters);
+                                    new DataProcessService().processByAlgorithm("3", parameters);
                                 }
                             }
 

src/main/java/com/scbfkj/uni/system/ScheduleTask.java

@@ -29,7 +29,7 @@ public class ScheduleTask implements Runnable {
             count++;
         }
         try {
-            DataProcessService.process(new HashMap<>() {{
+            new DataProcessService().process(new HashMap<>() {{
                 put("serviceid", id);
             }});
         } catch (Exception e) {

src/test/java/com/scbfkj/uni/service/DataProcessServiceTest.java

@@ -18,7 +18,8 @@ class DataProcessServiceTest {
             put("path", "sm2-1.0-SNAPSHOT-jar-with-dependencies.jar");
             put("className", "com.bfkj.SM2");
         }};
-        Map<String, Object> map = DataProcessService.processByAlgorithm("1", new ArrayList<>() {{
+        DataProcessService dataProcessService = new DataProcessService();
+        Map<String, Object> map = dataProcessService.processByAlgorithm("1", new ArrayList<>() {{
             add(config);
             add("encrypt");
             add(data);
@@ -26,7 +27,7 @@ class DataProcessServiceTest {
         }});
         System.out.println(map);
         String data2 = map.get("returnData").toString();
-        map = DataProcessService.processByAlgorithm("1", new ArrayList<>() {{
+        map = dataProcessService.processByAlgorithm("1", new ArrayList<>() {{
             add(config);
             add("decrypt");
             add(data2);