3dDisplayEngine YtiotVDataServiceImpl.java 李欣儒 commit at 2020-11-24

3dDisplayEngine/buildingService/YtiotVDataServiceImpl.java

@@ -1708,3 +1708,64 @@ public class YtiotVDataServiceImpl implements YtiotVDataService {
 			if(Integer.parseInt(Start)>totalCount){
 				Start = "0";
 				Page = "0";
+			}else if(page==null)
+				Page="0";
+		}else{
+			Start = "0";
+			Page = "0";
+		}
+		json.put("page", Page);
+		json.put("start", Start);
+		json.put("limit", Limit);
+		if(order!=null) {
+			order_str = " order by "+fieldname(order)+" ";
+			
+		} else {
+			order_str = " order by data_time ";
+			dir = "DESC";
+		}
+		if(totalCount>0) {
+			List<?> list = ytiotVDataDao.SyncDataQuery(hqlwhere, order_str, dir, Start, Limit);
+			if(list.size()>0) {
+				SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				for(int i=0;i<list.size();i++) {
+					YtiotVSyncData o = (YtiotVSyncData)list.get(i);
+					YtiotVSyncDataId oid = o.getId();
+					@SuppressWarnings("rawtypes")
+					Map<String, Comparable> map = new HashMap<String, Comparable>();
+					map.put("company", oid.getCompany());
+					map.put("company_code", oid.getCompanyCode());
+					map.put("content", oid.getContent());
+					map.put("data_time", df.format(oid.getDataTime()));
+					map.put("device_id", oid.getDeviceId());
+					map.put("dwtype", oid.getDwtype());
+					map.put("id", oid.getId());
+					map.put("name", oid.getName());
+					map.put("native_id", oid.getNativeId());
+					map.put("point_code", oid.getPointCode());
+					map.put("point_data", oid.getPointData());
+					JSONObject jSONObject = JSONObject.fromObject(map);
+					jSONArray.add(jSONObject);
+				}
+				json.put("RESULT", jSONArray);
+			}
+			
+		}
+		return json.toString();
+	}
+	
+	@Override
+	public String getSyncfileDataFexcelList(String queryJson)
+			throws Exception {
+		String company_code = null;
+		String company_code_list = null;
+		String device_id = null;
+		String device_id_list = null;
+		String dwtype = null;
+		String dwtype_list = null;
+		String point_code = null;
+		String point_code_list = null;
+		String id = null;
+		String id_list = null;
+		String company = null;
+		String data_time_start = null;