|
@@ -244,11 +244,10 @@ public class ControlUtil {
|
|
|
infoName = (String) infoDef.get("name").value_prim.value;
|
|
|
infoValue = ControlUtil.value2CanRead(infoDef, infoValue);
|
|
|
}
|
|
|
- sb.append("[" + infoName + "]" + "设为:" + "[" + infoValue + "]");
|
|
|
- sb.append(";");
|
|
|
+ sb.append("" + infoName + "设为:" + "" + infoValue + "");
|
|
|
if (controlReason != null && !controlReason.isEmpty()) {
|
|
|
if (infoDef.get("code").value_prim.value.equals("manualAutoSet")) {
|
|
|
- sb.append("原因:" + controlReason + ";");
|
|
|
+ sb.append(",切换原因:" + controlReason + "");
|
|
|
}
|
|
|
}
|
|
|
String id = (String) sdo.get("id").value_prim.value;
|
|
@@ -264,19 +263,23 @@ public class ControlUtil {
|
|
|
.findFirst().get();
|
|
|
String status = (String) point.get("status");
|
|
|
if (status.equals("finish:success")) {
|
|
|
- sb.append("控制结果:成功;");
|
|
|
+ sb.append("*成功;");
|
|
|
} else {
|
|
|
- sb.append("控制结果:失败;");
|
|
|
+ sb.append("*失败;");
|
|
|
}
|
|
|
}
|
|
|
+ if(i < sdoList.size()-1)
|
|
|
+ {
|
|
|
+ sb.append(",");
|
|
|
+ }
|
|
|
}
|
|
|
for (int j = 1; j <= 2; j++) {
|
|
|
postParam2 = JSONObject.parseObject(postParam.toJSONString());
|
|
|
if (j == 1) {
|
|
|
- postParam2.put("details", "【" + ibmsSceneName + "】:" + ibmsxianshimingcheng + "-" + sb.toString());
|
|
|
+ postParam2.put("details", "控制:" + ibmsxianshimingcheng + "," + sb.toString());
|
|
|
postParam2.put("logSource", "user");
|
|
|
} else {
|
|
|
- postParam2.put("details", sb.toString());
|
|
|
+ postParam2.put("details", "用户控制日志."+userName+":" + ibmsxianshimingcheng + "," + sb.toString());
|
|
|
postParam2.put("logSource", "sys");
|
|
|
}
|
|
|
postParamArray.add(postParam2);
|