cloudcc-cli 1.9.6 → 1.9.8

package/{core → java/com/cloudcc}/core/CCService.java

@@ -1,132 +1,49 @@
 package com.cloudcc.core;
 
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 
-/**
- * @author T.han
- * @date 2023/8/17 15:09
- * @project CloudccNewPro
- * @Description //TODO
- */
 public class CCService {
-
 	public static UserInfo userInfo;
 	public String ACCESSTOKEN;
 	public String path;
 	public String URL;
-	protected Map<String,Object> record_new;
-	protected Map<String,Object> record_old;
+	protected Map<String, Object> record_new;
+	protected Map<String, Object> record_old;
+	public Map<String, String> Config = Tool.getConfig();
 	public ServiceResult trigger = new ServiceResult();
 	public String objectApiName;
-	ResourceBundle prb = PropertyResourceBundle.getBundle("application");// 获取配置文件;
-	String orgId = prb.getString("orgId");
-	Logger logger = LoggerFactory.getLogger(this.getClass());
+	String orgId = Config.get("orgId");
 
 	public CCService(UserInfo userInfo) {
-		this.URL=getOrgApiUrl();
-		this.ACCESSTOKEN = getToken();
-		this.path = URL+ "/openApi/common";
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @Description //TODO 获取公有云api网关地址
-	 * @Author T.han
-	 * @Date 2023/8/17 15:48
-	 * @Param
-	 **/
-	public String getOrgApiUrl() {
-		String apiUrl = "";
-		String url = prb.getString("url");
-		if(!"".equals(url)){
-			String parUrl = url + "?scope=cloudccCRM&orgId=" + orgId;
-			String relStr = sendGet(parUrl);
-			JSONObject relObj = new JSONObject();
-			relObj = JSONObject.parseObject(relStr);
-			String result = relObj.getString("result");
-			if ("true".equals(result)) {
-				apiUrl = relObj.getString("orgapi_address");
-			}
-		}else {
-			apiUrl="https://quectelcrm-dev.quectel.com/ccdomaingateway/apisvc-interface";
-		}
-
-		return apiUrl;
+		this.URL = Config.get("apiSvc");
+		this.ACCESSTOKEN = Config.get("token");
+		this.path = URL + "/openApi/common";
 	}
 
-	/**
-	 * @return java.lang.String
-	 * @Description //TODO 获取token
-	 * @Author T.han
-	 * @Date 2023/8/17 16:10
-	 * @Param
-	 **/
-	public String getToken() {
-		String accessToken = "";
-		String username = prb.getString("username");
-		String safetyMark = prb.getString("safetyMark");
-		String clientId = prb.getString("clientId");
-		String secretKey = prb.getString("secretKey");
-		String grant_type = prb.getString("grant_type");
-		//拼接 parObj 参数
-		JSONObject parObj = new JSONObject();
-		parObj.put("username", username);
-		parObj.put("safetyMark", safetyMark);
-		parObj.put("clientId", clientId);
-		parObj.put("secretKey", secretKey);
-		parObj.put("orgId", orgId);
-		parObj.put("grant_type", grant_type);
-		path= URL+ "/api/cauth/token";
-		if (!"".equals(path)) {
-			String relStr = sendPost(path, parObj.toString());
-			JSONObject relObj = new JSONObject();
-			relObj = JSONObject.parseObject(relStr);
-			boolean result = relObj.getBoolean("result");
-			if (result) {
-				JSONObject data = (JSONObject)relObj.get("data");
-				if (data != null && data.containsKey("accessToken")) {
-					accessToken = relObj.getJSONObject("data").getString("accessToken");
-				} else {
-					logger.error("CCService.getToken报错：未获取到accessToken");
-				}
-			} else {
-				String returnInfo = relObj.getString("returnInfo");
-				logger.error("CCService.getToken报错：" + returnInfo);
-			}
-		} else {
-			logger.error("CCService.getToken报错：未获取到网关地址");
-		}
-		return accessToken;
-	}
-
-	/**
-	 * @return java.util.List<com.cloudcc.newxm.util.CCObject>
-	 * @Description //TODO  cquery 查询不加条件
-	 * @Author T.han
-	 * @Date 2023/8/17 16:38
-	 * @Param apiName  对象名
-	 **/
+	@SuppressWarnings("rawtypes")
 	public List<CCObject> cquery(String apiName) {
 		List<CCObject> orst = new ArrayList<CCObject>();
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "cquery"); //服务名
-		parObj.put("objectApiName", apiName); //对象名
-		parObj.put("expressions", "1=1"); //查询条件
-		parObj.put("isAddDelete", "false"); //是否包含删除数据  true:包含   false:不包含
-		parObj.put("fields", "");//查询字段  不填写时sql按 * 返回
+		parObj.put("serviceName", "cquery");
+		parObj.put("objectApiName", apiName);
+		parObj.put("expressions", "1=1");
+		parObj.put("isAddDelete", "false");
+		parObj.put("fields", "");
 
 		String relStr = CCPost(path, parObj.toString());
 		JSONObject relObj = new JSONObject();
@@ -146,23 +63,15 @@ public class CCService {
 		return orst;
 	}
 
-	/**
-	 * @return java.util.List<com.cloudcc.newxm.util.CCObject>
-	 * @Description //TODO cquery 查询方法
-	 * @Author T.han
-	 * @Date 2023/8/17 16:42
-	 * @Param apiName 对象名
-	 * @Param expression  查询条件
-	 **/
+	@SuppressWarnings("rawtypes")
 	public List<CCObject> cquery(String apiName, String expression) {
 		List<CCObject> orst = new ArrayList<CCObject>();
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "cquery"); //服务名
-		parObj.put("objectApiName", apiName); //对象名
-		parObj.put("expressions", expression); //查询条件
-		parObj.put("isAddDelete", "false"); //是否包含删除数据  true:包含   false:不包含
-		parObj.put("fields", "");//查询字段  不填写时sql按 * 返回
+		parObj.put("serviceName", "cquery");
+		parObj.put("objectApiName", apiName);
+		parObj.put("expressions", expression);
+		parObj.put("isAddDelete", "false");
+		parObj.put("fields", "");
 
 		String relStr = CCPost(path, parObj.toString());
 		JSONObject relObj = new JSONObject();
@@ -182,30 +91,20 @@ public class CCService {
 		return orst;
 	}
 
-	/**
-	 * @return java.util.List<com.cloudcc.newxm.util.CCObject>
-	 * @Description //TODO cqlQuery 查询方法
-	 * @Author T.han
-	 * @Date 2023/8/17 16:41
-	 * @Param apiName  对象名
-	 * @Param expression  查询sql
-	 **/
+	@SuppressWarnings("rawtypes")
 	public List<CCObject> cqlQuery(String apiName, String expression) {
 		List<CCObject> orst = new ArrayList<CCObject>();
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "cqlQueryWithLogInfo"); //服务名
-		parObj.put("objectApiName", apiName); //对象名
-		parObj.put("expressions", expression); //查询条件
-		//拼接接口地址
-//        String path = getOrgApiUrl() + "/openApi/common";
+		parObj.put("serviceName", "cqlQueryWithLogInfo");
+		parObj.put("objectApiName", apiName);
+		parObj.put("expressions", expression);
 		String relStr = CCPost(path, parObj.toString());
 		JSONObject relObj = new JSONObject();
 		relObj = JSONObject.parseObject(relStr);
 		String result = relObj.getString("result");
 		if ("true".equals(result)) {
 			List<Map> rst = relObj.getJSONArray("data").toJavaList(Map.class);
-			for (Map<String,Object> m : rst) {
+			for (Map m : rst) {
 				CCObject co = new CCObject(apiName);
 				for (Object _key : m.keySet()) {
 					String key = (String) _key;
@@ -217,13 +116,6 @@ public class CCService {
 		return orst;
 	}
 
-	/**
-	 * @Description //TODO update方法
-	 * @Author T.han
-	 * @Date 2023/8/18 10:02
-	 * @Param cobj
-	 * @return void
-	 **/
 	public void update(CCObject cobj) {
 		JSONArray arry = new JSONArray();
 		JSONObject obj = new JSONObject();
@@ -238,64 +130,56 @@ public class CCService {
 		}
 		arry.add(obj);
 
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "update"); //服务名
-		parObj.put("objectApiName", objectApiName); //对象名
-		parObj.put("data", arry.toString()); //查询条件
+		parObj.put("serviceName", "update");
+		parObj.put("objectApiName", objectApiName);
+		parObj.put("data", arry.toString());
 		try {
-			TriggerInvoker invoker = new TriggerInvoker(userInfo,"update","before");
+			TriggerInvoker invoker = new TriggerInvoker(userInfo, "update", "before");
 			invoker.handler(cobj);
 			String relStr = CCPost(path, parObj.toString());
 			JSONObject relObj = JSONObject.parseObject(relStr);
 			boolean result = relObj.getBoolean("result");
-			if(result){
+			if (result) {
 				JSONObject outObj = relObj.getJSONObject("data");
-				if(outObj.containsKey("ids")){
+				if (outObj.containsKey("ids")) {
 					JSONArray outData = outObj.getJSONArray("ids");
 					StringBuilder sb = new StringBuilder();
-					boolean hasSuccess = false; // 用于跟踪是否有成功处理的条目
-					for(int i=0;i < outData.size();i++) {
+					boolean hasSuccess = false;
+					for (int i = 0; i < outData.size(); i++) {
 						JSONObject acc = outData.getJSONObject(i);
-						if(acc.getBoolean("success")){
+						if (acc.getBoolean("success")) {
 							String id = acc.getString("id");
 							if (sb.length() > 0) {
 								sb.append(',');
 							}
 							sb.append(id);
 							hasSuccess = true;
-						}else{
-							logger.error("update报错: " + acc.getString("errors"));
+						} else {
+							System.err.println("update报错: " + acc.getString("errors"));
 						}
 					}
 					if (hasSuccess) {
 						String retIds = sb.toString();
-						logger.info("update成功: " + retIds);
-						cobj.put("id",retIds);
-						invoker = new TriggerInvoker(userInfo,"update","before");
+						System.out.println("update成功: " + retIds);
+						cobj.put("id", retIds);
+						invoker = new TriggerInvoker(userInfo, "update", "before");
 						invoker.handler(cobj);
 					}
-				}else{
-					logger.error("update未获取到ids 参数");
+				} else {
+					System.err.println("update未获取到ids 参数");
 				}
 
-			}else{
-				logger.error("update报错= " + relObj.getString("returnInfo"));
+			} else {
+				System.err.println("update报错= " + relObj.getString("returnInfo"));
 			}
 
 		} catch (Exception e) {
-           e.printStackTrace();
-		   logger.error("update报错= " + e);
+			e.printStackTrace();
+			System.err.println("update报错= " + e);
 		}
 	}
 
-	/**
-	 * @Description //TODO  insert 方法
-	 * @Author T.han
-	 * @Date 2023/8/18 10:27
-	 * @Param cobj 新建 json参数
-	 * @return com.cloudcc.newxm.util.ServiceResult  返回新建数据id
-	 **/
 	public ServiceResult insert(CCObject cobj) {
 		ServiceResult sr = new ServiceResult();
 		JSONArray arry = new JSONArray();
@@ -309,46 +193,43 @@ public class CCService {
 				obj.put(_key, values);
 			}
 		}
-//        cobj.remove("CCObjectAPI");
 		arry.add(obj);
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "insert"); //服务名
-		parObj.put("objectApiName", objectApiName); //对象名
-		parObj.put("data", arry.toString()); //查询条件
-		logger.info("parObj = " + parObj);
+		parObj.put("serviceName", "insert");
+		parObj.put("objectApiName", objectApiName);
+		parObj.put("data", arry.toString());
+		System.out.println("parObj = " + parObj);
 		try {
-			//执行触发器
-			TriggerInvoker invoker = new TriggerInvoker(userInfo,"insert","before");
+			TriggerInvoker invoker = new TriggerInvoker(userInfo, "insert", "before");
 			invoker.handler(cobj);
 			String relStr = CCPost(path, parObj.toString());
-			logger.info("insert_relStr = " + relStr);
+			System.out.println("insert_relStr = " + relStr);
 			JSONObject relObj = JSONObject.parseObject(relStr);
 
 			String result = relObj.getString("result");
 			if ("true".equals(result)) {
 				JSONArray outData = relObj.getJSONObject("data").getJSONArray("ids");
 				StringBuilder sb = new StringBuilder();
-				for(int i=0;i < outData.size();i++) {
+				for (int i = 0; i < outData.size(); i++) {
 					JSONObject acc = outData.getJSONObject(i);
-					if(acc.getBoolean("success")){
+					if (acc.getBoolean("success")) {
 						String id = acc.getString("id");
 						if (sb.length() > 0) {
 							sb.append(',');
 						}
 						sb.append(id);
-					}else{
-						logger.error("insert报错: " + acc.getString("errors"));
+					} else {
+						System.err.println("insert报错: " + acc.getString("errors"));
 					}
 				}
 				String retIds = sb.toString();
-				sr.put("id",retIds);
-				cobj.put("id",retIds);
-				invoker = new TriggerInvoker(userInfo,"insert","after");
+				sr.put("id", retIds);
+				cobj.put("id", retIds);
+				invoker = new TriggerInvoker(userInfo, "insert", "after");
 				invoker.handler(cobj);
 			}
 		} catch (Exception e) {
-           e.printStackTrace();
+			e.printStackTrace();
 			System.out.println("insert报错= " + e);
 		}
 		System.out.println("sr = " + sr);
@@ -356,7 +237,6 @@ public class CCService {
 	}
 
 	public ServiceResult insert(List<CCObject> datalist) {
-		// TODO Auto-generated method stub
 		ServiceResult sr = new ServiceResult();
 		JSONArray arry = new JSONArray();
 		JSONObject obj = new JSONObject();
@@ -373,52 +253,43 @@ public class CCService {
 			}
 			arry.add(obj);
 		}
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "insert"); //服务名
-		parObj.put("objectApiName", objectApiName); //对象名
-		parObj.put("data", arry.toString()); //查询条件
+		parObj.put("serviceName", "insert");
+		parObj.put("objectApiName", objectApiName);
+		parObj.put("data", arry.toString());
 		System.out.println("parObj = " + parObj);
 		try {
 			String relStr = CCPost(path, parObj.toString());
-			logger.info("insert_relStr = " + relStr);
+			System.out.println("insert_relStr = " + relStr);
 			JSONObject relObj = new JSONObject();
 			relObj = JSONObject.parseObject(relStr);
 			String result = relObj.getString("result");
 			if ("true".equals(result)) {
 				JSONArray outData = relObj.getJSONObject("data").getJSONArray("ids");
 				StringBuilder sb = new StringBuilder();
-				for(int i=0;i < outData.size();i++) {
+				for (int i = 0; i < outData.size(); i++) {
 					JSONObject acc = outData.getJSONObject(i);
-					if(acc.getBoolean("success")){
+					if (acc.getBoolean("success")) {
 						String id = acc.getString("id");
 						if (sb.length() > 0) {
 							sb.append(',');
 						}
 						sb.append(id);
-					}else{
-						logger.error("insert报错: " + acc.getString("errors"));
+					} else {
+						System.err.println("insert报错: " + acc.getString("errors"));
 					}
 				}
 				String retIds = sb.toString();
-				sr.put("id",retIds);
+				sr.put("id", retIds);
 			}
 		} catch (Exception e) {
-            e.printStackTrace();
-			logger.error("insert报错= " + e);
+			e.printStackTrace();
+			System.err.println("insert报错= " + e);
 		}
 		System.out.println("sr = " + sr);
 		return sr;
 	}
 
-
-	/**
-	 * @Description //TODO 删除方法
-	 * @Author T.han
-	 * @Date 2023/8/18 10:38
-	 * @Param cobj 参数数据 {“id”:"a1231111"}
-	 * @return void
-	 **/
 	public void delete(CCObject cobj) {
 		JSONArray arry = new JSONArray();
 		JSONObject obj = new JSONObject();
@@ -432,25 +303,21 @@ public class CCService {
 			}
 		}
 		arry.add(obj);
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "delete"); //服务名
-		parObj.put("objectApiName", objectApiName); //对象名
-		parObj.put("data", arry.toString()); //查询条件
+		parObj.put("serviceName", "delete");
+		parObj.put("objectApiName", objectApiName);
+		parObj.put("data", arry.toString());
 		System.out.println("parObj = " + parObj);
 		try {
-			TriggerInvoker invoker = new TriggerInvoker(userInfo,"delete","before");
+			TriggerInvoker invoker = new TriggerInvoker(userInfo, "delete", "before");
 			invoker.handler(cobj);
-			String relStr = CCPost(path, parObj.toString());
-			invoker = new TriggerInvoker(userInfo,"delete","after");
+			invoker = new TriggerInvoker(userInfo, "delete", "after");
 			invoker.handler(cobj);
 		} catch (Exception e) {
-//          e.printStackTrace();
-			logger.error("delete报错= " + e);
+			System.err.println("delete报错= " + e);
 		}
 	}
 
-
 	public ServiceResult upsert(CCObject cobj) {
 		ServiceResult sr = new ServiceResult();
 		JSONArray arry = new JSONArray();
@@ -465,13 +332,12 @@ public class CCService {
 			}
 		}
 		arry.add(obj);
-		//拼接 parObj 参数
 		JSONObject parObj = new JSONObject();
-		parObj.put("serviceName", "upsert"); //服务名
-		parObj.put("objectApiName", objectApiName); //对象名
-		parObj.put("data", arry.toString()); //查询条件
+		parObj.put("serviceName", "upsert");
+		parObj.put("objectApiName", objectApiName);
+		parObj.put("data", arry.toString());
 		try {
-			TriggerInvoker invoker = new TriggerInvoker(userInfo,"upsert","before");
+			TriggerInvoker invoker = new TriggerInvoker(userInfo, "upsert", "before");
 			invoker.handler(cobj);
 			String relStr = CCPost(path, parObj.toString());
 			JSONObject relObj = new JSONObject();
@@ -480,33 +346,20 @@ public class CCService {
 			if ("true".equals(result)) {
 				JSONArray outData = relObj.getJSONObject("data").getJSONArray("ids");
 				JSONObject acc = outData.getJSONObject(0);
-				if(acc.getBoolean("success")){
-					sr.put("id",acc.getString("id"));
-					cobj.put("id",acc.getString("id"));
+				if (acc.getBoolean("success")) {
+					sr.put("id", acc.getString("id"));
+					cobj.put("id", acc.getString("id"));
 				}
-				invoker = new TriggerInvoker(userInfo,"upsert","before");
+				invoker = new TriggerInvoker(userInfo, "upsert", "before");
 				invoker.handler(cobj);
 			}
 		} catch (Exception e) {
-           e.printStackTrace();
+			e.printStackTrace();
 			System.out.println("upsert报错= " + e);
 		}
 		return sr;
 	}
 
-
-
-
-
-	/**
-	 * @Description //TODO post请求
-	 * @Author T.han
-	 * @Date 2023/8/18 10:03
-	 * @Param path  接口地址 http://127.0.0.1/cloudcc/outken
-	 * @Param param 参数 json
-	 * @Param IsToken headers是否添加token  false：不添加   true:添加
-	 * @return java.lang.String
-	 **/
 	public String sendPost(String path, String param) {
 		OutputStreamWriter out = null;
 		BufferedReader br = null;
@@ -516,27 +369,19 @@ public class CCService {
 		try {
 			URL url = new URL(path);
 			HttpURLConnection conn = null;
-			// 打开和URL之间的连接
 			conn = (HttpURLConnection) url.openConnection();
-			// 发送POST请求必须设置如下两行
 			conn.setDoOutput(true);
 			conn.setDoInput(true);
-			conn.setRequestMethod("POST");    // POST方法
-			conn.setConnectTimeout(15 * 1000);// 设置连接超时时间为5秒
-			conn.setReadTimeout(20 * 1000);// 设置读取超时时间为20秒
-			String tokens = "";
-			// 设置通用的请求属性
+			conn.setRequestMethod("POST");
+			conn.setConnectTimeout(15 * 1000);
+			conn.setReadTimeout(20 * 1000);
 			conn.setRequestProperty("Content-Type", "application/json");
 			conn.setRequestProperty("accept", "*/*");
 			conn.connect();
-			// 获取URLConnection对象对应的输出流
 			out = new OutputStreamWriter(conn.getOutputStream());
-			// 发送请求参数
 			BufferedWriter bw = new BufferedWriter(out);
 			bw.write(param);
-			// flush输出流的缓冲
 			bw.flush();
-			// 定义BufferedReader输入流来读取URL的响应
 			br = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
 			String line;
 			while ((line = br.readLine()) != null) {
@@ -575,28 +420,20 @@ public class CCService {
 		try {
 			URL url = new URL(path);
 			HttpURLConnection conn = null;
-			// 打开和URL之间的连接
 			conn = (HttpURLConnection) url.openConnection();
-			// 发送POST请求必须设置如下两行
 			conn.setDoOutput(true);
 			conn.setDoInput(true);
-			conn.setRequestMethod("POST");    // POST方法
-			conn.setConnectTimeout(15 * 1000);// 设置连接超时时间为5秒
-			conn.setReadTimeout(20 * 1000);// 设置读取超时时间为20秒
-			String tokens = "";
-			// 设置通用的请求属性
+			conn.setRequestMethod("POST");
+			conn.setConnectTimeout(15 * 1000);
+			conn.setReadTimeout(20 * 1000);
 			conn.setRequestProperty("Content-Type", "application/json");
 			conn.setRequestProperty("accept", "*/*");
 			conn.setRequestProperty("accessToken", ACCESSTOKEN);
 			conn.connect();
-			// 获取URLConnection对象对应的输出流
 			out = new OutputStreamWriter(conn.getOutputStream());
-			// 发送请求参数
 			BufferedWriter bw = new BufferedWriter(out);
 			bw.write(param);
-			// flush输出流的缓冲
 			bw.flush();
-			// 定义BufferedReader输入流来读取URL的响应
 			br = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
 			String line;
 			while ((line = br.readLine()) != null) {
@@ -626,13 +463,6 @@ public class CCService {
 		return result;
 	}
 
-	/**
-	 * @Description //TODO GET请求方法
-	 * @Author T.han
-	 * @Date 2023/8/18 10:06
-	 * @Param path 地址   http://127.0.0.1/cloudcc/outoken?key1=value1&key2=value2
-	 * @return java.lang.String
-	 **/
 	public static String sendGet(String path) {
 		StringBuffer sb = new StringBuffer();
 		String exception = "";
@@ -642,7 +472,7 @@ public class CCService {
 			InputStream is = url.openStream();
 			InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
 			BufferedReader br = new BufferedReader(isr);
-			String line;//读取数据
+			String line;
 			while ((line = br.readLine()) != null) {
 				sb.append(line);
 			}
@@ -661,52 +491,32 @@ public class CCService {
 		return result;
 	}
 
-	/**
-     * 获取自定义列表设置
-     * @param api 接口名称，用于指定获取哪个接口的自定义设置
-     * @return 返回一个包含自定义设置数据的Map对象
-     */
-    public Map<String,Object> getListCustomSetting(String api) {
-
-        // 初始化数据映射对象，用于存放最终返回的数据
-		Map<String,Object> datMap = new HashMap<String,Object>();
-
-		// 创建参数数组，用于存放调用接口的参数
-		JSONArray argArray	= new JSONArray();
+	public Map<String, Object> getListCustomSetting(String api) {
+		Map<String, Object> datMap = new HashMap<String, Object>();
+		JSONArray argArray = new JSONArray();
 		JSONObject arryStr = new JSONObject();
 		arryStr.put("argType", String.class);
 		arryStr.put("argValue", api);
 		argArray.add(arryStr);
 
 		JSONObject parObj = new JSONObject();
-		parObj.put("className", "upsert"); //服务名
-		parObj.put("methodName", "getListCustomSetting"); //方法名
-		parObj.put("params", argArray); //查询条件
+		parObj.put("className", "upsert");
+		parObj.put("methodName", "getListCustomSetting");
+		parObj.put("params", argArray);
 		try {
 			String relStr = CCPost(path, parObj.toString());
 			JSONObject.parseObject(relStr);
-			ObjectMapper objectMapper = new ObjectMapper();
-			// 将对象描述转换为字符串并添加到结果中
-			datMap = objectMapper.convertValue(objectMapper, Map.class);
 		} catch (Exception e) {
 			e.printStackTrace();
-			logger.error("upsert报错= " + e);
+			System.err.println("upsert报错= " + e);
 		}
 
 		return datMap;
-    }
-	/**
-	 * 获取自定义设置列表。
-	 * 通过调用指定API和键值，来获取相应的自定义设置数据。
-	 * @author admin
-	 * @Version Created on 2024.4.10
-	 * @param api 要调用的API名称。
-	 * @param key 查询设置列表时使用的键值。
-	 * @return 返回一个包含自定义设置数据的Map对象。如果发生错误，可能返回空或错误信息的Map。
-	 */
-    public Map<String,Object> getListCustomSetting(String api, String key) {
-        Map<String,Object> datMap = new HashMap<String,Object>();
-		JSONArray argArray	= new JSONArray();
+	}
+
+	public Map<String, Object> getListCustomSetting(String api, String key) {
+		Map<String, Object> datMap = new HashMap<String, Object>();
+		JSONArray argArray = new JSONArray();
 
 		JSONObject apiParam = new JSONObject();
 		apiParam.put("argType", String.class);
@@ -719,25 +529,22 @@ public class CCService {
 		argArray.add(keyParam);
 
 		JSONObject parObj = new JSONObject();
-		parObj.put("className", "TCCCustomSetting"); //服务名
-		parObj.put("methodName", "getListCustomSetting"); //方法名
-		parObj.put("params", argArray); //查询条件
+		parObj.put("className", "TCCCustomSetting");
+		parObj.put("methodName", "getListCustomSetting");
+		parObj.put("params", argArray);
 
 		try {
 			String relStr = CCPost(path, parObj.toString());
 			JSONObject.parseObject(relStr);
-			ObjectMapper objectMapper = new ObjectMapper();
-			// 将对象描述转换为字符串并添加到结果中
-			datMap = objectMapper.convertValue(objectMapper, Map.class);
 		} catch (Exception e) {
 			e.printStackTrace();
-			logger.error("upsert报错= " + e);
+			System.err.println("upsert报错= " + e);
 		}
 
 		return datMap;
-    }
+	}
 
-	public Map cqueryForEs(String account, String where, String aTrue, String s) {
+	public HashMap<String, Object> cqueryForEs(String account, String where, String aTrue, String s) {
 		return null;
 	}
 
@@ -746,61 +553,59 @@ public class CCService {
 	}
 
 	public List<CCObject> cqueryWithRoleRight(String service_record, String s) {
-		return  null;
+		return null;
 	}
 
 	public ServiceResult insert(CCObject reminder, boolean b, boolean b1, boolean b2, boolean b3) {
-        return null;
-    }
+		return null;
+	}
 
-	public void addCaseTeam(List<Map> caseteamList, String recordid) {
+	public void addCaseTeam(List<HashMap<String, Object>> caseteamList, String recordid) {
 	}
 
-    public ServiceResult update(CCObject serv, boolean b, boolean b1, boolean b2, boolean b3) {
+	public ServiceResult update(CCObject serv, boolean b, boolean b1, boolean b2, boolean b3) {
 		return null;
-    }
+	}
+
 	public ServiceResult insertLt(CCObject in) throws Exception {
-		// TODO Auto-generated method stub
 		List<CCObject> datalist = new ArrayList<CCObject>();
 		datalist.add(in);
 		insert(datalist);
 		return null;
 	}
 
-	public ServiceResult updateLt(CCObject objectData) throws Exception  {
-		// TODO Auto-generated method stub
-		//不执行触发器
+	public ServiceResult updateLt(CCObject objectData) throws Exception {
 		return null;
 	}
 
 	public void addMicroPost(String string, Object object, Object object2, Object object3, Object object4,
-							 Object object5, Object object6, String string2, String emailSubject, String string3, String stkhid,
-							 String stkhid2) {
-		// TODO Auto-generated method stub
-
+			Object object5, Object object6, String string2, String emailSubject, String string3, String stkhid,
+			String stkhid2) {
 	}
 
-	public String sendEmail(String subject, String htmlBody, String toAddress, String relatedid, String ccaddress, String bccaddress, String attachmentId, String s, String s1) {
+	public String sendEmail(String subject, String htmlBody, String toAddress, String relatedid, String ccaddress,
+			String bccaddress, String attachmentId, String s, String s1) {
 		return "";
 	}
 
-	public String uploadAttachment(Map m){
+	public String uploadAttachment(HashMap<String, Object> m) {
 		return null;
 	}
 
 	public void deleteShareObjectBySql(String account, String s) {
 
 	}
-    public List<CCObject> cqueryByFields(String object, String exp, String fileds) {
+
+	public List<CCObject> cqueryByFields(String object, String exp, String fileds) {
 		return null;
-    }
+	}
 
 	public String submitForApproval(String id, String s, String s1) {
 		return null;
 	}
 
-    public String process(String processType, String tid, String touserId, String comments, String appPath) {
+	public String process(String processType, String tid, String touserId, String comments, String appPath) {
 		return null;
-    }
+	}
 
 }