waterAnalysisSharingEnginePush YtiotTWaterAnalysisServicesImpl.java 袁明明 commit at 2021-03-04

waterAnalysisSharingEnginePush/backgroundInterface/YtiotTWaterAnalysisServicesImpl.java

@@ -244,3 +244,28 @@ public class YtiotTEfAnalysisServicesImpl implements YtiotTEfAnalysisService {
 		json.put("page", Page);
 		json.put("start", Start);
 		json.put("limit", Limit);
+		if(totalCount>0) {
+			List list = ytiotTEfAnalysisDao.queryWater(hqlwhere, order_str, dir, Start, Limit);
+			if(list.size()>0) {
+				for(int i=0;i<list.size();i++) {
+					YtiotTWaterAnalysis o = (YtiotTWaterAnalysis)list.get(i);
+					Map map = new HashMap();
+					map.put("data_statistics", o.getDataStatistics());
+					map.put("dispersion_rate", o.getDispersionRate());
+					map.put("leakage_investigation", o.getLeakageInvestigation());
+					map.put("equipment_list", o.getEquipmentList());
+					map.put("project_situation", o.getProjectSituation());
+					map.put("statistical_period", o.getStatisticalPeriod());
+					map.put("device_association", o.getDeviceAssociation());
+					map.put("data_fluctuation", o.getDataFluctuation());
+					map.put("creat_time", formatter.format(o.getCreatTime()));
+					map.put("generation_time", o.getGenerationTime());
+					JSONObject jSONObject = JSONObject.fromObject(map);
+					jSONArray.add(jSONObject);
+				}
+				json.put("RESULT", jSONArray);
+			}
+		}
+		return json.toString();
+	}
+}