|
@@ -171,13 +171,14 @@ public class PersonDeviceFilterLogController {
|
|
@ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
|
|
@ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
|
|
@ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form")
|
|
@ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form")
|
|
})
|
|
})
|
|
- public MessageResult<List> queryUnmeasureGroupList(
|
|
|
|
|
|
+ public MessageResult<Map> queryUnmeasureGroupList(
|
|
String companyId,
|
|
String companyId,
|
|
@DateTimeFormat(pattern = "yyyy-MM-dd") Date queryDate,
|
|
@DateTimeFormat(pattern = "yyyy-MM-dd") Date queryDate,
|
|
String alarmConfigId,
|
|
String alarmConfigId,
|
|
@RequestAttribute String subject,
|
|
@RequestAttribute String subject,
|
|
String token){
|
|
String token){
|
|
- MessageResult<List> msgResult = new MessageResult<>();
|
|
|
|
|
|
+ MessageResult<Map> msgResult = new MessageResult<>();
|
|
|
|
+ Map<String,Object> dataMap = new HashMap<>();
|
|
|
|
|
|
try{
|
|
try{
|
|
PersonInfo personInfo = personInfoService.get(Long.valueOf(subject));
|
|
PersonInfo personInfo = personInfoService.get(Long.valueOf(subject));
|
|
@@ -188,6 +189,8 @@ public class PersonDeviceFilterLogController {
|
|
|
|
|
|
CompanyInfo companyInfo = companyInfoService.get(companyId);
|
|
CompanyInfo companyInfo = companyInfoService.get(companyId);
|
|
|
|
|
|
|
|
+ dataMap.put("companyName",companyInfo.getName());
|
|
|
|
+
|
|
String[] arr = companyInfo.getCode().split(",");
|
|
String[] arr = companyInfo.getCode().split(",");
|
|
|
|
|
|
List<AlarmConfig> configList = null;
|
|
List<AlarmConfig> configList = null;
|
|
@@ -227,7 +230,9 @@ public class PersonDeviceFilterLogController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- msgResult.setData(mapList);
|
|
|
|
|
|
+ dataMap.put("list",mapList);
|
|
|
|
+
|
|
|
|
+ msgResult.setData(dataMap);
|
|
msgResult.setResult(true);
|
|
msgResult.setResult(true);
|
|
}
|
|
}
|
|
catch(Exception ex){
|
|
catch(Exception ex){
|