diff --git a/ruoyi-ui/src/views/monitor/Interface/index.vue b/ruoyi-ui/src/views/monitor/Interface/index.vue
new file mode 100644
index 00000000..66b89320
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/Interface/index.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java b/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java
index 16195efc..4155c72d 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.zc.business.domain.DcOperLog;
import com.zc.business.service.IDcOperLogService;
import io.swagger.annotations.Api;
@@ -41,39 +42,39 @@ public class DcOperLogController extends BaseController {
}
/**
- * 分页查询列表
+ * 分页查询调用功能记录列表
*
* @param dcOperLog 请求参数
* @return 分页查询结果
*/
@ApiOperation("分页查询列表")
- // @PreAuthorize("@ss.hasPermi('iot:facility:list')")
+ // @PreAuthorize("@ss.hasPermi('iot:facility:list')")
@GetMapping("list")
- public TableDataInfo listFacility( DcOperLog dcOperLog,@RequestParam(value = "endTime", required = false)Date endTime,@RequestParam(value = "startTime", required = false)Date startTime) {
- return getDataTable(dcOperLogService.pageDcOperLog(dcOperLog,endTime,startTime));
+ public TableDataInfo listFacility(DcOperLog dcOperLog, @RequestParam(value = "endTime", required = false) Date endTime, @RequestParam(value = "startTime", required = false) Date startTime) {
+ return getDataTable(dcOperLogService.pageDcOperLog(dcOperLog, endTime, startTime));
}
/**
- * 无分页查询路网设施列表
+ * 无分页查询调用功能记录列表
*
* @param dcOperLog 请求参数
* @return 查询结果
*/
@ApiOperation("无分页查询列表")
- // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+ // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
@GetMapping("query")
- public AjaxResult queryFacility( DcOperLog dcOperLog, @RequestParam(value = "endTime", required = false) Date endTime, @RequestParam(value = "startTime", required = false)Date startTime) {
- return AjaxResult.success(dcOperLogService.listDcOperLog(dcOperLog,endTime,startTime));
+ public AjaxResult queryFacility(DcOperLog dcOperLog, @RequestParam(value = "endTime", required = false) Date endTime, @RequestParam(value = "startTime", required = false) Date startTime) {
+ return AjaxResult.success(dcOperLogService.listDcOperLog(dcOperLog, endTime, startTime));
}
/**
- * 根据id查询路网设施信息
+ * 根据id查询调用功能记录信息
*
* @param id id
* @return 查询结果
*/
@ApiOperation("根据id查询信息")
- // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+ // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
@GetMapping("{id}")
public AjaxResult getFacility(@PathVariable String id) {
return AjaxResult.success(dcOperLogService.getById(id));
@@ -101,7 +102,7 @@ public class DcOperLogController extends BaseController {
* @return 修改操作结果
*/
@ApiOperation("修改")
- // @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
+ // @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
@Log(title = "修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult editFacility(@Valid @RequestBody DcOperLog dcOperLog) {
@@ -115,7 +116,7 @@ public class DcOperLogController extends BaseController {
* @return 删除操作结果
*/
@ApiOperation("删除")
- // @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
+ // @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
@Log(title = "删除", businessType = BusinessType.DELETE)
@DeleteMapping("{ids}")
public AjaxResult removeFacility(@PathVariable List ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java
index bd05e259..88744a8b 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java
@@ -6,14 +6,20 @@ import com.zc.business.domain.DcEventListQuery;
import com.zc.business.domain.export.*;
import com.zc.business.enums.UniversalEnum;
import com.zc.business.service.IDcTrafficIncidentsService;
+import com.zc.common.core.httpclient.exception.HttpException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.ibatis.annotations.Param;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -255,6 +261,297 @@ public class DcTrafficIncidentsController {
return trafficIncidentsService.selectTollStationAnalysis(searchType,facilityIdList,controlType,startTime,endTime);
}
+ @ApiOperation(value="导出收费站统计分析table",tags = {"ECharts导出"})
+ @GetMapping("/exportSelectTollStationAnalysis")
+ public void exportSelectTollStationAnalysis(HttpServletResponse response,
+ @ApiParam(value="查询条件(1:站点,2:原因)", name="searchType", required=true) @RequestParam ("searchType") String searchType,
+ @ApiParam(value="站点id", name="facilityId", required=false) @RequestParam (name="facilityId",required = false) String[] facilityIdList,
+ @ApiParam(value="类型(1:封闭,2:限行)", name="controlType", required=false) @RequestParam (name="controlType",required = false) String controlType,
+ @ApiParam(value="开始时间", name="startTime", required=true) @RequestParam ("startTime") String startTime,
+ @ApiParam(value="结束时间", name="endTime", required=true) @RequestParam ("endTime") String endTime) throws IOException, HttpException {
+ AjaxResult ajaxResult = trafficIncidentsService.selectTollStationAnalysis(searchType,facilityIdList,controlType,startTime,endTime);
+ if ("1".equals(searchType)){
+ List list = new ArrayList<>();
+ if (ajaxResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber())) {
+ List