Browse Source

增加查静态信息点的借款

menglu 3 years ago
parent
commit
838d2462a2

+ 6 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestApi.java

@@ -105,6 +105,12 @@ public class RestApi {
 		return result;
 	}
 
+	@PostMapping(path = { "/getEquipStaticInfoByType", "/zkt-sdk/getEquipStaticInfoByType" }, produces = "application/json;charset=UTF-8")
+	public String getEquipStaticInfoByType(@RequestBody String param, HttpServletRequest request) {
+		String result = RestUtil.getEquipStaticInfoByType(param).toJSONString();
+		return result;
+	}
+
 	/**
 	 * 根据参数获取图形URL路径
 	 *

+ 36 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

@@ -337,6 +337,42 @@ public class RestUtil {
 		return result;
 	}
 
+	public static JSONObject getEquipStaticInfoByType(String param) {
+		JSONObject result = new JSONObject();
+		try {
+			JSONObject paramObject = JSON.parseObject(param);
+			String ibmsSceneCode = paramObject.getString("ibmsSceneCode");
+			String ibmsClassCode = paramObject.getString("ibmsClassCode");
+			JSONObject queryTarget = new JSONObject();
+			queryTarget.put("Source", "zkt-class");
+			JSONObject queryCriteria = new JSONObject();
+			queryCriteria.put("ibmsSceneCode", ibmsSceneCode);
+			queryCriteria.put("ibmsClassCode", ibmsClassCode);
+			JSONObject queryParam = new JSONObject();
+			queryParam.put("QueryType", "select");
+			queryParam.put("Target", queryTarget);
+			queryParam.put("Criteria", queryCriteria);
+			String queryResult = RestUtil.query(queryParam.toString());
+			JSONArray queryArr = JSONObject.parseArray(queryResult);
+			JSONObject queryObj = queryArr.getJSONObject(0);
+			ibmsSceneCode = queryObj.getString("ibmsSceneCode");
+			ibmsClassCode = queryObj.getString("ibmsClassCode");
+			String classCode = queryObj.getString("字典编码");
+			JSONObject datas = ExeclReadEquipStaticInfoUtil.ReadEquipStaticInfoById(ibmsSceneCode, ibmsClassCode, classCode, null);
+			result.put("Content", datas);
+			result.put("Result", "success");
+
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			String message = LogUtil.GetExceptionStackTrace(e);
+			log.error(message);
+			result.put("Result", "failure");
+			result.put("ResultMsg", message);
+			result.put("ResultCode", 250);
+		}
+		return result;
+	}
+
 	public static String getAdmUrl(String param) {
 		JSONObject result = new JSONObject();
 		result.put("status", "success");

+ 28 - 21
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExeclReadEquipStaticInfoUtil.java

@@ -3,7 +3,6 @@ package com.persagy.ibms.data.sdk.util;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 
-import com.persagy.ibms.data.sdk.service.rest.RestUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -13,9 +12,8 @@ import org.apache.poi.ss.util.CellRangeAddress;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.persagy.ibms.core.data.SceneDataObject;
-import com.persagy.ibms.core.data.SceneDataSet;
 import com.persagy.ibms.core.util.FileUtil;
+import com.persagy.ibms.data.sdk.service.rest.RestUtil;
 
 public class ExeclReadEquipStaticInfoUtil {
 
@@ -48,30 +46,37 @@ public class ExeclReadEquipStaticInfoUtil {
 	}
 
 	public static JSONObject ReadEquipStaticInfoById(String objId) throws Exception {
-		RepositoryImpl Repository = RepositoryContainer.instance;
 		String ibmsSceneCode = null;
 		String ibmsClassCode = null;
-		JSONObject queryTarget=new JSONObject();
-		queryTarget.put("Source","rwd");
-		queryTarget.put("rwd","object");
-		queryTarget.put("objType","equipment");
-		JSONObject queryCriteria=new JSONObject();
-		queryCriteria.put("id",objId);
-		JSONObject queryParam=new JSONObject();
-		queryParam.put("QueryType","select");
-		queryParam.put("Target",queryTarget);
-		queryParam.put("Criteria",queryCriteria);
-		String queryResult= RestUtil.query(queryParam.toString());
-		JSONArray queryArr= JSONObject.parseArray(queryResult);
-		JSONObject queryObj=queryArr.getJSONObject(0);
-		ibmsSceneCode=queryObj.getString("ibmsSceneCode");
-		ibmsClassCode=queryObj.getString("ibmsClassCode");
-		String classCode=queryObj.getString("classCode");
+		JSONObject queryTarget = new JSONObject();
+		queryTarget.put("Source", "rwd");
+		queryTarget.put("rwd", "object");
+		queryTarget.put("objType", "equipment");
+		JSONObject queryCriteria = new JSONObject();
+		queryCriteria.put("id", objId);
+		JSONObject queryParam = new JSONObject();
+		queryParam.put("QueryType", "select");
+		queryParam.put("Target", queryTarget);
+		queryParam.put("Criteria", queryCriteria);
+		String queryResult = RestUtil.query(queryParam.toString());
+		JSONArray queryArr = JSONObject.parseArray(queryResult);
+		JSONObject queryObj = queryArr.getJSONObject(0);
+		ibmsSceneCode = queryObj.getString("ibmsSceneCode");
+		ibmsClassCode = queryObj.getString("ibmsClassCode");
+		String classCode = queryObj.getString("classCode");
 		JSONObject object = new JSONObject();
 		// 如果ibmsClassCode和ibmsSceneCode为空则返回,意味着查询失败
 		if (ibmsSceneCode == null && ibmsClassCode == null) {
 			return object;
 		}
+		object = ReadEquipStaticInfoById(ibmsSceneCode, ibmsClassCode, classCode, queryObj);
+		return object;
+	}
+
+	public static JSONObject ReadEquipStaticInfoById(String ibmsSceneCode, String ibmsClassCode, String classCode, JSONObject queryObj)
+			throws Exception {
+		RepositoryImpl Repository = RepositoryContainer.instance;
+		JSONObject object = new JSONObject();
 		// 根据ibmsSceneCode和ibmsClassCode查询对应的excel获取台账信息点
 		FileInputStream fis = new FileInputStream(FileUtil.file(ibmsSceneCode + ".xlsx"));
 		Workbook workbook = WorkbookFactory.create(new BufferedInputStream(fis));
@@ -94,7 +99,9 @@ public class ExeclReadEquipStaticInfoUtil {
 					JSONObject obj = (JSONObject) array.get(z);
 					String codeVal = obj.get("code").toString();
 					if (codeVal.equals(codeInfo)) {
-						obj.put("data", queryObj.get(codeInfo));
+						if (queryObj != null) {
+							obj.put("data", queryObj.get(codeInfo));
+						}
 						obj.put("enable", row.getCell(2).getBooleanCellValue());
 						dic.add(obj);
 						break;

+ 1 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDRepositoryUtil.java

@@ -55,6 +55,7 @@ public class RWDRepositoryUtil {
 			Repository.code2objTypeMap = RepositoryContainer.instance.code2objTypeMap;
 			Repository.classArray = RepositoryContainer.instance.classArray;
 			Repository.infoArrayDic = RepositoryContainer.instance.infoArrayDic;
+			Repository.infoArrayJson = RepositoryContainer.instance.infoArrayJson;
 			Repository.objectArrayDic = RepositoryContainer.instance.objectArrayDic;
 			Repository.objectArrayAll = RepositoryContainer.instance.objectArrayAll;
 			Repository.object2info2point = RepositoryContainer.instance.object2info2point;