From ebd2932596b94b01fd16eca27f837f903cd7f7d1 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 25 Sep 2018 18:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9nms=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E6=89=B9=E9=87=8F=E6=8F=90?= =?UTF-8?q?=E4=BA=A4,=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=98=80=E9=97=A8?= =?UTF-8?q?=E4=B8=AD=E5=9F=9F=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=A4=96=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=97=B6=E7=9A=84=E9=98=80=E9=97=A8=E5=BA=93=E7=BC=96?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficNmsServerStatisticList.java | 31 ++++++++++++++++++ .../controller/restful/NmsInfoController.java | 32 ++++++++----------- .../restful/ConfigJedisServiceimpl.java | 2 +- .../TrafficNmsServerStatisticService.java | 21 ++++++------ src/main/resources/nis.properties | 3 +- 5 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 src/main/java/com/nis/domain/restful/TrafficNmsServerStatisticList.java diff --git a/src/main/java/com/nis/domain/restful/TrafficNmsServerStatisticList.java b/src/main/java/com/nis/domain/restful/TrafficNmsServerStatisticList.java new file mode 100644 index 0000000..101bfa5 --- /dev/null +++ b/src/main/java/com/nis/domain/restful/TrafficNmsServerStatisticList.java @@ -0,0 +1,31 @@ +package com.nis.domain.restful; + +import java.io.Serializable; +import java.util.List; + +import com.wordnik.swagger.annotations.ApiModel; + +/** + * + *

Title: TrafficNmsServerStatistic

+ *

Description: 记录nms服务器信息,全网机器总量,正常在线机器总数,异常机器列表

+ *

Company: IIE

+ * @author rkg + * @date 2018年8月17日 + * + */ +@ApiModel(value = "TrafficNmsServerStatistic对象", description = "nms上报的服务器相关信息对象类") +public class TrafficNmsServerStatisticList implements Serializable { + private static final long serialVersionUID = 1L; + + private List trafficNmsServerList; + + public List getTrafficNmsServerList() { + return trafficNmsServerList; + } + + public void setTrafficNmsServerList(List trafficNmsServerList) { + this.trafficNmsServerList = trafficNmsServerList; + } + +} diff --git a/src/main/java/com/nis/web/controller/restful/NmsInfoController.java b/src/main/java/com/nis/web/controller/restful/NmsInfoController.java index f2bca8f..7523cef 100644 --- a/src/main/java/com/nis/web/controller/restful/NmsInfoController.java +++ b/src/main/java/com/nis/web/controller/restful/NmsInfoController.java @@ -1,21 +1,19 @@ package com.nis.web.controller.restful; -import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.nis.domain.restful.TrafficNmsServerStatistic; +import com.nis.domain.restful.TrafficNmsServerStatisticList; import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestConstants; import com.nis.restful.RestServiceException; import com.nis.util.Constants; import com.nis.web.controller.BaseRestController; @@ -38,30 +36,28 @@ public class NmsInfoController extends BaseRestController { @RequestMapping(value = "/nms/v1/saveServerStatus", method = RequestMethod.POST) @ApiOperation(value = "存储NMS系统上报的服务器状态接口", httpMethod = "POST", response = Map.class, notes = "接收NMS系统上报的服务器状态信息") @ApiParam(value = "存储NMS系统上报的服务器状态接口", name = "saveServerStatus", required = true) - public Map saveServerStatus(@RequestBody TrafficNmsServerStatistic trafficNmsServerStatistic, - HttpServletRequest request, HttpServletResponse response) { + public Map saveServerStatus( + @RequestBody TrafficNmsServerStatisticList trafficNmsServerStatisticList, HttpServletRequest request, + HttpServletResponse response) { long start = System.currentTimeMillis(); AuditLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_POST, request, - trafficNmsServerStatistic); - - Map map = new HashMap(); - map.put(RestConstants.REST_SERVICE_HTTP_STATUS, HttpStatus.OK); + trafficNmsServerStatisticList); try { - TrafficNmsServerStatistic saveNmsServer = trafficNmsServerStatisticService - .saveNmsServer(trafficNmsServerStatistic); - try { - trafficNmsServerStatisticService.saveAbnormalMachine(saveNmsServer.getId(), - saveNmsServer.getAbnormalMachineList()); - } catch (Exception e) { - trafficNmsServerStatisticService.delNmsServer(saveNmsServer); - throw e; + + if (trafficNmsServerStatisticList != null && trafficNmsServerStatisticList.getTrafficNmsServerList() != null + && trafficNmsServerStatisticList.getTrafficNmsServerList().size() > 0) { + trafficNmsServerStatisticService.saveNmsInfo(trafficNmsServerStatisticList.getTrafficNmsServerList()); + } else { + throw new RestServiceException(thread, System.currentTimeMillis() - start, "参数trafficNmsServerList不能为空", + RestBusinessCode.missing_args.getValue()); } + } catch (Exception e) { throw new RestServiceException(thread, System.currentTimeMillis() - start, "上报服务器状态信息异常:" + e.getMessage(), RestBusinessCode.unknow_error.getValue()); } return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "上报服务器状态信息成功", - Constants.IS_DEBUG ? trafficNmsServerStatistic : null); + Constants.IS_DEBUG ? trafficNmsServerStatisticList : null); } } diff --git a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java index 8178a8c..9465244 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java @@ -32,7 +32,7 @@ import redis.clients.jedis.exceptions.JedisConnectionException; @Service() public class ConfigJedisServiceimpl implements ConfigRedisService { private static Logger logger = LoggerFactory.getLogger(ConfigJedisServiceimpl.class); - private static final int TAPREDISDB = Configurations.getIntProperty("tapRedisDb", 7); + private static final int TAPREDISDB = Configurations.getIntProperty("tapRedisDb", 5); // 用于在实时统计配置后面添加时间,方便读取入库时间 private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); diff --git a/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java b/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java index 4fe2b2c..93ca9b8 100644 --- a/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java +++ b/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java @@ -4,8 +4,8 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import com.nis.domain.restful.AbnormalMachine; import com.nis.domain.restful.TrafficNmsServerStatistic; import com.nis.web.dao.TrafficNmsServerStatisticDao; @@ -14,16 +14,13 @@ public class TrafficNmsServerStatisticService { @Autowired TrafficNmsServerStatisticDao trafficNmsServerStatisticDao; - public TrafficNmsServerStatistic saveNmsServer(TrafficNmsServerStatistic trafficNmsServerStatistic) { - trafficNmsServerStatisticDao.insert(trafficNmsServerStatistic); - return trafficNmsServerStatistic; - } - - public void saveAbnormalMachine(Integer id, List abnormalMachineList) { - trafficNmsServerStatisticDao.insertAbnormalMachine(id, abnormalMachineList); - } - - public void delNmsServer(TrafficNmsServerStatistic trafficNmsServerStatistic) { - trafficNmsServerStatisticDao.delete(trafficNmsServerStatistic); + @Transactional + public void saveNmsInfo(List trafficNmsServerList) { + for (TrafficNmsServerStatistic trafficNmsServerStatistic : trafficNmsServerList) { + trafficNmsServerStatisticDao.insert(trafficNmsServerStatistic); + trafficNmsServerStatisticDao.insertAbnormalMachine(trafficNmsServerStatistic.getId(), + trafficNmsServerStatistic.getAbnormalMachineList()); + } + Integer.parseInt(null); } } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 94f9fae..909fbb0 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -197,7 +197,7 @@ idRelaRedisDBIndex=15 #存储分组复用域配置的redisdb tmpStorageReuseRegionDB=15 ##阀门配置在redisdb的序号 -tapRedisDb=7 +tapRedisDb=5 ##实时统计(编译配置)数据表达式 redisStatisticsReal=[COMPILE_ID];\t;[SERVICE];\t;[ACTION];\t;[CONT_TYPE];\t;[ATTR_TYPE];\t;[CONT_LABEL];\t;[TASK_ID];\t;[AFFAIR_ID];\t;[DO_BLACKLIST];\t;[DO_LOG];\t;[EFFECTIVE_RANGE];\t;[START_TIME];\t;[END_TIME];\t;[USER_REGION];\t;[IS_VALID];\t;[GROUP_NUM];\t;[FATHER_CFG_ID];\t;[OP_TIME] @@ -205,6 +205,7 @@ redisStatisticsReal=[COMPILE_ID];\t;[SERVICE];\t;[ACTION];\t;[CONT_TYPE];\t;[ATT redisStatisticsRealDBIndex=14 #maat测试程序输出日志的文件目录 maatTestLogPath=c:/maat/mmat.log +#maatTestLogPath=/home/maat/mmat.log #样例文件存放目录,{tableType}和{fileName}会替换成具体内容 mmSampleDstPath=/home/mesasoft/{tableType}/full/{fileName}