Browse Source

报警增加打印信息,增加get_projectInfo

menglu 3 years ago
parent
commit
8573dcdb08

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

@@ -122,6 +122,14 @@ public class RestApi {
 		return result;
 	}
 
+	@GetMapping(path = "/get_projectInfo")
+	String get_projectInfo() {
+		JSONObject result = new JSONObject();
+		result.put("projectId", RepositoryContainer.RepositoryBase.projectId);
+		result.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
+		return JSONObject.toJSONString(result, SerializerFeature.WriteMapNullValue);
+	}
+
 	@GetMapping(path = "/get_SDKVersion")
 	public String get_SDKVersion() {
 		return "ibms-sdk";

+ 7 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -320,6 +320,8 @@ public class RWDAlarmUtil {
 					}
 				}
 				alarm.put("comments", comments);
+			} else {
+				alarm.put("comments", new JSONArray());
 			}
 		}
 		if (alarm.containsKey("comment")) {
@@ -621,6 +623,7 @@ public class RWDAlarmUtil {
 					if (paramJSON.containsKey("nature")) {
 						handleJSON.put("nature", paramJSON.get("nature"));
 					}
+					log.warn(Constant.alarm_rest_url + "/alarm-record/handleAlarm" + "\n" + handleJSON.toJSONString());
 					String post_result = HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/handleAlarm", handleJSON.toJSONString());
 					result = JSON.parseObject(post_result);
 				}
@@ -632,6 +635,7 @@ public class RWDAlarmUtil {
 					dtoJSON.put("commentTime", sdf.format(currTime));
 					commentJSON.put("id", paramJSON.get("id"));
 					commentJSON.put("alarmRecordCommentDto", dtoJSON);
+					log.warn(Constant.alarm_rest_url + "/alarm-record/updateComment" + "\n" + commentJSON.toJSONString());
 					HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/updateComment", commentJSON.toJSONString());
 					dtoJSON.put("commentTime", sdf_.format(currTime));
 					ProcessAlarm_comment((String) paramJSON.get("id"), dtoJSON);
@@ -666,6 +670,7 @@ public class RWDAlarmUtil {
 					handleJSON.put("userId", paramJSON.get("userId"));
 					handleJSON.put("id", paramJSON.get("id"));
 					handleJSON.put("alarmDescribe", "null");
+					log.warn(Constant.alarm_rest_url + "/alarmToWorkOrder/transfer" + "\n" + handleJSON.toJSONString());
 					String post_result = HttpClientUtil.post(Constant.alarm_rest_url + "/alarmToWorkOrder/transfer", handleJSON.toJSONString());
 					result = JSON.parseObject(post_result);
 				}
@@ -674,6 +679,7 @@ public class RWDAlarmUtil {
 					handleJSON.put("id", paramJSON.get("id"));
 					handleJSON.put("treatMode", 2);
 					handleJSON.put("treatState", 2);
+					log.warn(Constant.alarm_rest_url + "/alarm-record/handleAlarm" + "\n" + handleJSON.toJSONString());
 					String post_result = HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/handleAlarm", handleJSON.toJSONString());
 					result = JSON.parseObject(post_result);
 				}
@@ -685,6 +691,7 @@ public class RWDAlarmUtil {
 					dtoJSON.put("commentTime", sdf.format(currTime));
 					commentJSON.put("id", paramJSON.get("id"));
 					commentJSON.put("alarmRecordCommentDto", dtoJSON);
+					log.warn(Constant.alarm_rest_url + "/alarm-record/updateComment" + "\n" + commentJSON.toJSONString());
 					HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/updateComment", commentJSON.toJSONString());
 
 					dtoJSON.put("commentTime", sdf_.format(currTime));