Skip to content

谢明辉 / fanxing3

Go to a project
Commit 594d01e3 by xmh
Options

<refactor> 检索数据时日志不带条件

1 parent a498f998
Inline Side-by-side
Showing 3 changed files with 3 additions and 11 deletions
fanxing-query/src/main/java/com/viontech/fanxing/query/controller/web/BehaviorController.java
...@@ -50,9 +50,7 @@ public class BehaviorController extends BehaviorBaseController { ...@@ -50,9 +50,7 @@ public class BehaviorController extends BehaviorBaseController {
@RequestParam(defaultValue = "event_time") String sortName, @RequestParam(defaultValue = "desc") String sortOrder) { @RequestParam(defaultValue = "event_time") String sortName, @RequestParam(defaultValue = "desc") String sortOrder) {
Assert.notNull(behaviorVo.getEventTime_gte(), "起始时间不能为空"); Assert.notNull(behaviorVo.getEventTime_gte(), "起始时间不能为空");
Assert.notNull(behaviorVo.getEventTime_lte(), "结束时间不能为空"); Assert.notNull(behaviorVo.getEventTime_lte(), "结束时间不能为空");
SimplePropertyPreFilter simplePropertyPreFilter = new SimplePropertyPreFilter(); opsClientService.addLog("事件数据检索");
simplePropertyPreFilter.getExcludes().add("model");
opsClientService.addLog("事件数据检索,条件:" + JSON.toJSONString(behaviorVo, SerializeConfig.globalInstance, new SerializeFilter[]{simplePropertyPreFilter}, "yyyy-MM-dd HH:mm:ss", JSON.DEFAULT_GENERATE_FEATURE));
BaseExample baseExample = getExample(behaviorVo, EXAMPLE_TYPE_PAGE); BaseExample baseExample = getExample(behaviorVo, EXAMPLE_TYPE_PAGE);
if (isNotNull(sortOrder) && isNotNull(sortName)) { if (isNotNull(sortOrder) && isNotNull(sortName)) {
......
fanxing-query/src/main/java/com/viontech/fanxing/query/controller/web/FlowEventController.java
...@@ -68,9 +68,7 @@ public class FlowEventController extends FlowEventBaseController { ...@@ -68,9 +68,7 @@ public class FlowEventController extends FlowEventBaseController {
Assert.notNull(trafficFlowRequestVo.getEvent_dt__gte(), "起始时间不能为空"); Assert.notNull(trafficFlowRequestVo.getEvent_dt__gte(), "起始时间不能为空");
Assert.notNull(trafficFlowRequestVo.getEvent_dt__lt(), "结束时间不能为空"); Assert.notNull(trafficFlowRequestVo.getEvent_dt__lt(), "结束时间不能为空");
Assert.hasLength(trafficFlowRequestVo.getStatistic_type(), "统计方式不能为空"); Assert.hasLength(trafficFlowRequestVo.getStatistic_type(), "统计方式不能为空");
SimplePropertyPreFilter simplePropertyPreFilter = new SimplePropertyPreFilter(); opsClientService.addLog("流量数据检索");
simplePropertyPreFilter.getExcludes().add("model");
opsClientService.addLog("流量数据检索,条件:" + JSON.toJSONString(trafficFlowRequestVo, SerializeConfig.globalInstance, new SerializeFilter[]{simplePropertyPreFilter}, "yyyy-MM-dd HH:mm:ss", JSON.DEFAULT_GENERATE_FEATURE));
Map<String, Object> result = statisticsResult(trafficFlowRequestVo); Map<String, Object> result = statisticsResult(trafficFlowRequestVo);
return JsonMessageUtil.getSuccessJsonMsg(result); return JsonMessageUtil.getSuccessJsonMsg(result);
......
fanxing-query/src/main/java/com/viontech/fanxing/query/controller/web/TrafficController.java
...@@ -64,15 +64,11 @@ public class TrafficController extends TrafficBaseController { ...@@ -64,15 +64,11 @@ public class TrafficController extends TrafficBaseController {
} else { } else {
throw new FanXingException("参数有误"); throw new FanXingException("参数有误");
} }
opsClientService.addLog(dataType + "数据检索");
if (StringUtils.isEmpty(trafficVo.getEventCate())) { if (StringUtils.isEmpty(trafficVo.getEventCate())) {
trafficVo.setEventCate("traffic"); trafficVo.setEventCate("traffic");
} }
SimplePropertyPreFilter simplePropertyPreFilter = new SimplePropertyPreFilter();
simplePropertyPreFilter.getExcludes().add("model");
opsClientService.addLog(dataType + "数据检索,条件:" + JSON.toJSONString(trafficVo, SerializeConfig.globalInstance, new SerializeFilter[]{simplePropertyPreFilter}, "yyyy-MM-dd HH:mm:ss", JSON.DEFAULT_GENERATE_FEATURE));
BaseExample baseExample = getExample(trafficVo, EXAMPLE_TYPE_PAGE); BaseExample baseExample = getExample(trafficVo, EXAMPLE_TYPE_PAGE);
if (isNotNull(sortOrder) && isNotNull(sortName)) { if (isNotNull(sortOrder) && isNotNull(sortName)) {
baseExample.setOrderByClause(baseExample.getTableAlias() + "." + sortName + " " + sortOrder); baseExample.setOrderByClause(baseExample.getTableAlias() + "." + sortName + " " + sortOrder);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!