|
@@ -1656,3 +1656,55 @@ public class YtiotVDataServiceImpl implements YtiotVDataService {
|
|
|
if((V_LOGINNAME!=null)&&(company_code==null)&&(Company_Code_List==null)) {
|
|
|
String where = " where u.id.agentid='"+V_LOGINNAME+"' ";
|
|
|
List list = ytiotVUserCompanyDao.query(where, null, null, null, null);
|
|
|
+ if(list.size()>0) {
|
|
|
+ for(int i=0;i<list.size();i++) {
|
|
|
+ YtiotVUsercompany o = (YtiotVUsercompany)list.get(i);
|
|
|
+ YtiotVUsercompanyId oid = o.getId();
|
|
|
+ if(i==0)
|
|
|
+ Company_Code_List = oid.getOwnerCode();
|
|
|
+ else
|
|
|
+ Company_Code_List += ","+oid.getOwnerCode();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(device_id!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("device_id")+" = '"+device_id+"' ";
|
|
|
+ else {
|
|
|
+ if(company!=null) {
|
|
|
+ hqlwhere = chkhw(hqlwhere)+" u.id."+fieldname("owner_name")+" like '%"+company+"%' ";
|
|
|
+ }
|
|
|
+ if(Company_Code_List!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere) + " u.id."+fieldname("company_code")+" in ("+Company_Code_List+") ";
|
|
|
+ else {
|
|
|
+ if(company_code!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere) + " u.id."+fieldname("company_code")+" like '%"+company_code+"%' ";
|
|
|
+ if(company_code_list!=null)
|
|
|
+ hqlwhere = chkhw(hqlwhere) + " u.id."+fieldname("company_code")+" in ("+company_code_list+") ";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ 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";
|