From d0857416b2d72cac3b5b3cac449907c66feac737 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Mon, 15 Aug 2022 15:45:23 +0800 Subject: [PATCH] 添加虎丘区预测 --- src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 447 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 224 insertions(+), 223 deletions(-) diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java index 6ebfd4b..267a975 100644 --- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java +++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Resource; @@ -18,13 +19,10 @@ import com.alibaba.fastjson.JSONObject; import com.moral.mapper.AQIMapper; -import com.moral.mapper.AreaMapper; -import com.moral.mapper.CityMapper; import com.moral.mapper.DeviceMapper; import com.moral.mapper.WeatherMapper; import com.moral.mapper.HistoryHourlyMapper; import com.moral.mapper.MonitorPointMapper; -import com.moral.mapper.ProvinceMapper; import com.moral.service.WeatherService; @Service @@ -45,6 +43,7 @@ @Resource private HistoryHourlyMapper historyHourlyMapper; + //O3,PM2.5,PM10������������������forecast_weather��� @Override public int insertForecastWeatherNew() throws ParseException { Calendar c = Calendar.getInstance(); @@ -68,12 +67,17 @@ ks.put("cityCode", 320583); ks.put("cityId", 101190404); cityList.add(ks); - int count = 0; + Map<String, Object> hq = new HashMap<>(); + hq.put("cityCode", 320505); + hq.put("cityId", 101190406); + cityList.add(hq); + int state = 200; for (Map<String, Object> map : cityList) { + String cityCode = map.get("cityCode").toString(); String id = map.get("cityId").toString(); Map<String, Object> dataMap = restTemplate.getForObject("https://api.heweather.net/v7/weather/72h?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, id); - if (dataMap == null) { - return count; + if (!dataMap.get("code").equals("200")) { + return 500; } String json = JSONObject.toJSONString(dataMap); dataMap = (Map<String, Object>) JSONObject.parse(json); @@ -82,51 +86,18 @@ List<Map<String, Object>> hourlyList = (List<Map<String, Object>>) JSONObject.parse(string); for (Map<String, Object> hourlyMap : hourlyList) { //��������������������� - String fxTime = hourlyMap.get("fxTime").toString().split("\\+")[0].replace("T", " ") + ":00"; - hourlyMap.remove("fxTime"); + String fxTime = hourlyMap.remove("fxTime").toString().split("\\+")[0].replace("T", " ") + ":00"; //icon������������������ hourlyMap.remove("icon"); hourlyMap.put("time", fxTime); //������ String text = hourlyMap.get("text").toString(); //������km/h->m/s - Double windSpeed = Double.valueOf(hourlyMap.get("windSpeed").toString()); + double windSpeed = Double.parseDouble(hourlyMap.get("windSpeed").toString()); windSpeed = windSpeed * 1000 / 3600; hourlyMap.put("windSpeed", df.format(windSpeed)); - String condition = ""; - if ("���".equals(text)) { - condition = "100"; - } else if ("���".equals(text)) { - condition = "90"; - } else if ("������".equals(text)) { - condition = "80"; - } else if ("���".equals(text)) { - condition = "70"; - } else if ("���".equals(text) || "������".equals(text) || "������".equals(text) || "".equals(text)) { - condition = "60"; - } else if ("������".equals(text)) { - condition = "45"; - } else if ("���������".equals(text)) { - condition = "40"; - } else if ("������������������".equals(text) || "���������������".equals(text)) { - condition = "30"; - } else if ("������".equals(text)) { - condition = "20"; - } else if ("���".equals(text)) { - condition = "10"; - } else if ("������������������".equals(text)) { - condition = "5"; - } else if ("������������������".equals(text)) { - condition = "4"; - } else if ("������".equals(text) || "������".equals(text) || "������".equals(text) - || "������".equals(text) || "������".equals(text) || "������".equals(text) - || "���������".equals(text) || "���������������������������".equals(text) || "������".equals(text) - ) { - condition = "0"; - } else { - condition = "50"; - } - hourlyMap.put("condition", condition); + hourlyMap.put("windScale", String.valueOf(getWindScale(windSpeed))); + hourlyMap.put("condition", getWeatherCondition(text)); String hour = fxTime.split(" ")[0]; String hour1 = fxTime.split(":")[0]; if (hour.equals(nextDay)) { @@ -138,39 +109,42 @@ } nextDayList.remove(0); map.put("data", nextDayList); - } + //������ + c.setTime(sdf.parse(today)); + c.add(Calendar.YEAR, -3); + Date start = c.getTime(); + Date end = sdf.parse(today); + int timeUnits1 = c.get(Calendar.YEAR); + int timeUnits2 = timeUnits1 + 1; + int timeUnits3 = timeUnits1 + 2; + int timeUnits4 = timeUnits1 + 3; + //���������15��� 70%,���������45���15%,������ 15% + c.setTime(end); + c.add(Calendar.DAY_OF_MONTH, -15); + //���15��������������� + Date slicedTime1 = c.getTime(); + //���45��������������� + c.add(Calendar.DAY_OF_MONTH, -30); + Date slicedTime2 = c.getTime(); - //today:������ - c.setTime(sdf.parse(today)); - c.add(Calendar.YEAR, -3); - Date start = c.getTime(); - Date end = sdf.parse(today); - int timeUnits1 = c.get(Calendar.YEAR); - int timeUnits2 = timeUnits1 + 1; - int timeUnits3 = timeUnits1 + 2; - int timeUnits4 = timeUnits1 + 3; - //���������15��� 70%,���������45���15%,������ 15% - c.setTime(end); - c.add(Calendar.DAY_OF_MONTH, -15); - //���15��������������� - Date slicedTime1 = c.getTime(); - //���45��������������� - c.add(Calendar.DAY_OF_MONTH, -30); - Date slicedTime2 = c.getTime(); - for (Map<String, Object> map : cityList) { - String cityCode = map.get("cityCode").toString(); - ArrayList<Map<String, Object>> dataList = (ArrayList<Map<String, Object>>) map.get("data"); - for (Map<String, Object> dataMap : dataList) { + //������������������������list + List<Map<String, Object>> resultList = new ArrayList<>(); + for (Map<String, Object> nextDayMap : nextDayList) { + //O3������ Map<String, Object> hashMap = new HashMap<>(); List<String> hours = new ArrayList<>(); hashMap.put("cityCode", cityCode); hashMap.put("start", start); hashMap.put("end", end); hashMap.put("typeFormat", "%Y-%m-%d %H:%i:%s"); - Integer condition = Integer.valueOf(dataMap.get("condition").toString()); - Double temp = Double.valueOf(dataMap.get("temp").toString()); - Integer pressure = Integer.valueOf(dataMap.get("pressure").toString()); - String time = dataMap.get("time").toString(); + int condition = Integer.parseInt(nextDayMap.get("condition").toString()); + int temp = Integer.parseInt(nextDayMap.get("temp").toString()); + int pressure = Integer.parseInt(nextDayMap.get("pressure").toString()); + //��������������������� + String windDir = nextDayMap.get("windDir").toString(); + //������ + int windScale = Integer.parseInt(nextDayMap.get("windScale").toString()); + String time = nextDayMap.remove("time").toString(); //������������ hours.add(time.substring(11, 13)); c.setTime(sdf1.parse(time)); @@ -195,50 +169,93 @@ } List<Integer> years = new ArrayList<>(); Collections.addAll(years, timeUnits1, timeUnits2, timeUnits3, timeUnits4); - List<String> samples = getSample(hashMap, years); - if (samples.size() > 100) { - hashMap.put("startTemp", temp - 1.0); - hashMap.put("endTemp", temp + 1.0); - samples = getSample(hashMap, years); - if (samples.size() > 100) { - hashMap.put("startPressure", pressure - 5); - hashMap.put("endPressure", pressure + 5); - samples = getSample(hashMap, years); + //������������������ + List<Map<String, Object>> O3Samples = getSample(hashMap, years); + if (O3Samples.size() > 100) { + O3Samples = O3Samples.parallelStream() + .filter(sample -> Integer.parseInt(sample.get("temp").toString()) >= temp - 1 && Integer.parseInt(sample.get("temp").toString()) <= temp + 1) + .collect(Collectors.toList()); + if (O3Samples.size() > 100) { + O3Samples = O3Samples.parallelStream() + .filter(sample -> Integer.parseInt(sample.get("pressure").toString()) >= pressure - 5 && Integer.parseInt(sample.get("pressure").toString()) <= pressure + 5) + .collect(Collectors.toList()); } } + hashMap.put("slicedTime1", slicedTime1); hashMap.put("slicedTime2", slicedTime2); - hashMap.put("nowTemp", temp); - hashMap.put("sHour", sHour); - hashMap.put("eHour", eHour); - Map<String, List<String>> sectionTimesMap = getSectionTimes(hashMap, samples, years); + Map<String, List<String>> sectionTimesMap = getSectionTimes(hashMap, O3Samples, years); Map<String, Object> params = new HashMap<>(); params.put("cityCode", cityCode); params.put("typeFormat", "%Y-%m-%d %H:%i:%s"); + params.put("sensorKey", "O3"); + params.put("sensorKey1", "O3C"); List<String> times1 = sectionTimesMap.get("times1"); List<String> times2 = sectionTimesMap.get("times2"); List<String> times3 = sectionTimesMap.get("times3"); - Double avg1 = getAvgO3(params, times1); - Double avg2 = getAvgO3(params, times2); - Double avg3 = getAvgO3(params, times3); - Double resultO3 = avg1 * 0.7 + avg2 * 0.15 + avg3 * 0.15; - dataMap.put("O3C", String.valueOf(Math.round(resultO3))); - } + Double O3Avg1 = getAvg(params, times1); + Double O3Avg2 = getAvg(params, times2); + Double O3Avg3 = getAvg(params, times3); + double resultO3 = O3Avg1 * 0.7 + O3Avg2 * 0.15 + O3Avg3 * 0.15; + nextDayMap.put("O3C", String.valueOf(Math.round(resultO3))); + //pm2.5,pm10���������������,������������������������������ + Map<String, Object> hashMap1 = new HashMap<>(); + hashMap1.put("cityCode", cityCode); + hashMap1.put("start", start); + hashMap1.put("end", end); + hashMap1.put("typeFormat", "%Y-%m-%d %H:%i:%s"); + hashMap1.put("startTemp", temp - 1); + hashMap1.put("endTemp", temp + 1); + List<Map<String, Object>> pmSamples = getSample(hashMap1, years); + if (pmSamples.size() > 100) { + pmSamples = pmSamples.parallelStream() + .filter(sample -> Integer.parseInt(sample.get("windScale").toString()) == windScale) + .collect(Collectors.toList()); + if (pmSamples.size() > 100) { + pmSamples = pmSamples.parallelStream() + .filter(sample -> sample.get("windDir").toString().replace("\"", "").equals(windDir)) + .collect(Collectors.toList()); + if (pmSamples.size() > 100) { + pmSamples = pmSamples.parallelStream() + .filter(sample -> Integer.parseInt(sample.get("pressure").toString()) >= pressure - 5 && Integer.parseInt(sample.get("pressure").toString()) <= pressure + 5) + .collect(Collectors.toList()); + } + } + } + hashMap1.put("slicedTime1", slicedTime1); + hashMap1.put("slicedTime2", slicedTime2); + Map<String, List<String>> sectionTimesMap1 = getSectionTimes(hashMap1, pmSamples, years); + List<String> times4 = sectionTimesMap1.get("times1"); + List<String> times5 = sectionTimesMap1.get("times2"); + List<String> times6 = sectionTimesMap1.get("times3"); - List<Map<String, Object>> resultList = new ArrayList<>(); - for (Map<String, Object> dataMap : dataList) { - Map<String, Object> resultMap = new HashMap<>(); - String time = dataMap.remove("time").toString(); - Map<String, Object> params = new HashMap<>(); - params.put("cityCode", cityCode); - params.put("time", sdf1.parse(time)); + Map<String, Object> params1 = new HashMap<>(); + params1.put("cityCode", cityCode); + params1.put("typeFormat", "%Y-%m-%d %H:%i:%s"); + params1.put("sensorKey", "PM2_5"); + params1.put("sensorKey1", "PM25C"); + Double PM25Avg1 = getAvg(params1, times4); + Double PM25Avg2 = getAvg(params1, times5); + Double PM25Avg3 = getAvg(params1, times6); + params1.put("sensorKey", "PM10"); + params1.put("sensorKey1", "PM10C"); + Double PM10Avg1 = getAvg(params1, times4); + Double PM10Avg2 = getAvg(params1, times5); + Double PM10Avg3 = getAvg(params1, times6); + double resultPM25 = PM25Avg1 * 0.7 + PM25Avg2 * 0.15 + PM25Avg3 * 0.15; + nextDayMap.put("PM25C", String.valueOf(Math.round(resultPM25))); + double resultPM10 = PM10Avg1 * 0.7 + PM10Avg2 * 0.15 + PM10Avg3 * 0.15; + nextDayMap.put("PM10C", String.valueOf(Math.round(resultPM10))); + params.put("time", time); String beam = weatherMapper.getBeam(params); if (beam != null) { - dataMap.put("beam", beam.replace("\"", "")); + nextDayMap.put("beam", beam.replace("\"", "")); } + //������������������map + Map<String, Object> resultMap = new HashMap<>(); resultMap.put("cityCode", cityCode); resultMap.put("time", time); - resultMap.put("json", JSONObject.toJSONString(dataMap)); + resultMap.put("json", JSONObject.toJSONString(nextDayMap)); resultList.add(resultMap); } Map<String, Object> parameters = new HashMap<>(); @@ -248,13 +265,13 @@ parameters.put("end", c.getTime()); parameters.put("cityCode", cityCode); weatherMapper.deleteByTime(parameters); - count = count + weatherMapper.insertForecastWeather(resultList); + weatherMapper.insertForecastWeather(resultList); } - return count; + return state; } - private List<String> getSample(Map<String, Object> params, List<Integer> years) { - List<String> samples = new ArrayList<>(); + private List<Map<String, Object>> getSample(Map<String, Object> params, List<Integer> years) { + List<Map<String, Object>> samples = new ArrayList<>(); if (years.size() > 0) { for (Integer year : years) { params.put("timeUnits", year); @@ -265,28 +282,32 @@ return samples; } - private Double getAvgO3(Map<String, Object> params, List<String> times) { + private Double getAvg(Map<String, Object> params, List<String> times) { List<String> values = new ArrayList<>(); + if (times.size() == 0) { + return 0.0; + } + for (String time : times) { String s = time.substring(0, 4); params.put("time", time); - String O3 = aqiMapper.getO3ByTime(params); - if (O3 == null) { + String value = aqiMapper.getAqiFromHangzhou(params); + if (value == null) { params.put("timeUnits", s); - O3 = aqiMapper.getO3FromHistory(params); + value = aqiMapper.getAqiFromHistory(params); } - if (O3 != null) { - values.add(O3.replace("\"", "")); + if (value != null) { + values.add(value.replace("\"", "")); } } - Double sum = 0.0; - for (String value : values) { - sum += Double.valueOf(value); + double sum = 0.0; + for (String v : values) { + sum += Double.parseDouble(v); } return sum / values.size(); } - private Map<String, List<String>> getSectionTimes(Map<String, Object> params, List<String> samples, List<Integer> years) throws ParseException { + private Map<String, List<String>> getSectionTimes(Map<String, Object> params, List<Map<String, Object>> samples, List<Integer> years) throws ParseException { Map<String, List<String>> hashMap = new HashMap<>(); //���������15��� List<String> times1 = new ArrayList<>(); @@ -297,46 +318,21 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date slicedTime1 = (Date) (params.get("slicedTime1")); Date slicedTime2 = (Date) (params.get("slicedTime2")); - Double nowTemp = Double.valueOf(params.get("nowTemp").toString()); - ArrayList<String> hours = (ArrayList<String>) params.get("hours"); - for (String sample : samples) { - Date samTime = sdf.parse(sample); + for (Map<String, Object> sample : samples) { + String time = sample.get("time").toString(); + Date samTime = sdf.parse(time); if (samTime.getTime() >= slicedTime1.getTime()) { - times1.add(sample); + times1.add(time); } else if (samTime.getTime() >= slicedTime2.getTime()) { - times2.add(sample); + times2.add(time); } else { - times3.add(sample); + times3.add(time); } } + hashMap.put("times1", times1); hashMap.put("times2", times2); hashMap.put("times3", times3); - for (String key : hashMap.keySet()) { - List<String> values = hashMap.get(key); - if (values.size() == 0) { - params.put("startTemp", nowTemp - 2.0); - params.put("endTemp", nowTemp + 2.0); - if ("times1".equals(key) || "times2".equals(key)) { - years = new ArrayList<>(); - values = getSample(params, years); - } else { - values = getSample(params, years); - } - if (values.size() == 0) { - hours.add(params.get("sHour").toString()); - hours.add(params.get("eHour").toString()); - params.put("hours", hours); - if ("times1".equals(key) || "times2".equals(key)) { - years = new ArrayList<>(); - values = getSample(params, years); - } else { - values = getSample(params, years); - } - } - hashMap.put(key, values); - } - } return hashMap; } @@ -356,15 +352,15 @@ RestTemplate restTemplate = new RestTemplate(); c.setTime(new Date()); Date endTime = sdf.parse(sdf.format(c.getTime())); - c.add(Calendar.MONTH, -2); + c.add(Calendar.MONTH, -1); Date startTime = sdf.parse(sdf.format(c.getTime())); - int count = 0; + int state = 200; List<Map<String, Object>> cityList = weatherMapper.getCityWeatherConfig(); for (Map<String, Object> map : cityList) { String id = map.get("cityId").toString(); Map<String, Object> dataMap = restTemplate.getForObject("https://api.heweather.net/v7/weather/72h?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, id); - if (dataMap == null) { - return count; + if (!dataMap.get("code").equals("200")) { + return 500; } String json = JSONObject.toJSONString(dataMap); dataMap = (Map<String, Object>) JSONObject.parse(json); @@ -387,41 +383,9 @@ Double windSpeed = Double.valueOf(nextDayMap.get("windSpeed").toString()); windSpeed = windSpeed * 1000 / 3600; nextDayMap.put("windSpeed", df.format(windSpeed)); + nextDayMap.put("windScale", String.valueOf(getWindScale(windSpeed))); String text = nextDayMap.get("text").toString(); - String condition = ""; - if ("���".equals(text)) { - condition = "100"; - } else if ("���".equals(text)) { - condition = "90"; - } else if ("������".equals(text)) { - condition = "80"; - } else if ("���".equals(text)) { - condition = "70"; - } else if ("���".equals(text) || "������".equals(text) || "������".equals(text) || "".equals(text)) { - condition = "60"; - } else if ("������".equals(text)) { - condition = "45"; - } else if ("���������".equals(text)) { - condition = "40"; - } else if ("������������������".equals(text) || "���������������".equals(text)) { - condition = "30"; - } else if ("������".equals(text)) { - condition = "20"; - } else if ("���".equals(text)) { - condition = "10"; - } else if ("������������������".equals(text)) { - condition = "5"; - } else if ("������������������".equals(text)) { - condition = "4"; - } else if ("������".equals(text) || "������".equals(text) || "������".equals(text) - || "������".equals(text) || "������".equals(text) || "������".equals(text) - || "���������".equals(text) || "���������������������������".equals(text) || "������".equals(text) - ) { - condition = "0"; - } else { - condition = "50"; - } - nextDayMap.put("condition", condition); + nextDayMap.put("condition", getWeatherCondition(text)); } map.put("data", nextDayList); } @@ -554,8 +518,8 @@ sum2 = sum2 + temp * temp; } //������ - double cloud = Double.valueOf(listMap.get("cloud").toString().replace("\"", "").split("\\.")[0]); - if (listMap.get("beam") != null) { + if (listMap.get("beam") != null&&listMap.get("cloud") != null) { + double cloud = Double.valueOf(listMap.get("cloud").toString().replace("\"", "").split("\\.")[0]); double beam = Double.valueOf(listMap.get("beam").toString().replace("\"", "").split("\\.")[0]); cloudSum = cloudSum + cloud; beamSum = beamSum + beam; @@ -609,9 +573,9 @@ parameters.put("end", end); parameters.put("cityCode", cityCode); weatherMapper.deleteByTime(parameters); - count = count + weatherMapper.insertForecastWeather(resultList); + weatherMapper.insertForecastWeather(resultList); } - return count; + return state; } @Override @@ -623,12 +587,12 @@ Date now = sdf1.parse(sdf.format(c.getTime()) + ":00:00"); RestTemplate restTemplate = new RestTemplate(); List<Map<String, Object>> cityList = weatherMapper.getCityWeatherConfig(); - int count = 0; + int state = 200; for (Map<String, Object> map : cityList) { String id = map.get("cityId").toString(); Map<String, Object> dataMap = restTemplate.getForObject("https://api.heweather.net/v7/weather/now?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, id); - if (dataMap == null) { - return count; + if (!dataMap.get("code").equals("200")) { + return 500; } String json = JSONObject.toJSONString(dataMap); dataMap = (Map<String, Object>) JSONObject.parse(json); @@ -649,44 +613,81 @@ jsonMap.remove("obsTime"); jsonMap.remove("icon"); String text = jsonMap.get("text").toString(); - String condition; - if ("���".equals(text)) { - condition = "100"; - } else if ("���".equals(text)) { - condition = "90"; - } else if ("������".equals(text)) { - condition = "80"; - } else if ("���".equals(text)) { - condition = "70"; - } else if ("���".equals(text) || "������".equals(text) || "������".equals(text) || "".equals(text)) { - condition = "60"; - } else if ("������".equals(text)) { - condition = "45"; - } else if ("���������".equals(text)) { - condition = "40"; - } else if ("������������������".equals(text) || "���������������".equals(text)) { - condition = "30"; - } else if ("������".equals(text)) { - condition = "20"; - } else if ("���".equals(text)) { - condition = "10"; - } else if ("������������������".equals(text)) { - condition = "5"; - } else if ("������������������".equals(text)) { - condition = "4"; - } else if ("������".equals(text) || "������".equals(text) || "������".equals(text) - || "������".equals(text) || "������".equals(text) || "������".equals(text) - || "���������".equals(text) || "���������������������������".equals(text) || "������".equals(text) - ) { - condition = "0"; - } else { - condition = "50"; - } - jsonMap.put("condition", condition); + jsonMap.put("condition", getWeatherCondition(text)); resultMap.put("json", JSONObject.toJSONString(jsonMap)); resultList.add(resultMap); } weatherMapper.deleteRealWeather(sdf1.format(now)); - return weatherMapper.insertRealWeather(resultList); + weatherMapper.insertRealWeather(resultList); + return state; + } + + private int getWindScale(Double windSpeed) { + int windScale = 0; + if (windSpeed <= 1.5) { + windScale = 1; + } else if (windSpeed <= 3.3) { + windScale = 2; + } else if (windSpeed <= 5.4) { + windScale = 3; + } else if (windSpeed <= 7.9) { + windScale = 4; + } else if (windSpeed <= 10.7) { + windScale = 5; + } else if (windSpeed <= 13.8) { + windScale = 6; + } else if (windSpeed <= 17.1) { + windScale = 7; + } else if (windSpeed <= 20.7) { + windScale = 8; + } else if (windSpeed <= 24.4) { + windScale = 9; + } else if (windSpeed <= 28.4) { + windScale = 10; + } else if (windSpeed <= 32.6) { + windScale = 11; + } else if (windSpeed <= 36.9) { + windScale = 12; + } + return windScale; + } + + private String getWeatherCondition(String text) { + String condition; + if ("���".equals(text)) { + condition = "100"; + } else if ("���".equals(text)) { + condition = "90"; + } else if ("������".equals(text)) { + condition = "80"; + } else if ("���".equals(text)) { + condition = "70"; + } else if ("���".equals(text) || "������".equals(text) || "������".equals(text) || "".equals(text)) { + condition = "60"; + } else if ("������".equals(text)) { + condition = "45"; + } else if ("���������".equals(text)) { + condition = "40"; + } else if ("������������������".equals(text) || "���������������".equals(text)) { + condition = "30"; + } else if ("������".equals(text)) { + condition = "20"; + } else if ("���".equals(text)) { + condition = "10"; + } else if ("������������������".equals(text)) { + condition = "5"; + } else if ("������������������".equals(text)) { + condition = "4"; + } else if ("������".equals(text) || "������".equals(text) || "������".equals(text) + || "������".equals(text) || "������".equals(text) || "������".equals(text) + || "���������".equals(text) || "���������������������������".equals(text) || "������".equals(text) + ) { + condition = "0"; + } else { + condition = "50"; + } + return condition; } } + + -- Gitblit v1.8.0