|
@@ -288,7 +288,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
|
|
|
public List<BizAccessVO> objAccess(Long modelId, String start, String end) {
|
|
|
List<BizAccessVO> list = new ArrayList<>();
|
|
|
|
|
|
- String sql = "SELECT b.OBJ_ID,c.OBJ_NAME FROM biz_model_detail b,biz_obj c WHERE b.obj_id=c.obj_id AND c.OBJ_TYPE=1";
|
|
|
+ String sql = "SELECT b.OBJ_ID,c.OBJ_NAME,c.OBJ_ADDR FROM biz_model_detail b,biz_obj c WHERE b.obj_id=c.obj_id AND c.OBJ_TYPE=1";
|
|
|
if (modelId != null) {
|
|
|
sql += " AND b.model_id=" + modelId;
|
|
|
}
|
|
@@ -299,6 +299,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
|
|
|
BizAccessVO vo = new BizAccessVO();
|
|
|
Integer objId = (Integer) map.get("OBJ_ID");
|
|
|
String objName = (String) map.get("OBJ_NAME");
|
|
|
+ String code = (String) map.get("OBJ_ADDR");
|
|
|
Vector<Object> v = new Vector<>();
|
|
|
v.add(objId);
|
|
|
String totSql = "SELECT IFNULL(SUM(D_VALUE),0) FROM biz_obj_metrics_data " +
|
|
@@ -324,6 +325,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
|
|
|
|
|
|
vo.setModelName(objName);
|
|
|
vo.setAccess(access);
|
|
|
+ vo.setCode(code);
|
|
|
vo.setNum(num);
|
|
|
list.add(vo);
|
|
|
});
|