Skip to content

A
AmosBankRoot
Commit 5360ac70 authored by 吴俊凯's avatar 吴俊凯
Browse files
Options

1.4.0.2版本修改代码提交

parent 27aead40
Show whitespace changes
Inline Side-by-side
Showing with 677 additions and 182 deletions
AmosBankCommon/src/main/java/com/yeejoin/amos/bank/common/enums/AlarmPointEnum.java
View file @ 5360ac70
......@@ -15,8 +15,9 @@ public enum AlarmPointEnum {
未确认已清除("未确认已清除", "未确认已清除"),
已确认未清除("已确认未清除", "已确认未清除"),
已确认已清除("已确认已清除", "已确认已清除"),
正常("正常", "正常"),
异常("异常", "异常"),
正常("正常", "正常");
告警("告警", "告警"),;
/**
* 名称，描述
......
AmosBankCommon/src/main/java/com/yeejoin/amos/bank/dao/entity/AlarmPoint.java
View file @ 5360ac70
......@@ -67,6 +67,16 @@ public class AlarmPoint {
@Column(name = "point_attrs")
private String pointAttrs;//告警点信息
@Column(name = "cpbl_id")
private Long cpblId;//告警指标ID
public Long getTarget() {
return cpblId;
}
public void setTarget(Long target) {
this.cpblId = target;
}
public Date getUpdateDate() {
return updateDate;
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/DeviceListener.java
View file @ 5360ac70
......@@ -109,13 +109,13 @@ public class DeviceListener extends EmqxListener implements InitializingBean {
List<Long> riskFactorId = equipmentMapper.judgeEquipmentExists(equipmentsPointId);
Integer value = 0;
if (Double.valueOf(statusName) >= CRITICAL_TEMPERATURE) {
value = DevicePointEnum.getValue("异常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
} else {
value = DevicePointEnum.getValue("正常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
}
// if (Double.valueOf(statusName) >= CRITICAL_TEMPERATURE) {
// value = DevicePointEnum.getValue("异常");
// equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
// } else {
// value = DevicePointEnum.getValue("正常");
// equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
// }
System.out.println("----shudu riskFactorId : "+ riskFactorId);
......@@ -131,7 +131,7 @@ public class DeviceListener extends EmqxListener implements InitializingBean {
}
}
if (remark.equals("temperatureAlarm") || remark.equals("humidityAlarm")) {
if ("告警".equals(statusName)||"异常".equals(statusName)||"正常".equals(statusName)) {
System.out.println("----start chuli device temperatureAlarm : "+ remark);
EquipmentQualityVo queryEquipmentPoint = equipmentMapper.queryEquipmentPoint(eqpId, remark);
System.out.println("----update device queryEquipmentPoint :"+ queryEquipmentPoint);
......@@ -156,6 +156,7 @@ public class DeviceListener extends EmqxListener implements InitializingBean {
System.out.println("----update device state fail : "+ riskFactorId);
}
}
}
});
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/constants/AlarmConstant.java
View file @ 5360ac70
......@@ -14,6 +14,8 @@ public class AlarmConstant {
public static String ALARM_NORMAL_STATUS = "清除";
public static String ALARM_ABNORMAL_STATUS = "告警";
public static String ALARM_DEVICE = "警告告警";
public static String ALARM_DEVICE_TYPE = "监测设备告警";
public static String ALARM_DEVICE_TYPE = "动环告警";
public static String ALARM_DEVICE_AlARAM = "监测异常";
public static String ALARM_DEVICE_MAJOR = "重要告警";
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/controller/AlarmPointController.java
View file @ 5360ac70
package com.yeejoin.amos.bank.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonArray;
import com.yeejoin.amos.bank.dao.entity.AlarmPoint;
import com.yeejoin.amos.bank.dao.repository.ITopographyNodeDetailRepository;
import com.yeejoin.amos.bank.param.DepartmentBo;
import com.yeejoin.amos.bank.service.IAlarmPointService;
import com.yeejoin.amos.bank.service.IAlarmService;
......@@ -19,12 +23,15 @@ import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
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 java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
......@@ -47,7 +54,8 @@ public class AlarmPointController extends BaseController {
private IAlarmService iAlarmService;
@Autowired
private RemoteSecurityService remoteSecurityService;
@Autowired
private ITopographyNodeDetailRepository iTopographyNodeDetailDao;
/**
* 获取告警数据
*
......@@ -312,8 +320,103 @@ public class AlarmPointController extends BaseController {
return departmentBos;
}
/**
* 获取七天告警数据统计
*
* @return 告警数据
*/
@GetMapping(value = "/statistics", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "七天告警数据统计", notes = "七天告警数据统计")
public CommonResponse getStatisticsAlarms() throws ParseException {
Map<String,Object> result = alarmPointService.getSevenDayscount();
return CommonResponseUtil.success(result);
}
/**
* 首页动环信息展示
*
* @return 告警数据
*/
@GetMapping(value = "/mobile/show", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "首页动环信息展示", notes = "首页动环信息展示")
public CommonResponse getMobileShow() {
List<Map<String,Object>> detailList = iTopographyNodeDetailDao.HomePageDetail();
List<Map<String,String>> changeList = new ArrayList<>();
for (int i = 0; i <detailList.size() ; i++) {
Map<String,String > map = new HashMap<>();
if(StringUtils.isEmpty(detailList.get(i).get("nodeid"))){
break;
}
map.put("nodeid",detailList.get(i).get("nodeid").toString());
map.put("text",detailList.get(i).get("text").toString());
JSONArray array = JSONArray.parseArray(detailList.get(i).get("node_detail").toString());
if(StringUtils.isEmpty(array)){
break;
}
if("3-0025".equals(detailList.get(i).get("nodeid").toString())||"3-0026".equals(detailList.get(i).get("nodeid").toString())){
map.put("area","西安");
for (int j = 0; j <array.size() ; j++) {
JSONObject detail = JSONObject.parseObject(array.get(j).toString());
if(detail.get("name").toString().equals("烟感探测器报警")){
map.put("value",detail.get("value").toString());
}
if(detail.get("name").toString().equals("漏水监测报警")){
map.put("value",detail.get("value").toString());
}
}
}else if("3-0044".equals(detailList.get(i).get("nodeid").toString())||"3-0045".equals(detailList.get(i).get("nodeid").toString())){
map.put("area","咸阳");
for (int j = 0; j <array.size() ; j++) {
JSONObject detail = JSONObject.parseObject(array.get(j).toString());
if(detail.get("name").toString().equals("烟感探测器报警")){
map.put("value",detail.get("value").toString());
}
if(detail.get("name").toString().equals("漏水监测报警")){
map.put("value",detail.get("value").toString());
}
}
}else{
for (int j = 0; j <array.size() ; j++) {
JSONObject detail = JSONObject.parseObject(array.get(j).toString());
if(detail.get("name").toString().equals("温度")||detail.get("name").toString().equals("室内温度")){
map.put("value",detail.get("value").toString());
}
}
}
changeList.add(map);
}
Map<String,Object> result = new HashMap<>();
List<Map<String,String>> QSZXList = new ArrayList<>();
List<Map<String,String>> SBJXList = new ArrayList<>();
List<Map<String,String>> HBList = new ArrayList<>();
List<Map<String,String>> XFJCList = new ArrayList<>();
List<Map<String,String>> LSJCList = new ArrayList<>();
for (int i = 0; i <changeList.size() ; i++) {
if ("1#温湿度".equals(changeList.get(i).get("text")) || "2#温湿度".equals(changeList.get(i).get("text"))) {
QSZXList.add(changeList.get(i));
}
if ("3#温湿度".equals(changeList.get(i).get("text")) || "4#温湿度".equals(changeList.get(i).get("text"))) {
SBJXList.add(changeList.get(i));
}
if ("1温湿度".equals(changeList.get(i).get("text")) || "5温湿度".equals(changeList.get(i).get("text"))) {
HBList.add(changeList.get(i));
}
if ("3-0044".equals(changeList.get(i).get("nodeid")) || "3-0025".equals(changeList.get(i).get("nodeid"))) {
XFJCList.add(changeList.get(i));
}
if ("3-0026".equals(changeList.get(i).get("nodeid")) || "3-0045".equals(changeList.get(i).get("nodeid"))) {
LSJCList.add(changeList.get(i));
}
}
result.put("QSZX",QSZXList);
result.put("SBJ",SBJXList);
result.put("HB",HBList);
result.put("XFJC",XFJCList);
result.put("LSJC",LSJCList);
return CommonResponseUtil.success(result);
}
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/controller/DynamicRingDataController.java
View file @ 5360ac70
package com.yeejoin.amos.bank.controller;
import java.util.Date;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.yeejoin.amos.bank.dao.entity.AlarmPoint;
import com.yeejoin.amos.bank.service.IAlarmPointService;
......@@ -47,4 +45,10 @@ public class DynamicRingDataController extends BaseController{
return CommonResponseUtil.success();
}
@PutMapping (value = "/update", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "动环修改坐标位置", notes = "动环修改坐标位置")
public CommonResponse updatePosition(@ApiParam(value = "动环修改坐标位置", required = true) @RequestBody Map<String,Object> param) {
String result = dynamicRingDataService.updatePosition(param);
return CommonResponseUtil.success(result);
}
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/dao/repository/IAlarmPointRepository.java
View file @ 5360ac70
......@@ -19,4 +19,7 @@ public interface IAlarmPointRepository extends IBaseRepository<AlarmPoint, Strin
@Query(value="select * from p_alarm_point where point_type IN ('4','5') and point_id =?1 and content = ?2 ",nativeQuery=true )
public List<AlarmPoint> selectPointTypeAndPointId(String pointId,String content);
@Query(value="select * from p_alarm_point where point_type =?1 and point_id =?2 and cpbl_id =?3 ",nativeQuery=true )
public List<AlarmPoint> selectPointTypeAndPointId(String type, Long pointId,Long cpblId);
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/dao/repository/IAlarmRepository.java
View file @ 5360ac70
......@@ -20,6 +20,10 @@ public interface IAlarmRepository extends IBaseRepository<Alarm, String> {
@Query(value="select COUNT(*) value,sa.alarm_level name, sa.org_code orgCode from spc_alarm sa where sa.org_code like CONCAT('%', ?1, '%' ) and sa.current_state in ('未确认未清除','已确认未清除','异常','告警') GROUP BY sa.alarm_level",nativeQuery=true )
public List<Map<String, Object>> countnum(String code);
@Query(value="select * from spc_alarm where source_id =?1 AND current_state in ('未确认未清除','已确认未清除','异常','告警')",nativeQuery=true )
public List<Alarm> selectByQuerySourceId(String sourceId);
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/dao/repository/ITopographyNodeDetailRepository.java
View file @ 5360ac70
package com.yeejoin.amos.bank.dao.repository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import com.yeejoin.amos.bank.TopographyNodeDetail;
import com.yeejoin.amos.op.core.jpa.IBaseRepository;
import java.util.List;
import java.util.Map;
@Repository("iTopographyNodeDetailDao")
public interface ITopographyNodeDetailRepository extends IBaseRepository<TopographyNodeDetail, String> {
TopographyNodeDetail findByNodeid(String nodeid);
@Query(value="SELECT\n" +
"\tb.nodeid,b.node_detail,a.state,a.text,a.treeid \n" +
"FROM\n" +
"( SELECT id ,state ,text,treeid FROM b_topography_node WHERE text IN ( '1#温湿度', '2#温湿度', '3#温湿度', '4#温湿度', '1温湿度', '5温湿度', '消防监测', '漏水监测' ) ) AS a\n" +
"\tLEFT JOIN b_topography_node_detail b ON a.id = b.nodeid",nativeQuery=true )
List<Map<String,Object>> HomePageDetail();
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/dao/repository/ITopographyNodeRepository.java
View file @ 5360ac70
package com.yeejoin.amos.bank.dao.repository;
import java.util.List;
import java.util.Map;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
......@@ -25,4 +26,7 @@ public interface ITopographyNodeRepository extends IBaseRepository<TopographyNod
TopographyNode findBySourceIdAndTreeidAndGroup(String toSourceId, String treeIdStr, String groupKey);
TopographyNode findBySourceIdAndType(String sourceId, int type);
@Query(value = "SELECT node.id,detail.node_detail FROM b_topography_node node LEFT JOIN b_topography_node_detail detail ON node.id = detail.nodeid WHERE node.source_id =?1", nativeQuery=true )
Map<String,Object> findNodeDetailBySourceId(String sourceId);
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/remote/RemoteDeviceService.java
View file @ 5360ac70
......@@ -79,4 +79,14 @@ public class RemoteDeviceService {
}
return null;
}
public String updatePosition(String jsonDate) {
try {
Object result = deviceRemoteClient.updatePosition(jsonDate);
return JSON.toJSONString(result);
} catch (InnerInvokException e) {
log.error("updatePosition fail " + e.getMessage());
}
return null;
}
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/remote/client/DeviceRemoteClient.java
View file @ 5360ac70
......@@ -50,5 +50,9 @@ public interface DeviceRemoteClient {
*/
@RequestMapping(value = "/device/cpbl/attr", method = RequestMethod.GET)
CommonResponse listDeviceAndDeviceCpblAttr(@RequestParam(value = "equipmentId",required = false) Long equipmentId) throws InnerInvokException;
/**
* 修改动环设备坐标点（暂时不启用）
*/
@RequestMapping(value = "/xml/updatePosition", method = RequestMethod.POST)
Object updatePosition(@RequestParam(value = "xmlData", required = false) String xmlData) throws InnerInvokException;
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/remote/client/PatrolRemoteClient.java
View file @ 5360ac70
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.bank.remote.client;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
......@@ -12,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
* @Description:
* @Date: 2020-02-18 14:52
*/
@FeignClient(name = "YEEAMOSPATROL-237")
@FeignClient(name = "${gateway.fegin.name}")
public interface PatrolRemoteClient {
/**
* 发送告警信息
*/
@RequestMapping(value = "api/msgSubscribe/alarmNotification", method = RequestMethod.POST, consumes="application/json" )
@RequestMapping(value = "api/msgSubscribe/alarmNotification", method = RequestMethod.POST, consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
CommonResponse sendAlarmNotification(@RequestBody String input) throws InnerInvokException;
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/remote/client/RiskModelRemoteClient.java
View file @ 5360ac70
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.bank.remote.client;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -12,13 +13,13 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author DELL
*
*/
@FeignClient(name = "${Risk.fegin.name}")
@FeignClient(name = "${gateway.fegin.name}")
public interface RiskModelRemoteClient {
/**
* 修改rpn值
*/
@RequestMapping(value = "api/risksource/update/fireqeuiment/sod", method = RequestMethod.GET, consumes = "application/json")
@RequestMapping(value = "api/risksource/update/fireqeuiment/sod", method = RequestMethod.GET, consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
CommonResponse updateEquipmentAlarmData(@RequestParam(value = "riskFactorID") Long riskFactorID,
@RequestParam("equipmentName") String equipmentName,@RequestParam("state") Integer state)
throws InnerInvokException;
......@@ -26,13 +27,13 @@ public interface RiskModelRemoteClient {
/**
* 根据风险因素id查询巡检点和指标项目列表
*/
@RequestMapping(value = "/api/risksource/getEquiments/points", method = RequestMethod.GET, consumes="application/json" )
@RequestMapping(value = "/api/risksource/getEquiments/points", method = RequestMethod.GET, consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
CommonResponse listPointInputitemByFactorId(@RequestParam(value = "factorId") Long factorId) throws InnerInvokException;
/**
* 根据风险因素id查询设备和指标项列表
*/
@RequestMapping(value = "/api/risksource/getFactorBindPoints", method = RequestMethod.GET, consumes="application/json" )
@RequestMapping(value = "/api/risksource/getFactorBindPoints", method = RequestMethod.GET, consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
CommonResponse queryBoundByFactroId(@RequestParam(value = "factorId") Long factorId) throws InnerInvokException;
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/IAlarmPointService.java
View file @ 5360ac70
package com.yeejoin.amos.bank.service;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.bank.dao.entity.AlarmPoint;
import com.yeejoin.amos.op.core.jpa.IGenericManager;
......@@ -18,4 +20,9 @@ public interface IAlarmPointService extends IGenericManager<AlarmPoint, String>
public void alarmTigger(String xmlData,String token);
public List<AlarmPoint> queryAutoInspection(String pointId, String content);
public Map<String,Object> getSevenDayscount() throws ParseException;
public List<AlarmPoint> selectPointTypeAndPointId(String type,Long pointId,Long cpblId);
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/IAlarmService.java
View file @ 5360ac70
......@@ -26,4 +26,6 @@ List<HashMap<String, Object>> getcountnum(String code);
List<HashMap<String, Object>> getcountyc( String code);
List<HashMap<String, Object>> getxuncount( String code);
public List<Alarm> selectByQuerySourceId(String sourceId);
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/IDynamicRingDataService.java
View file @ 5360ac70
package com.yeejoin.amos.bank.service;
import java.util.ArrayList;
import java.util.Map;
import com.alibaba.fastjson.JSONArray;
import com.yeejoin.amos.spc.core.common.response.Node3DVoResponse;
......@@ -15,4 +16,5 @@ public interface IDynamicRingDataService {
ArrayList<Node3DVoResponse> query3dData(String token,String orgCode);
String updatePosition (Map<String,Object> param);
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/AlarmServiceImpl.java
View file @ 5360ac70
......@@ -2,6 +2,7 @@
package com.yeejoin.amos.bank.service.impl;
import com.google.common.collect.Maps;
import com.yeejoin.amos.bank.common.enums.AbnormalStateEnum;
import com.yeejoin.amos.bank.dao.entity.AlarmPoint;
import com.yeejoin.amos.bank.dao.repository.IAlarmPointRepository;
import com.yeejoin.amos.bank.remote.RemoteAlarmTiggerService;
......@@ -11,9 +12,9 @@ import com.yeejoin.amos.spc.business.dao.mapper.InputItemMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
public class AlarmServiceImpl extends GenericManagerImpl<AlarmPoint, String> implements IAlarmPointService {
......@@ -64,6 +65,12 @@ public class AlarmServiceImpl extends GenericManagerImpl<AlarmPoint, String> im
}
@Override
public List<AlarmPoint> selectPointTypeAndPointId(String type, Long pointId,Long cpblId) {
return iAlarmPointDao.selectPointTypeAndPointId( type,pointId,cpblId);
}
@Override
public void alarmTigger(String xmlData,String token) {
......@@ -78,4 +85,33 @@ public class AlarmServiceImpl extends GenericManagerImpl<AlarmPoint, String> im
public List<AlarmPoint> queryAutoInspection(String pointId,String content) {
return iAlarmPointDao.selectPointTypeAndPointId(pointId,content);
}
@Override
public Map<String,Object> getSevenDayscount() throws ParseException {
Map<String,Object> result = new HashMap<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar c = Calendar.getInstance();
c.add(Calendar.DATE, -6);
//紧急告警
List<Long> urgent = inputMapper.getSevenDayscount(AbnormalStateEnum.E.getName());
result.put("urgent",urgent);
//重要告警
List<Long> important = inputMapper.getSevenDayscount(AbnormalStateEnum.M.getName());
result.put("important",important);
//次要告警
List<Long> secondary = inputMapper.getSevenDayscount(AbnormalStateEnum.S.getName());
result.put("secondary",secondary);
//警告告警
List<Long> warning = inputMapper.getSevenDayscount(AbnormalStateEnum.W.getName());
result.put("warning",warning);
List<String> xAxis = new ArrayList<>();
for (int i = 0; i < 7; i++) {
xAxis.add(sdf.format(c.getTime()).substring(5,sdf.format(c.getTime()).length()));
c.add(Calendar.DATE, 1);
}
//时间轴
result.put("xAxis",xAxis);
return result;
}
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/DynamicRingDataServiceImpl.java
View file @ 5360ac70
......@@ -74,6 +74,22 @@ public class DynamicRingDataServiceImpl implements IDynamicRingDataService {
return list;
}
@Override
public String updatePosition(Map<String, Object> param) {
String params1 = "{\"eqpTempAttr\":{\"name\":\"affiliatedSystem\",\"value\":\"动环系统\"},\"pageNumber\":0,\"pageSize\":1000000000,\"needAttr\":[\"position\",\"storey\",\"storey\"]}";
String resStr = deviceService.selectEquipments(params1);
//String resStr = deviceService.dynamicRingData(DeviceUriEnum.查询三维设备点, token, params1);
JSONObject updateObject =new JSONObject();
JSONArray resJson = JSONArray.parseArray(JSONObject.parseObject(resStr).get("content").toString());
for (int i = 0; i <resJson.size() ; i++) {
if(resJson.getJSONObject(i).get("id").equals(param.get("id"))){
resJson.getJSONObject(i).getJSONObject("equipmentAttrs").put("position",param.get("position3d"));
updateObject = resJson.getJSONObject(i);
}
}
return deviceService.updatePosition(updateObject.toJSONString());
}
private void convertNode3DVoResponse(ArrayList<Node3DVoResponse> list, JSONObject json, String type,String orgCode) {
List<JSONObject> dataArray = (List<JSONObject>) json.get("content");
dataArray.forEach(e -> {
......@@ -134,4 +150,6 @@ public class DynamicRingDataServiceImpl implements IDynamicRingDataService {
}
public static void main(String[] args) {
}
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/TopographyServiceImpl.java
View file @ 5360ac70
......@@ -326,8 +326,9 @@ public class TopographyServiceImpl extends GenericManagerImpl<TopographyTree, St
public Object getNodeDetail(String id) {
TopographyNode node = iTopographyNodeDao.findById(id).get();
TopographyNodeDetail detail = iTopographyNodeDetailDao.findByNodeid(id);
List<Map> list = new ArrayList<>();
if (detail != null) {
List<Map> list = JSON.parseArray(detail.getNodeDetail(), Map.class);
list = JSON.parseArray(detail.getNodeDetail(), Map.class);
for (Map map : list) {
if (map.get("name").equals("监测状态") || map.get("name").equals("健康状态")) {
if (node.getState() == 0) {
......@@ -342,10 +343,12 @@ public class TopographyServiceImpl extends GenericManagerImpl<TopographyTree, St
}
return list;
} else {
return null;
return list;
}
}
@Override
public List<Map> getDeviceNodes(String orgcode) {
List<TopographyNode> nodes = iTopographyNodeDao.findByOrgCodeAndType(orgcode, 4);
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/spcAlarmServiceImpl.java
View file @ 5360ac70
......@@ -74,4 +74,9 @@ public class spcAlarmServiceImpl extends GenericManagerImpl<Alarm, String> impl
// TODO Auto-generated method stub
return inputMapper.getxuncount(code);
}
@Override
public List<Alarm> selectByQuerySourceId(String sourceId) {
return iAlarmDao.selectByQuerySourceId(sourceId);
}
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/webSocket/MonitorAlarmWebSocketClient.java
View file @ 5360ac70
......@@ -12,10 +12,19 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import com.alibaba.fastjson.JSONArray;
import com.yeejoin.amos.bank.TopographyNodeDetail;
import com.yeejoin.amos.bank.dao.mapper.AlarmMapper;
import com.yeejoin.amos.bank.dao.repository.ITopographyNodeDetailRepository;
import com.yeejoin.amos.bank.dao.repository.ITopographyNodeRepository;
import com.yeejoin.amos.bank.utils.DateTimeKit;
import com.yeejoin.amos.spc.core.util.StringUtil;
import io.micrometer.core.instrument.util.StringUtils;
import org.java_websocket.WebSocket;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.data.domain.Sort;
......@@ -36,6 +45,9 @@ import com.yeejoin.amos.bank.utils.HttpUtil;
import com.yeejoin.amos.bank.utils.JsonUtil;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
import com.yeejoin.amos.spc.exception.YeeException;
import org.springframework.util.ObjectUtils;
import static com.yeejoin.amos.bank.constants.AlarmConstant.*;
/**
* 接收动环告警
......@@ -45,27 +57,51 @@ import com.yeejoin.amos.spc.exception.YeeException;
public class MonitorAlarmWebSocketClient extends WebSocketClient {
private static final Logger log = Logger.getLogger(MonitorAlarmWebSocketClient.class);
private static final String TAB = "\r\n";
private static ApplicationContext allpicationContext;
private ITopographyNodeRepository iTopographyNodeRepository;
private ITopographyNodeDetailRepository iTopographyNodeDetailDao;
private IAlarmPointService alarmPointService;
private IAlarmService alarmService;
private ITopographyService iTopographyService;
private AmosWsClient client;
private static final String TAB = "\r\n";
private AlarmMapper alarmMapper;
private IAlarmRepository iAlarmDao;
private String address;
private static ApplicationContext allpicationContext;
private PatrolRemoteClient patrolRemoteClient;
public MonitorAlarmWebSocketClient(String url) throws URISyntaxException {
super(new URI(url));
}
public static void setAllpicationContext(ApplicationContext context) {
allpicationContext = context;
}
public MonitorAlarmWebSocketClient(String url) throws URISyntaxException {
super(new URI(url));
private static String getAuthOrg(String authOrg) {
if (!StringUtils.isEmpty(authOrg) && authOrg.startsWith("[") && authOrg.endsWith("]")) {
String str = authOrg.substring(1, authOrg.length() - 1).replace(" ", "").replace(",", "#");
return "#"+ str;
}
return null;
}
public static synchronized void synMonitorAlarmPoint() {
System.out.println("-------------------Monitoring of ring alarms start-------------------------");
try {
Properties props = PropertiesLoaderUtils.loadAllProperties("application.properties");
String monitorAlarmWebSocketClientUrl = (String) props.get("params.remoteWebsocketUrl") + "metricData?subData=monitorAlarm";
MonitorAlarmWebSocketClient client = new MonitorAlarmWebSocketClient(monitorAlarmWebSocketClientUrl);
client.connect();
while (!client.getReadyState().equals(WebSocket.READYSTATE.OPEN)) {
//System.out.println("connecting...Dynamic ring alarm----" + client.getReadyState());
}
System.out.println("build " + monitorAlarmWebSocketClientUrl + "connected...");
} catch (URISyntaxException | IOException e) {
System.out.println(e.getMessage());
e.printStackTrace();
}
}
@Override
......@@ -81,6 +117,9 @@ public class MonitorAlarmWebSocketClient extends WebSocketClient {
alarmService = (IAlarmService) allpicationContext.getBean(IAlarmService.class);
patrolRemoteClient= (PatrolRemoteClient) allpicationContext.getBean(PatrolRemoteClient.class);
iAlarmDao =(IAlarmRepository) allpicationContext.getBean(IAlarmRepository.class);
alarmMapper = (AlarmMapper) allpicationContext.getBean(AlarmMapper.class);
iTopographyNodeRepository = (ITopographyNodeRepository) allpicationContext.getBean(ITopographyNodeRepository.class);
iTopographyNodeDetailDao = (ITopographyNodeDetailRepository) allpicationContext.getBean(ITopographyNodeDetailRepository.class);
try {
Properties props = PropertiesLoaderUtils.loadAllProperties("application.properties");
......@@ -98,45 +137,131 @@ public class MonitorAlarmWebSocketClient extends WebSocketClient {
String formatJsonString = JsonUtil.formatJsonString(paramString);
JSONObject msgJson = JSONObject.parseObject(formatJsonString);
Long eqpId = msgJson.getLong("eqpId");
String cpblName = msgJson.getString("cpblName");
if (null != eqpId) {
String curStatus = msgJson.getString("currentState");
Map<String,Object> nodeDetailMap = iTopographyNodeRepository.findNodeDetailBySourceId(msgJson.getString("sourceId"));
List<JSONObject> alarmAttributes = (List<JSONObject>) msgJson.get("capacityAttrList");
synchronized (this) {
//拼接json存入动环详情表
Boolean alarmFlagBoolean = false;
for (JSONObject a : alarmAttributes) {
String atr = (String) a.get("name");
String res = (String) msgJson.get(atr);
if (res != null && AlarmPointEnum.异常.getName().equals(res)) {
if (res != null &&(AlarmPointEnum.异常.getName().equals(res)||AlarmPointEnum.告警.getName().equals(res))) {
alarmFlagBoolean = true;
log.info("Moving ring device[" + eqpId + "]" + atr + "abnormal");
break;
}
}
List<AlarmPoint> pointList = alarmPointService.selectPointTypeAndPointId(AlarmPointTypeEnum.动环.getCode(), eqpId);
if (!alarmFlagBoolean && pointList != null) {
//组装动环信息JSON
List<Map<String, String>> DHlist = new ArrayList<>();
for (JSONObject a : alarmAttributes) {
String atr = (String) a.get("name");
String res = (String) msgJson.get(atr);
Map<String, String> map = new HashMap();
if (!"labelType".equals(atr)) {
map.put("name", a.get("displayName").toString());
map.put("value", msgJson.get(atr).toString());
DHlist.add(map);
}
}
if (nodeDetailMap.get("node_detail") != null && !StringUtils.isBlank(nodeDetailMap.get("node_detail").toString())) {
JSONArray nodeDetailArray = JSONArray.parseArray(nodeDetailMap.get("node_detail").toString());
for (int i = 0; i < DHlist.size(); i++) {
int count = 0;
for (int j = 0; j < nodeDetailArray.size(); j++) {
if (DHlist.get(i).get("name").equals(JSONObject.parseObject(nodeDetailArray.get(j).toString()).get("name"))) {
nodeDetailArray.getJSONObject(j).put("value", DHlist.get(i).get("value"));
count++;
}
}
if (count == 0) {
JSONObject detailObject = new JSONObject();
detailObject.put("name", DHlist.get(i).get("name"));
detailObject.put("value", DHlist.get(i).get("value"));
nodeDetailArray.add(detailObject);
}
TopographyNodeDetail topographyNodeDetail = iTopographyNodeDetailDao.findByNodeid(nodeDetailMap.get("id").toString());
topographyNodeDetail.setNodeDetail(nodeDetailArray.toJSONString());
iTopographyNodeDetailDao.save(topographyNodeDetail);
}
} else {
JSONArray nodeDetailArray = new JSONArray();
for (int i = 0; i < DHlist.size(); i++) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("name", DHlist.get(i).get("name").toString());
jsonObject.put("value", DHlist.get(i).get("value").toString());
nodeDetailArray.add(jsonObject);
}
TopographyNodeDetail topographyNodeDetail = new TopographyNodeDetail();
topographyNodeDetail.setNodeDetail(JSON.toJSONString(nodeDetailArray));
topographyNodeDetail.setNodeid(nodeDetailMap.get("id").toString());
iTopographyNodeDetailDao.save(topographyNodeDetail);
}
//告警记录
String res = AlarmPointEnum.正常.getName();
String alarmTypeCombination="";
for (JSONObject atrJson : alarmAttributes) {
String atrName = (String) atrJson.get("name");
if ("labelType".equals(atrName)) {
continue;
}
String alarmType = (String) atrJson.get("displayName");
if(AlarmPointEnum.异常.getName().equals(msgJson.getString(atrName))||AlarmPointEnum.告警.getName().equals(msgJson.getString(atrName))){
alarmTypeCombination = alarmType + alarmTypeCombination;
res = AlarmPointEnum.异常.getName();
}
}
Long cpblId = msgJson.getLong("cpblId");
String sourceId = msgJson.getString("sourceId");
String orgCode = msgJson.getString("orgCode");
String authOrg = msgJson.getString("authOrg");
String eqpName = msgJson.getString("eqpName");
String alramContent = msgJson.getString("alramContent");
String authOrgTemp = JsonUtil.arraysToString(JsonUtil.toStringArray(authOrg));
if (!ObjectUtils.isEmpty(authOrgTemp)) {
orgCode = authOrgTemp;
}
//添加告警记录
if(!"运行参数".equals(cpblName)||!"常电监测".equals(cpblName)||!"常电监测".equals(cpblName)){
addRecordAlarm(alarmTypeCombination, res, sourceId, orgCode, authOrg, eqpName,cpblName,alramContent);
List<AlarmPoint> pointList = alarmPointService.selectPointTypeAndPointId(AlarmPointTypeEnum.动环.getCode(), eqpId,cpblId);
List<Alarm> curAlarmList = alarmService.selectByQuerySourceId(sourceId);
if (!alarmFlagBoolean && pointList.size() > 0) {
alarmPointService.deleteItems(pointList);
log.info("Clear p_alarm_point Alarm data ...success");
//设备所有的指标都不异常，才可以将state置为0
if(curAlarmList.size()==0){
iTopographyService.sendAbnormal(msgJson.getString("sourceId"), 0);
}
} else {
if (null == pointList || pointList.size() == 0) {
String alramContent = msgJson.getString("describe");
if (alarmFlagBoolean && pointList.size() == 0) {
// String alramContent = msgJson.getString("describe");
String eqpType = msgJson.getString("eqpType");
String eqpName = msgJson.getString("eqpName");
// String eqpName = msgJson.getString("eqpName");
String equipmentAttrs = msgJson.getString("equipmentAttrs");
String sourceId = msgJson.getString("sourceId");
String orgCode = msgJson.getString("orgCode");
// String sourceId = msgJson.getString("sourceId");
String authOrgs = getAuthOrg(msgJson.getString("authOrg"));
//String orgCode = msgJson.getString("orgCode");
AlarmPoint alarmPoint = new AlarmPoint();
alarmPoint.setCode(orgCode);
alarmPoint.setCode(authOrgs);
alarmPoint.setSourceId(sourceId);
alarmPoint.setPointId(eqpId);
alarmPoint.setAuthOrg(authOrgs);
// alarmPoint.setPointType(eqpType);
alarmPoint.setPointType(AlarmPointTypeEnum.动环.getCode());
alarmPoint.setUpdateDate(new Date());
alarmPoint.setContent(alramContent);
alarmPoint.setContent(eqpName+alarmTypeCombination);
alarmPoint.setPointAttrs(equipmentAttrs);
alarmPoint.setPointName(eqpName);
alarmPoint.setTarget(cpblId);
alarmPointService.saveItem(alarmPoint);
log.info("Save alarm data....success");
......@@ -153,7 +278,15 @@ public class MonitorAlarmWebSocketClient extends WebSocketClient {
} catch (Exception e) {
log.info("手机推送告警信息失败...fail" + e.getMessage());
}
}else {
if(pointList.size()>0){
AlarmPoint alarmPoint =pointList.get(0);
alarmPoint.setContent(eqpName+alarmTypeCombination);
alarmPointService.save(alarmPoint);
}
}
}
if(alarmFlagBoolean){
iTopographyService.sendAbnormal(msgJson.getString("sourceId"), 1);
}
Sort sort = new Sort(Sort.Direction.DESC, "updateDate");
......@@ -164,48 +297,10 @@ public class MonitorAlarmWebSocketClient extends WebSocketClient {
String url = (String) props.get("params.remoteWebsocketUrl") + "/generic/sendMessage";
HttpUtil.PostJson(url, JSON.toJSONString(param));
log.info("send websocekt info：" + param);
//告警记录
ArrayList<Alarm> alarmList = new ArrayList<>();
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (JSONObject atrJson : alarmAttributes) {
String atrName = (String) atrJson.get("name");
String alarmType = (String) atrJson.get("displayName");
String res = (String) msgJson.get(atrName);
if ("labelType".equals(atrName)) {
continue;
}
//告警记录
String queryColumn = msgJson.getString("sourceId") + "_" + alarmType;
//查出当前记录中的告警记录
List<Alarm> curAlarmList = alarmService.findByQueryColumn(queryColumn);
if (curAlarmList != null && curAlarmList.size() > 0) {
Alarm alarm = curAlarmList.get(0);
// if(alarm != null || AlarmPointEnum.异常.getName().equals(res)) {
alarm.setUpdateDate(df.format(new Date()));
alarm.setCurrentState(res);
alarmList.add(alarm);
// }
} else {//记录无告警则新增
Alarm alarm = new Alarm();
alarm.setSourceId(msgJson.getString("sourceId"));
alarm.setAlarmSourceIp(msgJson.getString("sourceId"));
alarm.setAlarmSourceType(alarmType);
alarm.setUpdateDate(df.format(new Date()));
alarm.setOrgCode(msgJson.getString("orgCode"));
alarm.setQueryColumn(queryColumn);
alarm.setAlarmLevel("警告告警");
alarm.setCurrentState(res);
alarmList.add(alarm);
}
}
//alarmService.save(alarmList);
iAlarmDao.saveAll(alarmList);
log.info("Save alarm records ....success");
}
}else {
throw new YeeException("eqpId 不能为空！！！");
}
......@@ -227,21 +322,61 @@ public class MonitorAlarmWebSocketClient extends WebSocketClient {
log.info("abnormal " + e);
}
public static synchronized void synMonitorAlarmPoint() {
System.out.println("-------------------Monitoring of ring alarms start-------------------------");
try {
Properties props = PropertiesLoaderUtils.loadAllProperties("application.properties");
String monitorAlarmWebSocketClientUrl = (String) props.get("params.remoteWebsocketUrl") + "metricData?subData=monitorAlarm";
MonitorAlarmWebSocketClient client = new MonitorAlarmWebSocketClient(monitorAlarmWebSocketClientUrl);
client.connect();
while (!client.getReadyState().equals(WebSocket.READYSTATE.OPEN)) {
/**
* 添加告警记录
* @param alarmType 告警类型
* @param alarmStatus 状态，正常 异常
* @param sourceId
* @param orgCode
* @param authOrg
* @param eqpName 设备名称
* @param cpblName 报警类型
*/
private void addRecordAlarm(String alarmType, String alarmStatus,String sourceId,String orgCode,String authOrg,String eqpName,String cpblName,String alramContent) {
//告警记录
String queryColumn = sourceId + "_" + cpblName;
//查出当前记录中的告警记录
List<Alarm> curAlarmList = alarmService.findByQueryColumn(queryColumn);
if (curAlarmList != null && curAlarmList.size() > 0) {
Alarm alarm = curAlarmList.get(0);
alarm.setOrgCode(orgCode);
alarm.setUpdateDate(DateTimeKit.now());
if (!ObjectUtils.isEmpty(alarm.getHappenDate())) {
String subtract = DateTimeKit.getSubtract(alarm.getHappenDate());
alarm.setContinueDate(subtract);
}
//System.out.println("connecting...Dynamic ring alarm----" + client.getReadyState());
if (AlarmPointEnum.异常.getName().equals(alarmStatus)||AlarmPointEnum.告警.getName().equals(alarmStatus)) {
alarm.setCurrentState(ALARM_ABNORMAL_STATUS);
} else {
alarm.setClearDate(DateTimeKit.now());
alarm.setClearPerson(CLEAR_PERSON);
alarm.setCurrentState(ALARM_NORMAL_STATUS);
}
alarmMapper.updateAlarm(alarm);
} else {//记录无告警则新增
Alarm alarm = new Alarm();
alarm.setSourceId(sourceId);
alarm.setAlarmReason(cpblName);
alarm.setAlarmSourceName(eqpName);
alarm.setAlarmLevel(ALARM_DEVICE_MAJOR);
// alarm.setAlarmSourceIp(sourceId);
alarm.setAlarmSourceType(ALARM_DEVICE_TYPE);
alarm.setClearDate("");
alarm.setContinueDate("");
alarm.setEnsureDate("");
alarm.setEnsurePerson("");
alarm.setOrgCode(orgCode);
alarm.setHappenDate(DateTimeKit.now());
alarm.setQueryColumn( sourceId + "_" + cpblName);
List<Alarm> curAlarmRList = alarmService.findByQueryColumn(queryColumn);
if (AlarmPointEnum.异常.getName().equals(alarmStatus)||AlarmPointEnum.告警.getName().equals(alarmStatus)) {
alarm.setCurrentState(ALARM_ABNORMAL_STATUS);
iAlarmDao.save(alarm);
} else {
alarm.setCurrentState(ALARM_NORMAL_STATUS);
}
System.out.println("build " + monitorAlarmWebSocketClientUrl + "connected...");
} catch (URISyntaxException | IOException e) {
System.out.println(e.getMessage());
e.printStackTrace();
}
log.info("Save shidu alarm records ....success");
}
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/webSocket/ShiduAlarmWebSocketClient.java
View file @ 5360ac70
package com.yeejoin.amos.bank.webSocket;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_ABNORMAL_STATUS;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_CAUSE;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_LEVEL;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_NORMAL_STATUS;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_TYPE;
import static com.yeejoin.amos.bank.constants.AlarmConstant.CLEAR_PERSON;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_DEVICE;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_DEVICE_TYPE;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_DEVICE_AlARAM;
import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_DEVICE_MAJOR;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
......@@ -23,11 +18,13 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import com.yeejoin.amos.bank.TopographyNodeDetail;
import com.yeejoin.amos.bank.dao.repository.ITopographyNodeDetailRepository;
import com.yeejoin.amos.bank.dao.repository.ITopographyNodeRepository;
import org.java_websocket.WebSocket;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.data.domain.Sort;
......@@ -63,29 +60,51 @@ import org.springframework.util.ObjectUtils;
public class ShiduAlarmWebSocketClient extends WebSocketClient {
private static final Logger log = Logger.getLogger(ShiduAlarmWebSocketClient.class);
private static final String TAB = "\r\n";
private static ApplicationContext allpicationContext;
private ITopographyNodeRepository iTopographyNodeRepository;
private ITopographyNodeDetailRepository iTopographyNodeDetailDao;
private IAlarmPointService alarmPointService;
private IAlarmService alarmService;
private ITopographyService iTopographyService;
private AmosWsClient client;
private static final String TAB = "\r\n";
private IAlarmRepository iAlarmDao;
private String address;
private static ApplicationContext allpicationContext;
private PatrolRemoteClient patrolRemoteClient;
private AlarmMapper alarmMapper;
public ShiduAlarmWebSocketClient(String url) throws URISyntaxException {
super(new URI(url));
}
public static void setAllpicationContext(ApplicationContext context) {
allpicationContext = context;
}
public ShiduAlarmWebSocketClient(String url) throws URISyntaxException {
super(new URI(url));
private static String getAuthOrg(String authOrg) {
if (!StringUtils.isEmpty(authOrg) && authOrg.startsWith("[") && authOrg.endsWith("]")) {
String str = authOrg.substring(1, authOrg.length() - 1).replace(" ", "").replace(",", "#");
return "#"+ str;
}
return null;
}
public static synchronized void synMonitorAlarmPoint() {
System.out.println("-------------------shidu Monitoring of ring alarms start-------------------------");
try {
Properties props = PropertiesLoaderUtils.loadAllProperties("application.properties");
String monitorAlarmWebSocketClientUrl = (String) props.get("params.remoteWebsocketUrl") + "metricData?subData=shiduAlarm";
ShiduAlarmWebSocketClient client = new ShiduAlarmWebSocketClient(monitorAlarmWebSocketClientUrl);
client.connect();
while (!client.getReadyState().equals(WebSocket.READYSTATE.OPEN)) {
log.info("connecting... shidu Dynamic ring alarm----" + client.getReadyState());
}
System.out.println("build " + monitorAlarmWebSocketClientUrl + "connected...");
} catch (URISyntaxException | IOException e) {
System.out.println(e.getMessage());
e.printStackTrace();
}
}
@Override
......@@ -102,7 +121,8 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
patrolRemoteClient= (PatrolRemoteClient) allpicationContext.getBean(PatrolRemoteClient.class);
iAlarmDao =(IAlarmRepository) allpicationContext.getBean(IAlarmRepository.class);
alarmMapper = (AlarmMapper) allpicationContext.getBean(AlarmMapper.class);
iTopographyNodeRepository = (ITopographyNodeRepository) allpicationContext.getBean(ITopographyNodeRepository.class);
iTopographyNodeDetailDao = (ITopographyNodeDetailRepository) allpicationContext.getBean(ITopographyNodeDetailRepository.class);
try {
Properties props = PropertiesLoaderUtils.loadAllProperties("application.properties");
address = (String) props.get("params.patrol");
......@@ -120,32 +140,113 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
log.info("chuli shidu message after：" + formatJsonString);
JSONObject msgJson = JSONObject.parseObject(formatJsonString);
Long eqpId = msgJson.getLong("eqpId");
String cpblName = msgJson.getString("cpblName");
if (null != eqpId) {
Map<String,Object> nodeDetailMap = iTopographyNodeRepository.findNodeDetailBySourceId(msgJson.getString("sourceId"));
List<JSONObject> alarmAttributes = (List<JSONObject>) msgJson.get("capacityAttrList");
synchronized (this) {
synchronized (this) {
//拼接json存入动环详情表
Boolean alarmFlagBoolean = false;
for (JSONObject a : alarmAttributes) {
String atr = (String) a.get("name");
String res = (String) msgJson.get(atr);
if (res != null && AlarmPointEnum.异常.getName().equals(res)) {
if (res != null && (AlarmPointEnum.异常.getName().equals(res)||AlarmPointEnum.告警.getName().equals(res))) {
alarmFlagBoolean = true;
log.info("Moving ring device[" + eqpId + "]" + atr + "abnormal");
break;
}
}
List<AlarmPoint> pointList = alarmPointService.selectPointTypeAndPointId(AlarmPointTypeEnum.动环.getCode(), eqpId);
if (!alarmFlagBoolean && pointList != null) {
//组装动环信息JSON
List<Map<String, String>> DHlist = new ArrayList<>();
for (JSONObject a : alarmAttributes) {
String atr = (String) a.get("name");
String res = (String) msgJson.get(atr);
Map<String, String> map = new HashMap();
if (!"labelType".equals(atr)) {
map.put("name", a.get("displayName").toString());
map.put("value", msgJson.get(atr).toString());
DHlist.add(map);
}
}
if (nodeDetailMap.get("node_detail") != null) {
JSONArray nodeDetailArray = JSONArray.parseArray(nodeDetailMap.get("node_detail").toString());
for (int i = 0; i < DHlist.size(); i++) {
int count = 0;
for (int j = 0; j < nodeDetailArray.size(); j++) {
if (DHlist.get(i).get("name").equals(JSONObject.parseObject(nodeDetailArray.get(j).toString()).get("name"))) {
nodeDetailArray.getJSONObject(j).put("value", DHlist.get(i).get("value"));
count++;
}
}
if (count == 0) {
JSONObject detailObject = new JSONObject();
detailObject.put("name", DHlist.get(i).get("name"));
detailObject.put("value", DHlist.get(i).get("value"));
nodeDetailArray.add(detailObject);
}
TopographyNodeDetail topographyNodeDetail = iTopographyNodeDetailDao.findByNodeid(nodeDetailMap.get("id").toString());
topographyNodeDetail.setNodeDetail(nodeDetailArray.toJSONString());
iTopographyNodeDetailDao.save(topographyNodeDetail);
}
} else {
JSONArray nodeDetailArray = new JSONArray();
for (int i = 0; i < DHlist.size(); i++) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("name", DHlist.get(i).get("name").toString());
jsonObject.put("value", DHlist.get(i).get("value").toString());
nodeDetailArray.add(jsonObject);
}
TopographyNodeDetail topographyNodeDetail = new TopographyNodeDetail();
topographyNodeDetail.setNodeDetail(JSON.toJSONString(nodeDetailArray));
topographyNodeDetail.setNodeid(nodeDetailMap.get("id").toString());
iTopographyNodeDetailDao.save(topographyNodeDetail);
}
//告警记录
String res = AlarmPointEnum.正常.getName();
String alarmTypeCombination="";
for (JSONObject atrJson : alarmAttributes) {
String atrName = (String) atrJson.get("name");
if ("labelType".equals(atrName)) {
continue;
}
String alarmType = (String) atrJson.get("displayName");
if(AlarmPointEnum.异常.getName().equals(msgJson.getString(atrName))||AlarmPointEnum.告警.getName().equals(msgJson.getString(atrName))){
alarmTypeCombination = alarmType + alarmTypeCombination;
res = AlarmPointEnum.异常.getName();
}
}
Long cpblId = msgJson.getLong("cpblId");
String sourceId = msgJson.getString("sourceId");
String orgCode = msgJson.getString("orgCode");
String authOrg = msgJson.getString("authOrg");
String eqpName = msgJson.getString("eqpName");
String alramContent = msgJson.getString("alramContent");
String authOrgTemp = JsonUtil.arraysToString(JsonUtil.toStringArray(authOrg));
if (!ObjectUtils.isEmpty(authOrgTemp)) {
orgCode = authOrgTemp;
}
//添加告警记录
if(!"运行参数".equals(cpblName)||!"常电监测".equals(cpblName)||!"常电监测".equals(cpblName)){
addRecordAlarm(alarmTypeCombination, res, sourceId, orgCode, authOrg, eqpName,cpblName,alramContent);
List<AlarmPoint> pointList = alarmPointService.selectPointTypeAndPointId(AlarmPointTypeEnum.动环.getCode(), eqpId,cpblId);
List<Alarm> curAlarmList = alarmService.selectByQuerySourceId(sourceId);
if (!alarmFlagBoolean && pointList.size() > 0) {
alarmPointService.deleteItems(pointList);
log.info("Clear p_alarm_point Alarm data ...success");
//设备所有的指标都不异常，才可以将state置为0
if(curAlarmList.size()==0){
iTopographyService.sendAbnormal(msgJson.getString("sourceId"), 0);
}
} else {
if (null == pointList || pointList.size() == 0) {
String alramContent = msgJson.getString("describe");
if (alarmFlagBoolean && pointList.size() == 0) {
// String alramContent = msgJson.getString("describe");
String eqpType = msgJson.getString("eqpType");
String eqpName = msgJson.getString("eqpName");
// String eqpName = msgJson.getString("eqpName");
String equipmentAttrs = msgJson.getString("equipmentAttrs");
String sourceId = msgJson.getString("sourceId");
// String sourceId = msgJson.getString("sourceId");
String authOrgs = getAuthOrg(msgJson.getString("authOrg"));
//String orgCode = msgJson.getString("orgCode");
......@@ -157,9 +258,10 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
// alarmPoint.setPointType(eqpType);
alarmPoint.setPointType(AlarmPointTypeEnum.动环.getCode());
alarmPoint.setUpdateDate(new Date());
alarmPoint.setContent(alramContent);
alarmPoint.setContent(eqpName+alarmTypeCombination);
alarmPoint.setPointAttrs(equipmentAttrs);
alarmPoint.setPointName(eqpName);
alarmPoint.setTarget(cpblId);
alarmPointService.saveItem(alarmPoint);
log.info("Save alarm data....success");
......@@ -176,7 +278,15 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
} catch (Exception e) {
log.info("手机推送告警信息失败...fail" + e.getMessage());
}
}else {
if(pointList.size()>0){
AlarmPoint alarmPoint =pointList.get(0);
alarmPoint.setContent(eqpName+alarmTypeCombination);
alarmPointService.save(alarmPoint);
}
}
}
if(alarmFlagBoolean){
iTopographyService.sendAbnormal(msgJson.getString("sourceId"), 1);
}
Sort sort = new Sort(Sort.Direction.DESC, "updateDate");
......@@ -187,28 +297,9 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
String url = (String) props.get("params.remoteWebsocketUrl") + "/generic/sendMessage";
HttpUtil.PostJson(url, JSON.toJSONString(param));
log.info("send websocekt info：" + param);
//告警记录
for (JSONObject atrJson : alarmAttributes) {
String atrName = (String) atrJson.get("name");
String alarmType = (String) atrJson.get("displayName");
String res = (String) msgJson.get(atrName);
if ("labelType".equals(atrName)) {
continue;
}
String sourceId = msgJson.getString("sourceId");
String orgCode = msgJson.getString("orgCode");
String authOrg = msgJson.getString("authOrg");
String eqpName = msgJson.getString("eqpName");
String cpblName = msgJson.getString("cpblName");
String authOrgTemp = JsonUtil.arraysToString(JsonUtil.toStringArray(authOrg));
if (!ObjectUtils.isEmpty(authOrgTemp)) {
orgCode = authOrgTemp;
}
//添加告警记录
addRecordAlarm(alarmType, res, sourceId, orgCode, authOrg, eqpName,cpblName);
}
}
}else {
throw new YeeException("eqpId 不能为空！！！");
......@@ -221,14 +312,6 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
}
}
private static String getAuthOrg(String authOrg) {
if (!StringUtils.isEmpty(authOrg) && authOrg.startsWith("[") && authOrg.endsWith("]")) {
String str = authOrg.substring(1, authOrg.length() - 1).replace(" ", "").replace(",", "#");
return "#"+ str;
}
return null;
}
/**
* 添加告警记录
* @param alarmType 告警类型
......@@ -239,9 +322,9 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
* @param eqpName 设备名称
* @param cpblName 报警类型
*/
private void addRecordAlarm(String alarmType, String alarmStatus,String sourceId,String orgCode,String authOrg,String eqpName,String cpblName) {
private void addRecordAlarm(String alarmType, String alarmStatus,String sourceId,String orgCode,String authOrg,String eqpName,String cpblName,String alramContent) {
//告警记录
String queryColumn = sourceId + "_" + alarmType;
String queryColumn = sourceId + "_" + cpblName;
//查出当前记录中的告警记录
List<Alarm> curAlarmList = alarmService.findByQueryColumn(queryColumn);
if (curAlarmList != null && curAlarmList.size() > 0) {
......@@ -253,7 +336,7 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
alarm.setContinueDate(subtract);
}
if ("异常".equals(alarmStatus)) {
if (AlarmPointEnum.异常.getName().equals(alarmStatus)||AlarmPointEnum.告警.getName().equals(alarmStatus)) {
alarm.setCurrentState(ALARM_ABNORMAL_STATUS);
} else {
alarm.setClearDate(DateTimeKit.now());
......@@ -264,9 +347,9 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
} else {//记录无告警则新增
Alarm alarm = new Alarm();
alarm.setSourceId(sourceId);
alarm.setAlarmReason(ALARM_DEVICE_AlARAM);
alarm.setAlarmReason(cpblName);
alarm.setAlarmSourceName(eqpName);
alarm.setAlarmLevel(ALARM_DEVICE);
alarm.setAlarmLevel(ALARM_DEVICE_MAJOR);
// alarm.setAlarmSourceIp(sourceId);
alarm.setAlarmSourceType(ALARM_DEVICE_TYPE);
alarm.setClearDate("");
......@@ -275,8 +358,9 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
alarm.setEnsurePerson("");
alarm.setOrgCode(orgCode);
alarm.setHappenDate(DateTimeKit.now());
alarm.setQueryColumn( sourceId + "_" + alarmType);
if ("异常".equals(alarmStatus)) {
alarm.setQueryColumn( sourceId + "_" + cpblName);
List<Alarm> curAlarmRList = alarmService.findByQueryColumn(queryColumn);
if (AlarmPointEnum.异常.getName().equals(alarmStatus)||AlarmPointEnum.异常.getName().equals(alarmStatus)) {
alarm.setCurrentState(ALARM_ABNORMAL_STATUS);
iAlarmDao.save(alarm);
} else {
......@@ -295,21 +379,4 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
public void onError(Exception e) {
log.info("abnormal " + e);
}
public static synchronized void synMonitorAlarmPoint() {
System.out.println("-------------------shidu Monitoring of ring alarms start-------------------------");
try {
Properties props = PropertiesLoaderUtils.loadAllProperties("application.properties");
String monitorAlarmWebSocketClientUrl = (String) props.get("params.remoteWebsocketUrl") + "metricData?subData=shiduAlarm";
ShiduAlarmWebSocketClient client = new ShiduAlarmWebSocketClient(monitorAlarmWebSocketClientUrl);
client.connect();
while (!client.getReadyState().equals(WebSocket.READYSTATE.OPEN)) {
log.info("connecting... shidu Dynamic ring alarm----" + client.getReadyState());
}
System.out.println("build " + monitorAlarmWebSocketClientUrl + "connected...");
} catch (URISyntaxException | IOException e) {
System.out.println(e.getMessage());
e.printStackTrace();
}
}
}
AmosBankService/src/main/java/com/yeejoin/amos/spc/business/dao/mapper/EquipmentMapper.java
View file @ 5360ac70
......@@ -73,4 +73,14 @@ public interface EquipmentMapper extends BaseMapper {
void updateNodeDetail(@Param("nodeid")String nodeid,@Param("nodeDetail")String nodeDetail);
void deleteOneHourNormal();
/**
* 装备同步的时候先删除f_fire_equipment表的所有信息
* @return
*/
void deleteAllEquipmentInfo();
/**
* 装备同步的时候先删除f_fire_equipment_point表装备参数信息
* @return
*/
void deleteAllEquipmentPoint();
}
AmosBankService/src/main/java/com/yeejoin/amos/spc/business/dao/mapper/InputItemMapper.java
View file @ 5360ac70
......@@ -21,4 +21,9 @@ public interface InputItemMapper extends BaseMapper {
List<HashMap<String, Object>> getcountyc(@Param("code") String code);
List<HashMap<String, Object>> getcountnum(@Param("code")String code);
List<HashMap<String, Object>> getxuncount(@Param("code") String code);
/**
* 统计七天之前每天的告警数量
* @return
*/
List<Long> getSevenDayscount (@Param("alarmLevel") String alarmLevel);
}
AmosBankStart/pom.xml
View file @ 5360ac70
......@@ -18,6 +18,12 @@
<artifactId>AmosBankService</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.yeejoin.amos</groupId>
<artifactId>AmosBankService</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<!-- maven打包时将lib提取到jar同目录，将配置文件提取到jar目录/config/下 -->
......
AmosBankStart/src/main/resources/application-dev.properties
View file @ 5360ac70
......@@ -93,5 +93,7 @@ param.remoteurl=http://localhost:8080
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.20:1883
emqx.broker=tcp://172.16.10.85:1883
emqx.password=0
gateway.fegin.name=AMOS-BANK-SERVER-GATEWAY-WJK
\ No newline at end of file
AmosBankStart/src/main/resources/application-prod.properties
View file @ 5360ac70
......@@ -93,7 +93,7 @@ spring.rabbitmq.connection-timeout=1000
spring.redis.jedis.pool.min-idle=0
spring.redis.jedis.pool.max-wait=-1
gateway.fegin.name=AMOS-BANK-SERVER-GATEWAY
param.remoteurl=http://localhost:8080
#tcp.host=172.16.3.42
#tcp.port=8888
......
AmosBankStart/src/main/resources/application-test.properties
View file @ 5360ac70
......@@ -93,7 +93,7 @@ spring.rabbitmq.connection-timeout=1000
spring.redis.jedis.pool.min-idle=0
spring.redis.jedis.pool.max-wait=-1
gateway.fegin.name=AMOS-BANK-SERVER-GATEWAY
param.remoteurl=http://localhost:8080
#tcp.host=172.16.3.42
#tcp.port=8888
\ No newline at end of file
AmosBankStart/src/main/resources/db/mapper/dbTemplate_equipment.xml
View file @ 5360ac70
......@@ -350,4 +350,11 @@
)
</delete>
<delete id="deleteAllEquipmentInfo">
DELETE FROM f_fire_equipment
</delete>
<delete id="deleteAllEquipmentPoint">
DELETE FROM f_fire_equipment_point
</delete>
</mapper>
\ No newline at end of file
AmosBankStart/src/main/resources/db/mapper/dbTemplate_input_item.xml
View file @ 5360ac70
......@@ -164,9 +164,34 @@ from r_risk_level LEFT JOIN (select COUNT(r_risk_source.id) num, r_risk_le
<select id="getxuncount" parameterType="java.lang.String" resultType="java.util.HashMap">
<select id="getxuncount" resultType="java.util.HashMap">
select status ,count(id) num from p_point where p_point.is_delete=0 and p_point.org_code LIKE concat( #{code}, "%") GROUP BY status
</select>
<select id="getSevenDayscount" parameterType="java.lang.String" resultType="java.lang.Long">
SELECT
ifnull( b.count, 0 ) AS count
FROM
(
SELECT
date_sub( curdate( ), INTERVAL 1 DAY ) AS click_date UNION ALL
SELECT
date_sub( curdate( ), INTERVAL 2 DAY ) AS click_date UNION ALL
SELECT
date_sub( curdate( ), INTERVAL 3 DAY ) AS click_date UNION ALL
SELECT
date_sub( curdate( ), INTERVAL 4 DAY ) AS click_date UNION ALL
SELECT
date_sub( curdate( ), INTERVAL 5 DAY ) AS click_date UNION ALL
SELECT
date_sub( curdate( ), INTERVAL 6 DAY ) AS click_date UNION ALL
SELECT
date_sub( curdate( ), INTERVAL 7 DAY ) AS click_date
) a
LEFT JOIN (
SELECT date( happen_date ) AS happen_date, count( * ) AS count FROM spc_alarm
WHERE alarm_level = #{alarmLevel} GROUP BY date( happen_date )
) b ON a.click_date = b.happen_date
ORDER BY a.click_date ASC
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment