|
@@ -2286,3 +2286,149 @@ public class YtiotVDataServiceImpl implements YtiotVDataService {
|
|
|
if(device_id_list!=null)
|
|
|
hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("device_id")+" in ("+device_id+") ";
|
|
|
if(dwtype!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("dwtype")+" = "+dwtype+" ";
|
|
|
+ if(dwtype_list!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("dwtype")+" in ("+dwtype_list+") ";
|
|
|
+ if(point_code!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("point_code")+" in ("+point_code+") ";
|
|
|
+ if(point_code_list!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("point_code")+" in ("+point_code_list+") ";
|
|
|
+ if(id!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("id")+" = "+id+" ";
|
|
|
+ if(id_list!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("id")+" in ("+id_list+") ";
|
|
|
+ if(data_time_start!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("data_time")+" >= '"+data_time_start+"' ";
|
|
|
+ if(data_time_end!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("data_time")+" <= '"+data_time_end+"' ";
|
|
|
+ if(name!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("name")+" like '%"+name+"%' ";
|
|
|
+ int totalCount = ytiotVDataDao.getSyncDataCount(hqlwhere);
|
|
|
+ json.put("totalCount", totalCount);
|
|
|
+ if(Start!=null){
|
|
|
+ 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 getSyncrtuDataFexcelList(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;
|
|
|
+ String data_time_end = null;
|
|
|
+ String name = null;
|
|
|
+ String Company_Code_List = null;
|
|
|
+ String V_LOGINNAME = null;
|
|
|
+ String hqlwhere = null;
|
|
|
+ String order = null;
|
|
|
+ String dir = null;
|
|
|
+ String Start = null;
|
|
|
+ String Limit = null;
|
|
|
+ String Page = null;
|
|
|
+ String order_str = null;
|
|
|
+ JSONObject q_json = null;
|
|
|
+ JSONArray Sort = null;
|
|
|
+ JSONArray jSONArray = new JSONArray();
|
|
|
+ JSONObject json = new JSONObject();
|
|
|
+ json.put("action", "getSyncDataVList");
|
|
|
+ if(queryJson!=null) {
|
|
|
+ q_json = JSONObject.fromObject(queryJson);
|
|
|
+ if(q_json.has("company_code")) {
|
|
|
+ if((q_json.optJSONObject("company_code")!=null)&&(q_json.optJSONObject("company_code").isArray())) {
|
|
|
+ JSONArray j_tmp = q_json.getJSONArray("company_code");
|
|
|
+ for(int i=0;i<j_tmp.size();i++) {
|
|
|
+ if(i==0)
|
|
|
+ company_code_list = j_tmp.getString(i);
|
|
|
+ else
|
|
|
+ company_code_list += ","+j_tmp.getString(i);
|
|
|
+ }
|
|
|
+ }else
|
|
|
+ company_code = q_json.getString("company_code");
|
|
|
+ }
|
|
|
+ if(q_json.has("device_id")) {
|
|
|
+ if((q_json.optJSONObject("device_id")!=null)&&(q_json.optJSONObject("device_id").isArray())) {
|
|
|
+ JSONArray j_tmp = q_json.getJSONArray("device_id");
|
|
|
+ for(int i=0;i<j_tmp.size();i++) {
|
|
|
+ if(i==0)
|
|
|
+ device_id_list = j_tmp.getString(i);
|
|
|
+ else
|
|
|
+ device_id_list += ","+j_tmp.getString(i);
|
|
|
+ }
|
|
|
+ }else
|
|
|
+ device_id = q_json.getString("device_id");
|
|
|
+ }
|
|
|
+
|
|
|
+ dwtype= "6";
|
|
|
+
|
|
|
+ if(q_json.has("point_code")) {
|
|
|
+ if((q_json.optJSONObject("point_code")!=null)&&(q_json.optJSONObject("point_code").isArray())) {
|
|
|
+ JSONArray j_tmp = q_json.getJSONArray("point_code");
|
|
|
+ for(int i=0;i<j_tmp.size();i++) {
|
|
|
+ if(i==0)
|
|
|
+ point_code_list = j_tmp.getString(i);
|
|
|
+ else
|
|
|
+ point_code_list += ","+j_tmp.getString(i);
|
|
|
+ }
|
|
|
+ }else
|
|
|
+ point_code = q_json.getString("point_code");
|
|
|
+ }
|
|
|
+ if(q_json.has("id")) {
|
|
|
+ if((q_json.optJSONObject("id")!=null)&&(q_json.optJSONObject("id").isArray())) {
|
|
|
+ JSONArray j_tmp = q_json.getJSONArray("id");
|
|
|
+ for(int i=0;i<j_tmp.size();i++) {
|
|
|
+ if(i==0)
|