|
@@ -1,5 +1,7 @@
|
|
|
package com.cyksj.web.controller.manage.corp;
|
|
package com.cyksj.web.controller.manage.corp;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
|
import com.cyksj.common.util.Jsons;
|
|
import com.cyksj.common.util.Jsons;
|
|
|
import com.cyksj.dto.Result;
|
|
import com.cyksj.dto.Result;
|
|
@@ -7,6 +9,7 @@ import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.model.entity.CorpInteractiveRadar;
|
|
import com.cyksj.model.entity.CorpInteractiveRadar;
|
|
|
import com.cyksj.model.entity.CorpInteractiveRadarUserRecord;
|
|
import com.cyksj.model.entity.CorpInteractiveRadarUserRecord;
|
|
|
import com.cyksj.model.entity.CorpInteractiveReaderLink;
|
|
import com.cyksj.model.entity.CorpInteractiveReaderLink;
|
|
|
|
|
+import com.cyksj.model.views.CorpInteractiveRadarOrderDataView;
|
|
|
import com.cyksj.model.views.CorpInteractiveReaderOrderDetailView;
|
|
import com.cyksj.model.views.CorpInteractiveReaderOrderDetailView;
|
|
|
import com.cyksj.model.views.CorpInteractiveReaderView;
|
|
import com.cyksj.model.views.CorpInteractiveReaderView;
|
|
|
import com.cyksj.service.corp.CorpInteractiveRadarService;
|
|
import com.cyksj.service.corp.CorpInteractiveRadarService;
|
|
@@ -100,4 +103,22 @@ public class CorpInteractiveRadarController {
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(detailView);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(detailView);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 雷达数据
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("/get/data/{id}")
|
|
|
|
|
+ public Result<CorpInteractiveRadarOrderDataView> corpInteractiveRadarOrderDataViewResult(@PathVariable Long id) {
|
|
|
|
|
+ CorpInteractiveRadarOrderDataView view = new CorpInteractiveRadarOrderDataView();
|
|
|
|
|
+ DateTime beginOfDay = DateUtil.beginOfDay(DateTime.now());
|
|
|
|
|
+ String idEq = String.format(" cr.id = %s", id);
|
|
|
|
|
+ String conditionSql = String.format(" %s and cr.created_time >= '%s'", idEq, beginOfDay.toString());
|
|
|
|
|
+ CorpInteractiveRadarOrderDataView.CorpInteractiveRadarOrderData today = beanSearcher.searchFirst(CorpInteractiveRadarOrderDataView.CorpInteractiveRadarOrderData.class, MapUtils.builder().put("condition", conditionSql).build());
|
|
|
|
|
+
|
|
|
|
|
+ CorpInteractiveRadarOrderDataView.CorpInteractiveRadarOrderData history = beanSearcher.searchFirst(CorpInteractiveRadarOrderDataView.CorpInteractiveRadarOrderData.class, MapUtils.builder().put("condition", idEq).build());
|
|
|
|
|
+
|
|
|
|
|
+ view.setToday(today);
|
|
|
|
|
+ view.setHistory(history);
|
|
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult(view);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|