From 84ed19eb28c37ff281cef8b4b60fcdbc85ee066b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Fri, 26 Apr 2024 09:59:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=84=9F=E7=9F=A5?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=20=E9=A6=96=E9=A1=B5=20=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DCPerceivedEventsWarningController.java | 6 +++ .../DcMeteorologicalDetectorDataMapper.xml | 43 +++++++++++++------ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java index 5ee0a3a3..a4378b46 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java @@ -66,6 +66,12 @@ public class DCPerceivedEventsWarningController extends BaseController { public AjaxResult getWarningList(@RequestBody DcWarning dcWarning){ return AjaxResult.success(perceivedEventsWarningService.selectWarningList(dcWarning)); } + //首页感知事件列表分页 + @PostMapping("/warningListPage") + public AjaxResult getWarningListPage(@RequestBody DcWarning dcWarning){ + startPage(); + return AjaxResult.success(perceivedEventsWarningService.selectWarningList(dcWarning)); + } //查询感知数量按照路段数量进行排名 @PostMapping("/sectionPerceivedList") public AjaxResult getSectionPerceivedEventsList(){ diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml index 0e92a0e2..58f68be5 100644 --- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml @@ -194,17 +194,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY d.stake_mark ASC; - + SELECT + d.iot_device_id, + d.stake_mark, + d.direction, + d.device_name, + d.device_state, + d.stake_mark_range, + m.create_time, + m.rainfall, + m.visibility_type, + m.visibility, + m.atmospheric_pressure, + m.temperature, + m.humidity, + m.wind_direction, + m.wind_speed, + m.precipitation_type, + m.wet_slippery_coefficient, + m.remote_road_surface_temperature, + m.remote_road_surface_status, + m.water_film_ice_snow_value + FROM + dc_meteorological_detector_data AS m + LEFT JOIN + dc_device AS d ON d.iot_device_id = m.iot_device_id + + m.visibility_type != '4' + AND m.visibility_type = #{visibilityType} + AND DATE(m.create_time) = CURDATE() + \ No newline at end of file From f725bca89d05740e40c814c34d0f407821e45c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Fri, 26 Apr 2024 09:59:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=84=9F=E7=9F=A5?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=20=E9=A6=96=E9=A1=B5=20=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/business/DcMeteorologicalDetectorDataMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml index 58f68be5..7250028c 100644 --- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml @@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN dc_device AS d ON d.iot_device_id = m.iot_device_id - m.visibility_type != '4' + m.visibility_type != 4 AND m.visibility_type = #{visibilityType} AND DATE(m.create_time) = CURDATE() From 48d09e15da3185fcb7e8c97897feab0821c5efbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Fri, 26 Apr 2024 14:46:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=84=9F=E7=9F=A5?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=20=E9=A6=96=E9=A1=B5=20=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DCPerceivedEventsWarningController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java index a4378b46..cd2b47a6 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java @@ -68,9 +68,9 @@ public class DCPerceivedEventsWarningController extends BaseController { } //首页感知事件列表分页 @PostMapping("/warningListPage") - public AjaxResult getWarningListPage(@RequestBody DcWarning dcWarning){ + public TableDataInfo getWarningListPage(@RequestBody DcWarning dcWarning){ startPage(); - return AjaxResult.success(perceivedEventsWarningService.selectWarningList(dcWarning)); + return getDataTable(perceivedEventsWarningService.selectWarningList(dcWarning)); } //查询感知数量按照路段数量进行排名 @PostMapping("/sectionPerceivedList") From ad5fd5052879ce3cc300dba7e4bff25f0b63ad51 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Fri, 26 Apr 2024 17:22:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/OperationLogAspect.java | 95 +++++++++++++------ .../service/impl/DcOperLogServiceImpl.java | 2 +- 2 files changed, 67 insertions(+), 30 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java index 83e5ad1f..5117f35e 100644 --- a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java +++ b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java @@ -20,6 +20,7 @@ import org.aspectj.lang.annotation.*; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; import java.util.*; @Aspect @@ -51,7 +52,7 @@ public class OperationLogAspect { try { loginUser = SecurityUtils.getLoginUser(); - }catch (Exception e){ + } catch (Exception e) { loginUser = null; } Object[] pointArgs = joinPoint.getArgs(); @@ -60,9 +61,37 @@ public class OperationLogAspect { try { request = ServletUtils.getRequest(); - }catch (Exception e){ + } catch (Exception e) { request = null; } + + //Object proceed = joinPoint.proceed(pointArgs); + //String jsonResultString = ""; + //JSONArray jsonArray = (JSONArray) proceed; + //for (Object o : jsonArray) { + // JSONObject jsonObject = (JSONObject) o; + // if (Objects.equals(jsonObject.getString("code"), "200")) { + // JSONArray data = jsonObject.getJSONArray("data"); + // for (Object datum : data) { + // JSONObject results = (JSONObject) datum; + // JSONObject result = results.getJSONObject("result"); + // if (Objects.equals(result.getString("code"), "200")) { + // jsonResultString = "设备"+d+""; + // } + // } + // } + //} + + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String date = df.format(new Date()); + String sta = ""; + if (Objects.equals(state, "0")) { + dcOperLog.setStatus(0); + sta = "成功"; + } else { + dcOperLog.setStatus(1); + sta = "失败"; + } if (operUrl.contains("batchFunctions")) { if (loginUser != null) { SysDept sysDept = deptService.selectDeptById(loginUser.getDeptId()); @@ -70,16 +99,21 @@ public class OperationLogAspect { dcOperLog.setOperName(loginUser.getUsername()); dcOperLog.setDeptName(sysDept.getDeptName()); dcOperLog.setOperLocation(loginUser.getLoginLocation()); + dcOperLog.setOperType("2"); + } else { + dcOperLog.setOperType("1"); } - dcOperLog.setOperType("2"); dcOperLog.setOperIp(IpUtils.getIpAddr(request)); - dcOperLog.setJsonResult(String.valueOf(joinPoint.proceed(pointArgs))); dcOperLog.setOperTime(new Date()); HashMap> pointArg = (HashMap>) pointArgs[0]; ArrayList devices = pointArg.get("devices"); ArrayList functions = pointArg.get("functions"); + //StringBuilder deviceIds = new StringBuilder(); + //StringBuilder functionIds = new StringBuilder(); + //ArrayList deviceIds = new ArrayList<>(); + ArrayList functionIds = new ArrayList<>(); for (Object dev : devices) { JSONObject device = (JSONObject) JSON.toJSON(dev); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -90,13 +124,21 @@ public class OperationLogAspect { dcOperLog.setDcDeviceId(String.valueOf(dcDevice.getId())); dcOperLog.setDcDeviceName(dcDevice.getDeviceName()); dcOperLog.setDcDeviceType(dcDevice.getDeviceType()); - } - for (Object fun : functions) { - JSONObject function = (JSONObject) JSON.toJSON(fun); - dcOperLog.setOperParam(function.getString("params")); - dcOperLogService.addDcOperLog(dcOperLog); + //deviceIds.add(String.valueOf(dcDevice.getId())); + for (Object fun : functions) { + JSONObject function = (JSONObject) JSON.toJSON(fun); + dcOperLog.setOperParam(function.getString("params")); + //functionIds.add(function.getString("functionId")); + dcOperLog.setJsonResult(dcDevice.getDeviceName() + "设备在" + date + "调用" + sta + "ID为" + dcDevice.getId() + "的设备功能标识为" + function.getString("functionId") + "的方法"); + dcOperLogService.addDcOperLog(dcOperLog); + } } } + //String jsonResult1 = "设备在" + date + "调用" + sta + "ID为" + deviceIds + "的设备功能标识为" + functionIds + "的方法"; + //System.out.println(deviceIds.toString()); + //System.out.println(functionIds.toString()); + //System.out.println(jsonResult1); + } else if (operUrl.contains("functions")) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(DcDevice::getIotDeviceId, pointArgs[0]); @@ -106,27 +148,22 @@ public class OperationLogAspect { dcOperLog.setDcDeviceId(String.valueOf(dcDevice.getId())); dcOperLog.setDcDeviceName(dcDevice.getDeviceName()); dcOperLog.setDcDeviceType(dcDevice.getDeviceType()); + if (loginUser != null) { + SysDept sysDept = deptService.selectDeptById(loginUser.getDeptId()); + + dcOperLog.setOperName(loginUser.getUsername()); + dcOperLog.setDeptName(sysDept.getDeptName()); + dcOperLog.setOperLocation(loginUser.getLoginLocation()); + dcOperLog.setOperType("0"); + } else { + dcOperLog.setOperType("1"); + } + dcOperLog.setOperIp(IpUtils.getIpAddr(request)); + dcOperLog.setOperParam(Arrays.toString(pointArgs)); + dcOperLog.setJsonResult(dcDevice.getDeviceName() + "设备在" + date + "调用" + sta + "ID为" + dcDevice.getId() + "的设备功能标识为" + pointArgs[1].toString() + "的方法"); + dcOperLog.setOperTime(new Date()); + dcOperLogService.addDcOperLog(dcOperLog); } - if (loginUser != null) { - SysDept sysDept = deptService.selectDeptById(loginUser.getDeptId()); - - dcOperLog.setOperName(loginUser.getUsername()); - dcOperLog.setDeptName(sysDept.getDeptName()); - dcOperLog.setOperLocation(loginUser.getLoginLocation()); - dcOperLog.setOperType("0"); - } else { - dcOperLog.setOperType("1"); - } - dcOperLog.setOperIp(IpUtils.getIpAddr(request)); - dcOperLog.setOperParam(Arrays.toString(joinPoint.getArgs())); - dcOperLog.setJsonResult(String.valueOf(joinPoint.proceed(pointArgs))); - if (Objects.equals(state, "0")) { - dcOperLog.setStatus(0); - } else { - dcOperLog.setStatus(1); - } - dcOperLog.setOperTime(new Date()); - dcOperLogService.addDcOperLog(dcOperLog); } } catch (Exception e) { 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 2bead588..53bf6320 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 @@ -66,7 +66,7 @@ public class DcOperLogServiceImpl extends ServiceImpl