代码修改

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@@ -401,7 +401,7 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
        int count = 0;
        SearchSourceBuilder queryStr = elasticSearchQueryGenerator.getQueryBuilder("",jsonData);
        io.searchbox.core.SearchResult result = elasticSearchHelper.search(ConstantUtils.deviceLocationIndex,ConstantUtils.deviceLocationType,queryStr.toString());
        count = result.getTotal();
        count += result.getTotal();
        return count;
    }

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -18,7 +18,6 @@ import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.ApiOperation;
import iot.device.LocationDataVO;
import netscape.javascript.JSObject;
import org.apache.http.Consts;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.message.BasicNameValuePair;
@@ -117,20 +116,20 @@ public class MonitorPlatformService  {
            int totalCount=0;
            //小屋总数
            if(deviceType.contains("5")){
                if (org.apache.commons.lang3.StringUtils.isBlank(deviceName)||(org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName) &&"健康小屋".equals(deviceName))){
                if (org.apache.commons.lang3.StringUtils.isBlank(deviceName)||(org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName) &&deviceName.contains("健康小屋"))){
                    totalEqCount = iotEqtDetailService.getEquipmentCount();
                }
            }
            String[] categoryCodes= deviceType.split(",");
            if(categoryCodes.length==1&&"5".equals(deviceType)){
                if (org.apache.commons.lang3.StringUtils.isBlank(deviceName)||(org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName) &&"健康小屋".equals(deviceName))){
                if (org.apache.commons.lang3.StringUtils.isBlank(deviceName)||(org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName) &&deviceName.contains("健康小屋"))){
                    euipmentList = iotEqtDetailService.getEquipmentLocation(page,size);
                    envelop.getDetailModelList().addAll(euipmentList);
                }
            }
            else{
                if(deviceType.contains("5")){
                    if (org.apache.commons.lang3.StringUtils.isBlank(deviceName)||(org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName) &&"健康小屋".equals(deviceName))){
                    if (org.apache.commons.lang3.StringUtils.isBlank(deviceName)||(org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName) &&deviceName.contains("健康小屋"))){
                        euipmentList = iotEqtDetailService.getEquipmentLocation(page,size);
                        envelop.getDetailModelList().addAll(euipmentList);
                    }
@@ -147,14 +146,15 @@ public class MonitorPlatformService  {
                    }
                     if(!"5".equals(categoryCode)){
                         json = new JSONObject();
                         List<String> listTmp = new ArrayList<>();
                         if (org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName)){
                             String sql="select DISTINCT device_code from device.wlyy_devices where device_name like '%"+deviceName+"%'";
                             List<String> listTmp = jdbcTemplate.queryForList(sql,String.class);
                             String[] deviceNames = deviceName.split(",");
                             for (String tmp :deviceNames){
                                 String sql="select DISTINCT device_code from device.wlyy_devices where device_name like '%"+tmp+"%'";
                                 List<String> tmpList = jdbcTemplate.queryForList(sql,String.class);
                                 listTmp.addAll(tmpList);
                             }
                             if (listTmp.size()!=0){
                                 StringBuffer tmp = new StringBuffer(listTmp.toString());
                                 tmp =tmp.deleteCharAt(0);
                                 tmp = tmp.deleteCharAt(tmp.length()-1);
                                 json.put("andOr","and");
                                 json.put("field","deviceSn");
                                 json.put("condition","in");
@@ -179,7 +179,27 @@ public class MonitorPlatformService  {
                             List<LocationDataVO> list2 = iotPatientDeviceService.addNameAndCodeToList(locationDataVOList);
                             //figureLabelSerachService.getFigureLabelByList(locationDataVOList);
                             envelop.getDetailModelList().addAll(list2);
                             totalCount += iotPatientDeviceService.getESCount(jsonObject.toString());
                             if(org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName)){///Es too_many_clause 分开查询
                                 int tmp = listTmp.size()/1000;
                                 for (int i=0;i<=tmp;i++){
                                     jsonArray.remove(json);
                                     List<String> sunString = new ArrayList<>();
                                     if (i==tmp){
                                        sunString = listTmp.subList(i*1000,listTmp.size());
                                     }
                                     else{
                                         sunString = listTmp.subList(i*1000,(i+1)*1000);
                                     }
                                     json.put("andOr","and");
                                     json.put("field","deviceSn");
                                     json.put("condition","in");
                                     json.put("value",sunString);
                                     jsonArray.add(json);
                                     jsonObject.put("filter",jsonArray);
                                     totalCount += iotPatientDeviceService.getESCount(jsonObject.toString());
                                 }
                             }
                         }
                     }
                     if (org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName)) break;//通过deviceName查询的不过滤categpry（即所有设备中查找符合）