From 33e323fb0e6959bf838867fc5582fbcd4749abb1 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Fri, 15 Jun 2018 08:53:26 +0800 Subject: [PATCH] 数据排名接口 --- src/main/java/com/moral/controller/ScreenController.java | 138 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 110 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 7adfbde..d827c2a 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -7,16 +7,13 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.moral.entity.alarm.AlarmConfig; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.net.ftp.FTPClient; import org.apache.log4j.Logger; @@ -24,6 +21,7 @@ import org.dom4j.Element; import org.dom4j.io.SAXReader; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cglib.beans.BeanMap; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.ObjectUtils; @@ -38,7 +36,6 @@ import org.springframework.web.servlet.ModelAndView; import org.xml.sax.InputSource; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.moral.common.bean.Constants; @@ -55,7 +52,7 @@ import com.moral.entity.alarm.AlarmSensorLevel; import com.moral.service.AccountService; import com.moral.service.AlarmConfigService; -import com.moral.service.AlarmService; +import com.moral.service.AlarmDailyService; import com.moral.service.AreaService; import com.moral.service.DeviceService; import com.moral.service.HistoryMinutelyService; @@ -64,6 +61,11 @@ import com.moral.service.MonitorPointService; import com.moral.service.SensorService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + /** * The Class ScreenController.������������ */ @@ -71,6 +73,7 @@ @RequestMapping("/screen") //@CrossOrigin(origins = "*", maxAge = 3600) @SuppressWarnings({ "rawtypes", "unchecked", "unused" }) +@Api(tags = "Screen", description = "������������") public class ScreenController { public static Logger log = Logger.getLogger(ScreenController.class); @Resource @@ -113,7 +116,7 @@ private String levelKey = "alarm_"; @Resource - private AlarmService alarmService; + private AlarmDailyService alarmDailyService; /** * Screen login. ������������ * @@ -157,17 +160,52 @@ * @return the alarm levels */ @GetMapping("alarm-levels") - public Object getAlarmLevels(HttpServletRequest request, Integer orgId) { + public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId) { List<Map<String,Object>> sensorAlarmList = null; - try { - AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get(); - Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels(); - sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> { - AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key); - JSONObject alarmSensorLevelMap = (JSONObject) JSON.toJSON(alarmSensorLevel); - alarmSensorLevelMap.put("key",key); - return alarmSensorLevelMap; - }).collect(Collectors.toList()); + try { + AlarmConfig alarmConfig = null; + if(orgId.isPresent()){ + alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get(); + }else if(mpId.isPresent()){ + alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get(); + } + //��������������� + if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){ + Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels(); + // ������������������������������������������������������ + Map<String,AlarmSensorLevel> defaultSensorLevelMap = null; + if(alarmConfig.getId()!=null){ + AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue(); + defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels(); + } + Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap; + alarmLevelMap.entrySet().stream().forEach(entry -> { + //��� increment������0������������������������ + AlarmSensorLevel alarmSensorLevel = entry.getValue(); + if(alarmSensorLevel.getIncrement()!=null){ + boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0); + if(isAllZero){ + AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey()); + if(defaultAlarmSensorLevel!=null){ + alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement()); + }else{ + List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f); + alarmSensorLevel.setIncrement(tempList); + } + } + } + }); + //map to list + Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap; + sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> { + AlarmSensorLevel alarmSensorLevel = finalAlarmLevelMap.get(key); + Map<String,Object> alarmSensorLevelMap = new HashMap<>(BeanMap.create(alarmSensorLevel)); + alarmSensorLevelMap.put("key",key); + return alarmSensorLevelMap; + }).collect(Collectors.toList()); + }else{ + return new ResultBean<>("���������������������������������������������",ResultBean.FAIL); + } } catch (Exception e) { e.printStackTrace(); Map<String, Object> err = new LinkedHashMap<String, Object>(); @@ -262,7 +300,7 @@ * ������������������������������������ *********************************************/ private String fileName = "Version.xml"; - private String ip = "121.40.92.176"; + private String ip = "47.96.19.115"; private String userName = "ftp_user"; private String userPwd = "qwer1234"; private int port = 21; @@ -276,8 +314,9 @@ ftpClient.connect(ip, port); ftpClient.login(userName, userPwd); ftpClient.changeWorkingDirectory(path); - //ftpClient.enterRemotePassiveMode(); ftpClient.enterLocalPassiveMode(); + //ftpClient.enterLocalActiveMode(); + InputStream ins = ftpClient.retrieveFileStream(fileName); BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8")); String line; @@ -295,6 +334,19 @@ ftpClient.logout(); ftpClient.disconnect(); } + +// String urlStr = "http://www.7drlb.com/apps/Version.xml"; +// URL realUrl = new URL(urlStr); +// URLConnection connection = realUrl.openConnection(); +// connection.connect(); +// StringBuffer result = new StringBuffer(); +// BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8")); +// String line; +// while ((line = in.readLine()) != null) { +// result.append(line); +// } +// String content = result.toString(); + SAXReader saxReader = new SAXReader(); Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8")))); Element root = document.getRootElement(); @@ -306,6 +358,13 @@ } return version; } + + public static void main(String[] args) { + ScreenController sc = new ScreenController(); + Version a = sc.index(); + System.out.println(a.getVer()); + } + /** * ������������ * ������ @@ -320,10 +379,8 @@ @RequestMapping(value = "/map-page", method = RequestMethod.GET) public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){ Account account = accountService.getAccountById(accountId); - String regionName = areaService.selectFullNameByCode(code); + String regionName = areaService.queryFullNameByCode(code); if(account!=null&®ionName!=null){ - //������������ - regionName = regionName.replace(" ",""); Object sensors = sensorService.queryAll(); JSONObject params = new JSONObject(); params.put("regionCode",code); @@ -342,7 +399,7 @@ msg.append(" param[0] accountId:"); msg.append(accountId); log.warn(msg); - model.setViewName("401"); + model.setViewName("403"); return model; } } @@ -456,7 +513,9 @@ Map<String, Object> parameters = getParametersStartingWith(request, null); parameters.put("type", "month"); String sensorKey = "list"; - if (!ObjectUtils.isEmpty(parameters.get("sensorKey"))) { + if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) { + parameters.put("description", "description"); + } else { sensorKey = parameters.remove("sensorKey").toString(); List<String> sensorKeys = new ArrayList<String>(); sensorKeys.add(sensorKey); @@ -467,10 +526,33 @@ parameters.remove("organizationId"); } } - Map pieData = alarmService.getPieData(parameters); - + Map pieData = alarmDailyService.getPieData(parameters); List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey); - return new ResultBean<List<Map<String, Object>>>(list); } + + /** + * ���������������id������������������version��������� + * @param mptid + * @return + */ + @GetMapping("getvers") + public ResultBean<List<Integer>> getVersions(Integer mptid){ + return new ResultBean<>(monitorPointService.queryVersionsById(mptid)); + } + + @GetMapping("region_ranking_data") + @ApiOperation(value = "������������������", notes = "������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "regionCode", value = "���������", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "dimension", value = "������(profession���region���monitorPoint������)", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "int"), + }) + public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request){ + Map<String, Object> parameters = getParametersStartingWith(request, null); + List<Map<String, Object>> list = historyService.getRegionRankingData(parameters); + return new ResultBean<List<Map<String, Object>>>(list); + } + } -- Gitblit v1.8.0