|
@@ -348,7 +348,13 @@ public class ThreadCompute extends Thread {
|
|
}
|
|
}
|
|
for (int i = 0; i < content.size(); i++) {
|
|
for (int i = 0; i < content.size(); i++) {
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
- Entity_point detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
|
|
+ Entity_point detail = null;
|
|
|
|
+ try {
|
|
|
|
+ detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("[dy_pointlist]第{}个内容异常,数据内容为{}",i,content.getJSONObject(i));
|
|
|
|
+ throw new RuntimeException(e);
|
|
|
|
+ }
|
|
boolean match = false;
|
|
boolean match = false;
|
|
for (String data_type : data_typeList) {
|
|
for (String data_type : data_typeList) {
|
|
if (detail.data_type.equalsIgnoreCase(data_type)) {
|
|
if (detail.data_type.equalsIgnoreCase(data_type)) {
|
|
@@ -416,7 +422,13 @@ public class ThreadCompute extends Thread {
|
|
JSONArray content = QueryUtil.select(database_name, "dy_pointlist", Criteria);
|
|
JSONArray content = QueryUtil.select(database_name, "dy_pointlist", Criteria);
|
|
for (int i = 0; i < content.size(); i++) {
|
|
for (int i = 0; i < content.size(); i++) {
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
- Entity_point detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
|
|
+ Entity_point detail = null;
|
|
|
|
+ try {
|
|
|
|
+ detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("[dy_pointlist]第{}个内容异常,数据内容为{}",i,content.getJSONObject(i));
|
|
|
|
+ throw new RuntimeException(e);
|
|
|
|
+ }
|
|
if (!"Inst".equals(detail.data_type)) {
|
|
if (!"Inst".equals(detail.data_type)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -526,7 +538,13 @@ public class ThreadCompute extends Thread {
|
|
}
|
|
}
|
|
for (int i = 0; i < content.size(); i++) {
|
|
for (int i = 0; i < content.size(); i++) {
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
- Entity_point detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
|
|
+ Entity_point detail = null;
|
|
|
|
+ try {
|
|
|
|
+ detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("[dy_pointlist/dy_reportpointlist]第{}个内容异常,数据内容为{}",i,content.getJSONObject(i));
|
|
|
|
+ throw new RuntimeException(e);
|
|
|
|
+ }
|
|
if (!"Acc".equals(detail.data_type) && !"InAc".equals(detail.data_type)) {
|
|
if (!"Acc".equals(detail.data_type) && !"InAc".equals(detail.data_type)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -607,7 +625,13 @@ public class ThreadCompute extends Thread {
|
|
}
|
|
}
|
|
for (int i = 0; i < content.size(); i++) {
|
|
for (int i = 0; i < content.size(); i++) {
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
- Entity_point detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
|
|
+ Entity_point detail = null;
|
|
|
|
+ try {
|
|
|
|
+ detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("dy_pointlist/dy_reportpointlist第{}个内容异常,数据内容为{}",i,content.getJSONObject(i));
|
|
|
|
+ throw new RuntimeException(e);
|
|
|
|
+ }
|
|
if (!"Acc".equals(detail.data_type) && !"InAc".equals(detail.data_type)) {
|
|
if (!"Acc".equals(detail.data_type) && !"InAc".equals(detail.data_type)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -638,7 +662,13 @@ public class ThreadCompute extends Thread {
|
|
Map<String, Entity_point> pointMap = new HashMap<String, Entity_point>();
|
|
Map<String, Entity_point> pointMap = new HashMap<String, Entity_point>();
|
|
for (int i = 0; i < content.size(); i++) {
|
|
for (int i = 0; i < content.size(); i++) {
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
JSONObject json = (JSONObject) content.get(i);
|
|
- Entity_point detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
|
|
+ Entity_point detail = null;
|
|
|
|
+ try {
|
|
|
|
+ detail = (Entity_point) FastJsonUtil.To_JavaObject(json, Entity_point.class);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("[dy_pointlist]第{}个内容异常,数据内容为{}",i,content.getJSONObject(i));
|
|
|
|
+ throw new RuntimeException(e);
|
|
|
|
+ }
|
|
boolean match = false;
|
|
boolean match = false;
|
|
for (String data_type : data_typeList) {
|
|
for (String data_type : data_typeList) {
|
|
if (detail.data_type.equalsIgnoreCase(data_type)) {
|
|
if (detail.data_type.equalsIgnoreCase(data_type)) {
|