1.修改配置列表查询缺省排序根据是否审核与有效标识字段,生效的配置排在前面;

2.修改黑名单选项只有在block动作时显示,其他动作不显示该属性
This commit is contained in:
zhangwei
2018-12-23 15:44:45 +06:00
parent a0e944b2ed
commit 2564a258f2
40 changed files with 132 additions and 127 deletions

View File

@@ -142,7 +142,7 @@ public class CollectVoipLogController extends BaseController {
url = Constants.LOG_BASE_URL + Constants.NTC_COLLECT_VOIP_LOG;
String jsonString = HttpClientUtil.getMsg(url, params, request);
// GsonBuilder builder = new GsonBuilder();
GsonBuilder builder = new GsonBuilder();
// builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
//
// public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT,
@@ -150,8 +150,8 @@ public class CollectVoipLogController extends BaseController {
// return new Date(json.getAsJsonPrimitive().getAsLong());
// }
// });
// Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
Gson gson = new GsonBuilder().create();
Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
// Gson gson = new GsonBuilder().create();
// gson泛型支持
LogRecvData<NtcCollectVoipLog> fromJson = gson.fromJson(jsonString,
new TypeToken<LogRecvData<NtcCollectVoipLog>>() {