|
|
@ -37,11 +37,11 @@ public class WarnRuleController extends BasicController {
|
|
|
|
public Response<List<ColumnModel>> listComparator() throws Exception {
|
|
|
|
public Response<List<ColumnModel>> listComparator() throws Exception {
|
|
|
|
List<ColumnModel> result = new ArrayList<>();
|
|
|
|
List<ColumnModel> result = new ArrayList<>();
|
|
|
|
ColumnModel item = new ColumnModel();
|
|
|
|
ColumnModel item = new ColumnModel();
|
|
|
|
item.setName(FloatCompare);
|
|
|
|
item.setType(FloatCompare);
|
|
|
|
item.setComment("浮点型数据比较器");
|
|
|
|
item.setComment("浮点型数据比较器");
|
|
|
|
result.add(item);
|
|
|
|
result.add(item);
|
|
|
|
item = new ColumnModel();
|
|
|
|
item = new ColumnModel();
|
|
|
|
item.setName(IntCompare);
|
|
|
|
item.setType(IntCompare);
|
|
|
|
item.setComment("整型数据比较器");
|
|
|
|
item.setComment("整型数据比较器");
|
|
|
|
result.add(item);
|
|
|
|
result.add(item);
|
|
|
|
return Response.success(result);
|
|
|
|
return Response.success(result);
|
|
|
@ -68,6 +68,17 @@ public class WarnRuleController extends BasicController {
|
|
|
|
@ApiOperation("查询全部列表")
|
|
|
|
@ApiOperation("查询全部列表")
|
|
|
|
public Response<List<WarnRule>> listAll(Integer sensorId) throws Exception {
|
|
|
|
public Response<List<WarnRule>> listAll(Integer sensorId) throws Exception {
|
|
|
|
List<WarnRule> result = service.listAll(sensorId);
|
|
|
|
List<WarnRule> result = service.listAll(sensorId);
|
|
|
|
|
|
|
|
for (WarnRule item : result) {
|
|
|
|
|
|
|
|
if (FloatCompare.equalsIgnoreCase(item.getComparator())) {
|
|
|
|
|
|
|
|
item.setComparatorDesc("浮点型数据比较器");
|
|
|
|
|
|
|
|
String name = floatCompare.supportedOperator().get(item.getOperator());
|
|
|
|
|
|
|
|
item.setOperatorDesc(name);
|
|
|
|
|
|
|
|
} else if (IntCompare.equalsIgnoreCase(item.getComparator())) {
|
|
|
|
|
|
|
|
item.setComparatorDesc("整型数据比较器");
|
|
|
|
|
|
|
|
String name = intCompare.supportedOperator().get(item.getOperator());
|
|
|
|
|
|
|
|
item.setOperatorDesc(name);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
return Response.success(result);
|
|
|
|
return Response.success(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|