From b71d654e8761d510a8f2c8ee9d689e2596fab137 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Mon, 29 Apr 2024 17:52:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E6=8E=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcDeviceController.java | 1 - .../controller/DcOperLogController.java | 4 +- .../business/domain/DcBatchFunctionsJob.java | 5 +- .../interfaces/OperationLogAspect.java | 118 ++++-------------- .../DcBatchFunctionsJobGroupServiceImpl.java | 1 + .../impl/DcBatchFunctionsJobServiceImpl.java | 2 +- 6 files changed, 30 insertions(+), 101 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java index bb41e2b5..dd305ca3 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java @@ -501,7 +501,6 @@ public class DcDeviceController extends BaseController { if (!Objects.equals(String.valueOf(ajaxResult.get("code")), "200")) { return AjaxResult.error(); } - } } return AjaxResult.success(resultArray); 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 789580f5..451a612a 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 @@ -40,7 +40,7 @@ public class DcOperLogController extends BaseController { @ApiOperation("分页查询列表") @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) { + 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)); } @@ -53,7 +53,7 @@ public class DcOperLogController extends BaseController { @ApiOperation("无分页查询列表") @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) { + 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)); } diff --git a/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java b/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java index ea43a28f..3b896fb1 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java @@ -1,6 +1,7 @@ package com.zc.business.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,8 +16,8 @@ public class DcBatchFunctionsJob { private Long jobId; @ApiModelProperty("任务组ID") private String jobGroup; - //@Excel(name = "任务名称") - @TableField(exist = false) + @Excel(name = "任务名称") + //@TableField(exist = false) private String jobName; @ApiModelProperty("调用目标字符串") private String invokeTarget; 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 d2b38529..72f02414 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 @@ -129,34 +129,13 @@ public class OperationLogAspect { request = null; } - AjaxResult proceed = (AjaxResult) 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")&&Objects.equals(String.valueOf(proceed.get("code")), "200")) { - //if (Objects.equals(String.valueOf(proceed.get("code")), "200")) { - operLog.setStatus(0); - sta = "成功"; - //} else { - // operLog.setStatus(1); - // sta = "失败"; - //} + if (Objects.equals(state, "0") && Objects.equals(String.valueOf(((AjaxResult)jsonResult).get("code")), "200")) { + operLog.setStatus(0); + sta = "成功"; } else { operLog.setStatus(1); sta = "失败"; @@ -164,26 +143,18 @@ public class OperationLogAspect { ArrayList deviceIds = new ArrayList<>(); ArrayList deviceNames = new ArrayList<>(); - //ArrayList functionIds = new ArrayList<>(); String deviceType = ""; StringBuilder remark = new StringBuilder("在" + date + "调用"); if (operUrl.contains("batchFunctions")) { //批量调用 + JSONObject pointArg = null; + if (pointArgs[0] instanceof JSONObject){ + pointArg = (JSONObject) pointArgs[0]; + }else { + pointArg = (JSONObject) JSON.toJSON(pointArgs[0]); + } + - //if (loginUser != null) { - // SysDept sysDept = deptService.selectDeptById(loginUser.getDeptId()); - // - // dcOperLog.setOperName(loginUser.getUsername()); - // dcOperLog.setDeptName(sysDept.getDeptName()); - // dcOperLog.setOperLocation(loginUser.getLoginLocation()); - // dcOperLog.setOperType("2"); - //} else { - // dcOperLog.setOperType("1"); - //} - //dcOperLog.setOperIp(IpUtils.getIpAddr(request)); - //dcOperLog.setOperTime(new Date()); - - JSONObject pointArg = (JSONObject) pointArgs[0]; JSONArray devices = pointArg.getJSONArray("devices"); JSONArray functions = pointArg.getJSONArray("functions"); @@ -230,7 +201,6 @@ public class OperationLogAspect { } } - if (loginUser != null) { SysDept sysDept = deptService.selectDeptById(loginUser.getDeptId()); @@ -241,21 +211,26 @@ public class OperationLogAspect { } else { operLog.setOperType("1"); } - operLog.setOperParam((Arrays.toString(pointArgs))); + + JSONArray jsonArray = (JSONArray) JSON.toJSON(pointArgs); + + operLog.setOperParam(String.valueOf(jsonArray)); operLog.setDcDeviceId(deviceIds.toString()); operLog.setDcDeviceName(deviceNames.toString()); operLog.setOperIp(IpUtils.getIpAddr(request)); operLog.setOperTime(new Date()); operLog.setDcDeviceType(deviceType); operLog.setRemark(remark.toString()); - operLog.setJsonResult(String.valueOf(proceed)); + operLog.setJsonResult(jsonResult.toString()); dcOperLogService.addDcOperLog(operLog); - } else if (operUrl.contains("functions")) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(DcDevice::getIotDeviceId, pointArgs[0]); - DcDevice dcDevice = dcDeviceService.getById(Long.valueOf(String.valueOf(pointArgs[0]))); + List list = dcDeviceService.list(lambdaQueryWrapper); + DcDevice dcDevice = list.get(0); + if (!Objects.isNull(dcDevice)) { Long deviceId = dcDevice.getId(); @@ -271,7 +246,6 @@ public class OperationLogAspect { remark.append(deviceName).append("的").append(hashMap).append("功能并且调用").append(sta).append("了"); - if (loginUser != null) { SysDept sysDept = deptService.selectDeptById(loginUser.getDeptId()); operLog.setOperName(loginUser.getUsername()); @@ -281,7 +255,10 @@ public class OperationLogAspect { } else { operLog.setOperType("1"); } - operLog.setOperParam((Arrays.toString(pointArgs))); + + JSONObject pointArg = (JSONObject) JSON.toJSON(pointArgs); + + operLog.setOperParam(String.valueOf(pointArg)); operLog.setDcDeviceId(deviceIds.toString()); operLog.setDcDeviceName(deviceNames.toString()); operLog.setOperIp(IpUtils.getIpAddr(request)); @@ -290,55 +267,6 @@ public class OperationLogAspect { operLog.setJsonResult(remark.toString()); dcOperLogService.addDcOperLog(operLog); - - // - ////DcDevice dcDevice = list.get(0); - //operLog.setDcDeviceId(String.valueOf(dcDevice.getId())); - //operLog.setDcDeviceName(dcDevice.getDeviceName()); - //deviceType = dcDevice.getDeviceType(); - //operLog.setDcDeviceType(deviceType); - //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 + "调用了" + hashMap + "功能并且调用" + sta + "了"); - ////dcOperLog.setJsonResult(dcDevice.getDeviceName() + "设备在" + date + "调用" + sta + "ID为" + dcDevice.getId() + "的设备功能标识为" + pointArgs[1].toString() + "的方法"); - //dcOperLog.setOperTime(new Date()); - //dcOperLogService.addDcOperLog(dcOperLog); - // - // - //String remark = "设备在" + date + "调用" + sta + "ID为" + deviceIds + "的设备功能标识为" + functionIds + "的方法"; - //System.out.println(remark); - //System.out.println(deviceIds.toString()); - //System.out.println(functionIds.toString()); - //DcOperLog operLog = new DcOperLog(); - //SysDept sysDept = deptService.selectDeptById(loginUser.getDeptId()); - //operLog.setOperParam((Arrays.toString(pointArgs))); - //operLog.setOperLocation(loginUser.getLoginLocation()); - //operLog.setOperName(loginUser.getUsername()); - //operLog.setDeptName(sysDept.getDeptName()); - //operLog.setDcDeviceId(deviceIds.toString()); - //operLog.setOperType("2"); - //operLog.setOperIp(IpUtils.getIpAddr(request)); - //operLog.setOperTime(new Date()); - //operLog.setDcDeviceType(deviceType); - //operLog.setJsonResult(remark); - //if (Objects.equals(state, "0")) { - // operLog.setStatus(0); - //} else { - // operLog.setStatus(1); - //} - //dcOperLogService.addDcOperLog(operLog); - - } } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobGroupServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobGroupServiceImpl.java index 46f8bc39..43642183 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobGroupServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobGroupServiceImpl.java @@ -113,6 +113,7 @@ public class DcBatchFunctionsJobGroupServiceImpl extends ServiceImpl dcBatchFunctionsJobs = dcBatchFunctionsJobService.listDcBatchFunctionsJob(dcBatchFunctionsJob); for (DcBatchFunctionsJob batchFunctionsJob : dcBatchFunctionsJobs) { + batchFunctionsJob.setJobName(dcBatchFunctionsJobGroup.getGroupName()); boolean changeStatus = dcBatchFunctionsJobService.changeStatus(batchFunctionsJob, dcBatchFunctionsJobGroup.getStatus()); if (!changeStatus) { return false; diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java index 02f366f3..1f001728 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java @@ -62,6 +62,7 @@ public class DcBatchFunctionsJobServiceImpl extends ServiceImpl detaileds = detailedConfigurations.stream().filter(detailed -> Objects.equals((String) ((JSONObject) detailed).get("time"), time)