|
@@ -41,7 +41,11 @@ public class RWDDownloadUtil {
|
|
param.put("appId", "0");
|
|
param.put("appId", "0");
|
|
param.put("groupCode", groupCode);
|
|
param.put("groupCode", groupCode);
|
|
param.put("projectId", projectId);
|
|
param.put("projectId", projectId);
|
|
- param.put("dictType", Constant.sdk_version);
|
|
|
|
|
|
+ if (Constant.zkt_monitor_compress) {
|
|
|
|
+ param.put("dictType", Constant.sdk_version + "-compress");
|
|
|
|
+ } else {
|
|
|
|
+ param.put("dictType", Constant.sdk_version);
|
|
|
|
+ }
|
|
param.put("code", "1");
|
|
param.put("code", "1");
|
|
String post_result = HttpClientUtil.instance("zkt_monitor").post(Constant.zkt_monitor_url + "/generalDictionary/list",
|
|
String post_result = HttpClientUtil.instance("zkt_monitor").post(Constant.zkt_monitor_url + "/generalDictionary/list",
|
|
param.toJSONString());
|
|
param.toJSONString());
|
|
@@ -53,7 +57,16 @@ public class RWDDownloadUtil {
|
|
}
|
|
}
|
|
if (classArray != null && classArray.size() == 1) {
|
|
if (classArray != null && classArray.size() == 1) {
|
|
JSONObject item = (JSONObject) classArray.get(0);
|
|
JSONObject item = (JSONObject) classArray.get(0);
|
|
- FileUtil.Save(path, FastJsonUtil.toFormatString(item.get("itemData")), LogOfDownload.downloadList);
|
|
|
|
|
|
+ JSONObject itemData = item.getJSONObject("itemData");
|
|
|
|
+ JSONObject configJSON;
|
|
|
|
+ if (Constant.zkt_monitor_compress) {
|
|
|
|
+ String compressString = itemData.getString("compressString");
|
|
|
|
+ String text = GZIPCompressUtil.ungzipBase64(compressString);
|
|
|
|
+ configJSON = JSON.parseObject(text);
|
|
|
|
+ } else {
|
|
|
|
+ configJSON = itemData;
|
|
|
|
+ }
|
|
|
|
+ FileUtil.Save(path, FastJsonUtil.toFormatString(configJSON), LogOfDownload.downloadList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -99,6 +112,15 @@ public class RWDDownloadUtil {
|
|
{
|
|
{
|
|
infoCode = infoCode.substring(0, 1).toLowerCase() + infoCode.substring(1);
|
|
infoCode = infoCode.substring(0, 1).toLowerCase() + infoCode.substring(1);
|
|
}
|
|
}
|
|
|
|
+ if (feedback != null && feedback.length() > 0) {
|
|
|
|
+ feedback = feedback.substring(0, 1).toLowerCase() + feedback.substring(1);
|
|
|
|
+ }
|
|
|
|
+ if (force != null && force.length() > 0) {
|
|
|
|
+ force = force.substring(0, 1).toLowerCase() + force.substring(1);
|
|
|
|
+ }
|
|
|
|
+ if (force_feedback != null && force_feedback.length() > 0) {
|
|
|
|
+ force_feedback = force_feedback.substring(0, 1).toLowerCase() + force_feedback.substring(1);
|
|
|
|
+ }
|
|
{
|
|
{
|
|
JSONObject pointListItem = new JSONObject();
|
|
JSONObject pointListItem = new JSONObject();
|
|
pointListItem.put("ibmsSceneCode", ibmsSceneCode);
|
|
pointListItem.put("ibmsSceneCode", ibmsSceneCode);
|