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/WeatherForecastController.java b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java index f344d94d..ad47570d 100644 --- a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java +++ b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java @@ -238,9 +238,6 @@ public class WeatherForecastController extends BaseController { parameter.put("stakeNum", numStake); - - JSONObject weather = JSONObject.parseObject(configService.selectConfigByKey("weather")); - try { OkHttp okHttp = new OkHttp(); @@ -249,8 +246,8 @@ public class WeatherForecastController extends BaseController { Response response // 请求响应 = okHttp .headers(new HashMap<>()) - .url(weather.getString("get_weather_info")) // 请求地址 - //.url("http://10.166.133.9:38999/api/weather_service/get_weather_info") // 请求地址 + .url(UniversalEnum.CURRENT_WEATHER_AND_FORECAST_INFORMATION.getValue()) // 请求地址 + //.url("http://10.166.133.9:38999/api/weather_service/get_weather_info_jh") // 请求地址 .data(requestParams) .post(); // 请求方法 @@ -403,11 +400,11 @@ public class WeatherForecastController extends BaseController { jsonArray.add(i,jsonObject); }; if (jsonArray.size() != UniversalEnum.ZERO.getNumber()) { - redisCache.deleteObject("currentWeatherAndForecastInformation" + numStake); - redisCache.setCacheObject("currentWeatherAndForecastInformation" + numStake, jsonArray); + redisCache.deleteObject(UniversalEnum.CURRENT_WEATHER_AND_FORECAST_INFORMATION_SINGLE_WORD.getValue() + numStake); + redisCache.setCacheObject(UniversalEnum.CURRENT_WEATHER_AND_FORECAST_INFORMATION_SINGLE_WORD.getValue() + numStake, jsonArray); return AjaxResult.success(jsonArray); } else { - JSONArray cacheObject = redisCache.getCacheObject("currentWeatherAndForecastInformation" + numStake); + JSONArray cacheObject = redisCache.getCacheObject(UniversalEnum.CURRENT_WEATHER_AND_FORECAST_INFORMATION_SINGLE_WORD.getValue() + numStake); return AjaxResult.success(cacheObject); } } else { @@ -448,9 +445,6 @@ public class WeatherForecastController extends BaseController { @PostMapping(value = "/currentWeatherWarningInformationQuery") public AjaxResult currentWeatherWarningInformationQuery(@RequestBody HashMap parameter) { - - JSONObject weather = JSONObject.parseObject(configService.selectConfigByKey("weather")); - try { OkHttp okHttp = new OkHttp(); @@ -459,8 +453,8 @@ public class WeatherForecastController extends BaseController { Response response // 请求响应 = okHttp .headers(new HashMap<>()) - .url(weather.getString("get_earlyworning_info")) // 请求地址 - //.url("http://10.166.133.9:38999/api/weather_service/get_earlyworning_info") // 请求地址 + .url(UniversalEnum.CURRENT_WEATHER_WARNING_INFORMATION_QUERY.getValue()) // 请求地址 + //.url("http://10.166.133.9:38999/api/weather_service/get_earlyworning_info_jh") // 请求地址 .data(requestParams) .post(); // 请求方法 diff --git a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java index 5282ab65..bf575f57 100644 --- a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java +++ b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java @@ -1,7 +1,7 @@ package com.zc.business.enums; /** - * 情报板车道图标枚举 + * 枚举 * * @author */ @@ -1741,8 +1741,8 @@ public enum UniversalEnum { // 设置预置位 :9021/preset/addPreset SET_PRESET_BIT(0, ":9021/preset/addPreset"), - // currentWeatherAndForecastInformation - CURRENT_WEATHER_AND_FORECAST_INFORMATION(0, "currentWeatherAndForecastInformation"), + // 当前气象及预报信息查询 currentWeatherAndForecastInformation + CURRENT_WEATHER_AND_FORECAST_INFORMATION_SINGLE_WORD(0, "currentWeatherAndForecastInformation"), // /preset/addPreset NEW_PRESET_BIT(0, "/preset/addPreset"), @@ -1759,6 +1759,12 @@ public enum UniversalEnum { // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet DERIVE_THE_TWO_WAY_REAL_TIME_TRAFFIC_FLOW_OF_THE_WHOLE_SECTION(0, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"), + // 当前气象预警信息查询 http://10.166.133.9:38999/api/weather_service/get_earlyworning_info_jh + CURRENT_WEATHER_WARNING_INFORMATION_QUERY(0, "http://10.166.133.9:38999/api/weather_service/get_earlyworning_info_jh"), + + // 当前气象及预报信息查询 http://10.166.133.9:38999/api/weather_service/get_weather_info_jh + CURRENT_WEATHER_AND_FORECAST_INFORMATION(0, "http://10.166.133.9:38999/api/weather_service/get_weather_info_jh"), + // dc_device_type DC_DEVICE_TYPE(0, "dc_device_type"), @@ -2151,6 +2157,9 @@ public enum UniversalEnum { // 右小括号 CLOSING_PARENTHESIS(0, ")"), + // 杠杠左中括号 + BARRE_LEFT_CENTER_BRACKET(0, "\\["), + // 左中括号 LEFT_CENTER_BRACKET(0, "["), diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java index 4c0e3e1d..97c523f6 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java @@ -68,7 +68,7 @@ public class DcOperLogServiceImpl extends ServiceImpl