diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java
index 2d25ebb..cb09a2c 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java
@@ -1,58 +1,65 @@
package org.dromara.common.log.enums;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
/**
* 业务操作类型
*
* @author ruoyi
*/
+@Getter
+@AllArgsConstructor
public enum BusinessType {
/**
* 其它
*/
- OTHER,
+ OTHER("其它"),
/**
* 新增
*/
- INSERT,
+ INSERT("新增"),
/**
* 修改
*/
- UPDATE,
+ UPDATE("修改"),
/**
* 删除
*/
- DELETE,
+ DELETE("删除"),
/**
* 授权
*/
- GRANT,
+ GRANT("授权"),
/**
* 导出
*/
- EXPORT,
+ EXPORT("导出"),
/**
* 导入
*/
- IMPORT,
+ IMPORT("导入"),
/**
* 强退
*/
- FORCE,
+ FORCE("强退"),
/**
* 生成代码
*/
- GENCODE,
+ GENCODE("生成代码"),
/**
* 清空数据
*/
- CLEAN,
+ CLEAN("清空");
+
+ private final String description;
}
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepController.java
index 60b9020..2575da6 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepController.java
@@ -48,7 +48,7 @@ public class EmsAlarmActionStepController extends EmsBaseController
* 导出报警规则具体措施步骤列表
*/
@SaCheckPermission("ems/base:emsAlarmActionStep:export")
- @Log(title = "报警规则具体措施步骤", businessType = BusinessType.EXPORT)
+ @Log(title = "报警规则具体措施步骤", businessType = BusinessType.EXPORT, remark = "导出了报警规则具体措施步骤数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsAlarmActionStep emsAlarmActionStep)
{
@@ -81,7 +81,7 @@ public class EmsAlarmActionStepController extends EmsBaseController
* 新增报警规则具体措施步骤
*/
@SaCheckPermission("ems/base:emsAlarmActionStep:add")
- @Log(title = "报警规则具体措施步骤", businessType = BusinessType.INSERT)
+ @Log(title = "报警规则具体措施步骤", businessType = BusinessType.INSERT, remark = "新增了报警规则具体措施步骤【#emsAlarmActionStep.description}】")
@PostMapping
public R> add(@RequestBody EmsAlarmActionStep emsAlarmActionStep)
{
@@ -92,7 +92,7 @@ public class EmsAlarmActionStepController extends EmsBaseController
* 修改报警规则具体措施步骤
*/
@SaCheckPermission("ems/base:emsAlarmActionStep:edit")
- @Log(title = "报警规则具体措施步骤", businessType = BusinessType.UPDATE)
+ @Log(title = "报警规则具体措施步骤", businessType = BusinessType.UPDATE, remark = "修改了报警规则具体措施步骤【#emsAlarmActionStep.description}】")
@PutMapping
public R> edit(@RequestBody EmsAlarmActionStep emsAlarmActionStep)
{
@@ -103,7 +103,7 @@ public class EmsAlarmActionStepController extends EmsBaseController
* 删除报警规则具体措施步骤
*/
@SaCheckPermission("ems/base:emsAlarmActionStep:remove")
- @Log(title = "报警规则具体措施步骤", businessType = BusinessType.DELETE)
+ @Log(title = "报警规则具体措施步骤", businessType = BusinessType.DELETE, remark = "删除了报警规则具体措施步骤,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable String[] objIds)
{
@@ -143,7 +143,7 @@ public class EmsAlarmActionStepController extends EmsBaseController
* 批量保存措施步骤(包含图片信息)
*/
@SaCheckPermission("ems/base:emsAlarmActionStep:edit")
- @Log(title = "批量保存措施步骤", businessType = BusinessType.UPDATE)
+ @Log(title = "批量保存措施步骤", businessType = BusinessType.UPDATE, remark = "批量保存措施步骤,规则ID:【#ruleObjId}】")
@PostMapping(value = "/batchSave/{ruleObjId}")
public R> batchSaveActionSteps(@PathVariable("ruleObjId") String ruleObjId, @RequestBody List stepList)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepImageController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepImageController.java
index 5bd2a08..98fcc1f 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepImageController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmActionStepImageController.java
@@ -46,7 +46,7 @@ public class EmsAlarmActionStepImageController extends EmsBaseController
* 导出报警措施步骤图片列表
*/
@SaCheckPermission("ems/base:emsAlarmActionStepImage:export")
- @Log(title = "报警措施步骤图片", businessType = BusinessType.EXPORT)
+ @Log(title = "报警措施步骤图片", businessType = BusinessType.EXPORT, remark = "导出了报警措施步骤图片数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsAlarmActionStepImage emsAlarmActionStepImage)
{
@@ -68,7 +68,7 @@ public class EmsAlarmActionStepImageController extends EmsBaseController
* 新增报警措施步骤图片
*/
@SaCheckPermission("ems/base:emsAlarmActionStepImage:add")
- @Log(title = "报警措施步骤图片", businessType = BusinessType.INSERT)
+ @Log(title = "报警措施步骤图片", businessType = BusinessType.INSERT, remark = "新增了报警措施步骤图片【#emsAlarmActionStepImage.description}】")
@PostMapping
public R> add(@RequestBody EmsAlarmActionStepImage emsAlarmActionStepImage)
{
@@ -79,7 +79,7 @@ public class EmsAlarmActionStepImageController extends EmsBaseController
* 修改报警措施步骤图片
*/
@SaCheckPermission("ems/base:emsAlarmActionStepImage:edit")
- @Log(title = "报警措施步骤图片", businessType = BusinessType.UPDATE)
+ @Log(title = "报警措施步骤图片", businessType = BusinessType.UPDATE, remark = "修改了报警措施步骤图片【#emsAlarmActionStepImage.description}】")
@PutMapping
public R> edit(@RequestBody EmsAlarmActionStepImage emsAlarmActionStepImage)
{
@@ -90,7 +90,7 @@ public class EmsAlarmActionStepImageController extends EmsBaseController
* 删除报警措施步骤图片
*/
@SaCheckPermission("ems/base:emsAlarmActionStepImage:remove")
- @Log(title = "报警措施步骤图片", businessType = BusinessType.DELETE)
+ @Log(title = "报警措施步骤图片", businessType = BusinessType.DELETE, remark = "删除了报警措施步骤图片,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable String[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupController.java
index 61e4722..731bb9e 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupController.java
@@ -59,7 +59,7 @@ public class EmsAlarmNotifyGroupController extends BaseController {
* 导出报警通知组主表列表
*/
@SaCheckPermission("ems/base:alarmNotifyGroup:export")
- @Log(title = "报警通知组主表", businessType = BusinessType.EXPORT)
+ @Log(title = "报警通知组主表", businessType = BusinessType.EXPORT, remark = "导出了报警通知组主表数据")
@PostMapping("/export")
public void export(EmsAlarmNotifyGroupBo bo, HttpServletResponse response) {
List list = emsAlarmNotifyGroupService.queryList(bo);
@@ -112,7 +112,7 @@ public class EmsAlarmNotifyGroupController extends BaseController {
* 新增报警通知组主表
*/
@SaCheckPermission("ems/base:alarmNotifyGroup:add")
- @Log(title = "报警通知组主表", businessType = BusinessType.INSERT)
+ @Log(title = "报警通知组主表", businessType = BusinessType.INSERT, remark = "新增了报警通知组主表【#bo.groupName}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsAlarmNotifyGroupBo bo) {
@@ -123,7 +123,7 @@ public class EmsAlarmNotifyGroupController extends BaseController {
* 修改报警通知组主表
*/
@SaCheckPermission("ems/base:alarmNotifyGroup:edit")
- @Log(title = "报警通知组主表", businessType = BusinessType.UPDATE)
+ @Log(title = "报警通知组主表", businessType = BusinessType.UPDATE, remark = "修改了报警通知组主表【#bo.groupName}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsAlarmNotifyGroupBo bo) {
@@ -136,7 +136,7 @@ public class EmsAlarmNotifyGroupController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:alarmNotifyGroup:remove")
- @Log(title = "报警通知组主表", businessType = BusinessType.DELETE)
+ @Log(title = "报警通知组主表", businessType = BusinessType.DELETE, remark = "删除了报警通知组主表,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupUserController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupUserController.java
index 86b6e2d..a2cc388 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupUserController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmNotifyGroupUserController.java
@@ -49,7 +49,7 @@ public class EmsAlarmNotifyGroupUserController extends BaseController {
* 导出报警通知组成员列表
*/
@SaCheckPermission("ems/base:alarmNotifyGroupUser:export")
- @Log(title = "报警通知组成员", businessType = BusinessType.EXPORT)
+ @Log(title = "报警通知组成员", businessType = BusinessType.EXPORT, remark = "导出了报警通知组成员数据")
@PostMapping("/export")
public void export(EmsAlarmNotifyGroupUserBo bo, HttpServletResponse response) {
List list = emsAlarmNotifyGroupUserService.queryList(bo);
@@ -102,7 +102,7 @@ public class EmsAlarmNotifyGroupUserController extends BaseController {
* 新增报警通知组成员
*/
@SaCheckPermission("ems/base:alarmNotifyGroupUser:add")
- @Log(title = "报警通知组成员", businessType = BusinessType.INSERT)
+ @Log(title = "报警通知组成员", businessType = BusinessType.INSERT, remark = "新增了报警通知组成员【#bo.userName}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsAlarmNotifyGroupUserBo bo) {
@@ -113,7 +113,7 @@ public class EmsAlarmNotifyGroupUserController extends BaseController {
* 修改报警通知组成员
*/
@SaCheckPermission("ems/base:alarmNotifyGroupUser:edit")
- @Log(title = "报警通知组成员", businessType = BusinessType.UPDATE)
+ @Log(title = "报警通知组成员", businessType = BusinessType.UPDATE, remark = "修改了报警通知组成员【#bo.userName}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsAlarmNotifyGroupUserBo bo) {
@@ -126,7 +126,7 @@ public class EmsAlarmNotifyGroupUserController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:alarmNotifyGroupUser:remove")
- @Log(title = "报警通知组成员", businessType = BusinessType.DELETE)
+ @Log(title = "报警通知组成员", businessType = BusinessType.DELETE, remark = "删除了报警通知组成员,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmPushLogController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmPushLogController.java
index 5abca50..fc02fd8 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmPushLogController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsAlarmPushLogController.java
@@ -49,7 +49,7 @@ public class EmsAlarmPushLogController extends BaseController {
* 导出报警推送日志列表
*/
@SaCheckPermission("ems/base:alarmPushLog:export")
- @Log(title = "报警推送日志", businessType = BusinessType.EXPORT)
+ @Log(title = "报警推送日志", businessType = BusinessType.EXPORT, remark = "导出了报警推送日志数据")
@PostMapping("/export")
public void export(EmsAlarmPushLogBo bo, HttpServletResponse response) {
List list = emsAlarmPushLogService.queryList(bo);
@@ -102,7 +102,7 @@ public class EmsAlarmPushLogController extends BaseController {
* 新增报警推送日志
*/
@SaCheckPermission("ems/base:alarmPushLog:add")
- @Log(title = "报警推送日志", businessType = BusinessType.INSERT)
+ @Log(title = "报警推送日志", businessType = BusinessType.INSERT, remark = "新增了报警推送日志【#bo.pushContent}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsAlarmPushLogBo bo) {
@@ -113,7 +113,7 @@ public class EmsAlarmPushLogController extends BaseController {
* 修改报警推送日志
*/
@SaCheckPermission("ems/base:alarmPushLog:edit")
- @Log(title = "报警推送日志", businessType = BusinessType.UPDATE)
+ @Log(title = "报警推送日志", businessType = BusinessType.UPDATE, remark = "修改了报警推送日志【#bo.pushContent}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsAlarmPushLogBo bo) {
@@ -126,7 +126,7 @@ public class EmsAlarmPushLogController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:alarmPushLog:remove")
- @Log(title = "报警推送日志", businessType = BusinessType.DELETE)
+ @Log(title = "报警推送日志", businessType = BusinessType.DELETE, remark = "删除了报警推送日志,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java
index 5c97e31..6a56e23 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java
@@ -53,7 +53,7 @@ public class EmsBaseCollectDeviceInfoController extends EmsBaseController {
* 导出采集设备信息列表
*/
@SaCheckPermission("ems/base:baseCollectDeviceInfo:export")
- @Log(title = "采集设备信息", businessType = BusinessType.EXPORT)
+ @Log(title = "采集设备信息", businessType = BusinessType.EXPORT, remark = "导出了采集设备数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) {
List list = emsBaseCollectDeviceInfoService.selectEmsBaseCollectDeviceInfoList(emsBaseCollectDeviceInfo);
@@ -73,7 +73,7 @@ public class EmsBaseCollectDeviceInfoController extends EmsBaseController {
* 新增采集设备信息
*/
@SaCheckPermission("ems/base:baseCollectDeviceInfo:add")
- @Log(title = "采集设备信息", businessType = BusinessType.INSERT)
+ @Log(title = "采集设备信息", businessType = BusinessType.INSERT, remark = "新增了采集设备【#emsBaseCollectDeviceInfo.collectDeviceName}】")
@PostMapping
public R> add(@RequestBody EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) {
return toAjax(emsBaseCollectDeviceInfoService.insertEmsBaseCollectDeviceInfo(emsBaseCollectDeviceInfo));
@@ -83,7 +83,7 @@ public class EmsBaseCollectDeviceInfoController extends EmsBaseController {
* 修改采集设备信息
*/
@SaCheckPermission("ems/base:baseCollectDeviceInfo:edit")
- @Log(title = "采集设备信息", businessType = BusinessType.UPDATE)
+ @Log(title = "采集设备信息", businessType = BusinessType.UPDATE, remark = "修改了采集设备【#emsBaseCollectDeviceInfo.collectDeviceName}】")
@PutMapping
public R> edit(@RequestBody EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) {
return toAjax(emsBaseCollectDeviceInfoService.updateEmsBaseCollectDeviceInfo(emsBaseCollectDeviceInfo));
@@ -93,7 +93,7 @@ public class EmsBaseCollectDeviceInfoController extends EmsBaseController {
* 删除采集设备信息
*/
@SaCheckPermission("ems/base:baseCollectDeviceInfo:remove")
- @Log(title = "采集设备信息", businessType = BusinessType.DELETE)
+ @Log(title = "采集设备信息", businessType = BusinessType.DELETE, remark = "删除了采集设备,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsBaseCollectDeviceInfoService.deleteEmsBaseCollectDeviceInfoByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java
index a45e203..542af25 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java
@@ -46,7 +46,7 @@ public class EmsBaseEnergyPriceController extends EmsBaseController
* 导出能源月份单价列表
*/
@SaCheckPermission("ems/base:baseEnergyPrice:export")
- @Log(title = "能源月份单价", businessType = BusinessType.EXPORT)
+ @Log(title = "能源月份单价", businessType = BusinessType.EXPORT, remark = "导出了能源月份单价数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseEnergyPrice emsBaseEnergyPrice)
{
@@ -68,7 +68,7 @@ public class EmsBaseEnergyPriceController extends EmsBaseController
* 新增能源月份单价
*/
@SaCheckPermission("ems/base:baseEnergyPrice:add")
- @Log(title = "能源月份单价", businessType = BusinessType.INSERT)
+ @Log(title = "能源月份单价", businessType = BusinessType.INSERT, remark = "新增了能源月份单价【#emsBaseEnergyPrice.energyName}】")
@PostMapping
public R> add(@RequestBody EmsBaseEnergyPrice emsBaseEnergyPrice)
{
@@ -79,7 +79,7 @@ public class EmsBaseEnergyPriceController extends EmsBaseController
* 修改能源月份单价
*/
@SaCheckPermission("ems/base:baseEnergyPrice:edit")
- @Log(title = "能源月份单价", businessType = BusinessType.UPDATE)
+ @Log(title = "能源月份单价", businessType = BusinessType.UPDATE, remark = "修改了能源月份单价【#emsBaseEnergyPrice.energyName}】")
@PutMapping
public R> edit(@RequestBody EmsBaseEnergyPrice emsBaseEnergyPrice)
{
@@ -90,7 +90,7 @@ public class EmsBaseEnergyPriceController extends EmsBaseController
* 删除能源月份单价
*/
@SaCheckPermission("ems/base:baseEnergyPrice:remove")
- @Log(title = "能源月份单价", businessType = BusinessType.DELETE)
+ @Log(title = "能源月份单价", businessType = BusinessType.DELETE, remark = "删除了能源月份单价,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java
index 1da0c1f..c67771b 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java
@@ -67,7 +67,7 @@ public class EmsBaseEnergyTypeController extends EmsBaseController
* 导出能源类型信息列表
*/
@SaCheckPermission("ems/base:baseEnergyType:export")
- @Log(title = "能源类型信息", businessType = BusinessType.EXPORT)
+ @Log(title = "能源类型信息", businessType = BusinessType.EXPORT, remark = "导出了能源类型数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseEnergyType emsBaseEnergyType)
{
@@ -89,7 +89,7 @@ public class EmsBaseEnergyTypeController extends EmsBaseController
* 新增能源类型信息
*/
@SaCheckPermission("ems/base:baseEnergyType:add")
- @Log(title = "能源类型信息", businessType = BusinessType.INSERT)
+ @Log(title = "能源类型信息", businessType = BusinessType.INSERT, remark = "新增了能源类型【#emsBaseEnergyType.energyName}】")
@PostMapping
public R> add(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
{
@@ -100,7 +100,7 @@ public class EmsBaseEnergyTypeController extends EmsBaseController
* 修改能源类型信息
*/
@SaCheckPermission("ems/base:baseEnergyType:edit")
- @Log(title = "能源类型信息", businessType = BusinessType.UPDATE)
+ @Log(title = "能源类型信息", businessType = BusinessType.UPDATE, remark = "修改了能源类型【#emsBaseEnergyType.energyName}】")
@PutMapping
public R> edit(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
{
@@ -111,7 +111,7 @@ public class EmsBaseEnergyTypeController extends EmsBaseController
* 删除能源类型信息
*/
@SaCheckPermission("ems/base:baseEnergyType:remove")
- @Log(title = "能源类型信息", businessType = BusinessType.DELETE)
+ @Log(title = "能源类型信息", businessType = BusinessType.DELETE, remark = "删除了能源类型,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java
index bb838bf..1ee79a0 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java
@@ -54,7 +54,7 @@ public class EmsBaseMonitorInfoController extends EmsBaseController
* 导出计量设备信息列表
*/
@SaCheckPermission("ems/base:baseMonitorInfo:export")
- @Log(title = "计量设备信息", businessType = BusinessType.EXPORT)
+ @Log(title = "计量设备信息", businessType = BusinessType.EXPORT, remark = "导出了计量设备数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseMonitorInfo emsBaseMonitorInfo)
{
@@ -76,7 +76,7 @@ public class EmsBaseMonitorInfoController extends EmsBaseController
* 新增计量设备信息
*/
@SaCheckPermission("ems/base:baseMonitorInfo:add")
- @Log(title = "计量设备信息", businessType = BusinessType.INSERT)
+ @Log(title = "计量设备信息", businessType = BusinessType.INSERT, remark = "新增了计量设备【#emsBaseMonitorInfo.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsBaseMonitorInfo emsBaseMonitorInfo)
{
@@ -87,7 +87,7 @@ public class EmsBaseMonitorInfoController extends EmsBaseController
* 修改计量设备信息
*/
@SaCheckPermission("ems/base:baseMonitorInfo:edit")
- @Log(title = "计量设备信息", businessType = BusinessType.UPDATE)
+ @Log(title = "计量设备信息", businessType = BusinessType.UPDATE, remark = "修改了计量设备【#emsBaseMonitorInfo.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsBaseMonitorInfo emsBaseMonitorInfo)
{
@@ -98,7 +98,7 @@ public class EmsBaseMonitorInfoController extends EmsBaseController
* 删除计量设备信息
*/
@SaCheckPermission("ems/base:baseMonitorInfo:remove")
- @Log(title = "计量设备信息", businessType = BusinessType.DELETE)
+ @Log(title = "计量设备信息", businessType = BusinessType.DELETE, remark = "删除了计量设备,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java
index 5de6206..cac0750 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java
@@ -43,7 +43,7 @@ public class EmsBaseMonitorThresholdController extends EmsBaseController {
* 导出计量设备阈值维护列表
*/
@SaCheckPermission("ems/base:baseMonitorThreshold:export")
- @Log(title = "计量设备阈值维护", businessType = BusinessType.EXPORT)
+ @Log(title = "计量设备阈值维护", businessType = BusinessType.EXPORT, remark = "导出了计量设备阈值数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseMonitorThreshold emsBaseMonitorThreshold) {
List list = emsBaseMonitorThresholdService.selectEmsBaseMonitorThresholdList(emsBaseMonitorThreshold);
@@ -63,7 +63,7 @@ public class EmsBaseMonitorThresholdController extends EmsBaseController {
* 新增计量设备阈值维护
*/
@SaCheckPermission("ems/base:baseMonitorThreshold:add")
- @Log(title = "计量设备阈值维护", businessType = BusinessType.INSERT)
+ @Log(title = "计量设备阈值维护", businessType = BusinessType.INSERT, remark = "新增了计量设备阈值【#emsBaseMonitorThreshold.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsBaseMonitorThreshold emsBaseMonitorThreshold) {
return toAjax(emsBaseMonitorThresholdService.insertEmsBaseMonitorThreshold(emsBaseMonitorThreshold));
@@ -73,7 +73,7 @@ public class EmsBaseMonitorThresholdController extends EmsBaseController {
* 修改计量设备阈值维护
*/
@SaCheckPermission("ems/base:baseMonitorThreshold:edit")
- @Log(title = "计量设备阈值维护", businessType = BusinessType.UPDATE)
+ @Log(title = "计量设备阈值维护", businessType = BusinessType.UPDATE, remark = "修改了计量设备阈值【#emsBaseMonitorThreshold.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsBaseMonitorThreshold emsBaseMonitorThreshold) {
return toAjax(emsBaseMonitorThresholdService.updateEmsBaseMonitorThreshold(emsBaseMonitorThreshold));
@@ -83,7 +83,7 @@ public class EmsBaseMonitorThresholdController extends EmsBaseController {
* 删除计量设备阈值维护
*/
@SaCheckPermission("ems/base:baseMonitorThreshold:remove")
- @Log(title = "计量设备阈值维护", businessType = BusinessType.DELETE)
+ @Log(title = "计量设备阈值维护", businessType = BusinessType.DELETE, remark = "删除了计量设备阈值,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsBaseMonitorThresholdService.deleteEmsBaseMonitorThresholdByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java
index 6ede8d7..a141d9c 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java
@@ -44,7 +44,7 @@ public class EmsBaseMonitorWorkUnitController extends EmsBaseController {
* 导出统计计量信息列表
*/
@SaCheckPermission("ems/base:baseMonitorWorkUnit:export")
- @Log(title = "统计计量信息" , businessType = BusinessType.EXPORT)
+ @Log(title = "统计计量信息" , businessType = BusinessType.EXPORT, remark = "导出了统计计量数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) {
List list = emsBaseMonitorWorkUnitService.selectEmsBaseMonitorWorkUnitList(emsBaseMonitorWorkUnit);
@@ -64,7 +64,7 @@ public class EmsBaseMonitorWorkUnitController extends EmsBaseController {
* 新增统计计量信息
*/
@SaCheckPermission("ems/base:baseMonitorWorkUnit:add")
- @Log(title = "统计计量信息" , businessType = BusinessType.INSERT)
+ @Log(title = "统计计量信息" , businessType = BusinessType.INSERT, remark = "新增了统计计量【#emsBaseMonitorWorkUnit.workUnitName}】")
@PostMapping
public R> add(@RequestBody EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) {
return toAjax(emsBaseMonitorWorkUnitService.insertEmsBaseMonitorWorkUnit(emsBaseMonitorWorkUnit));
@@ -74,7 +74,7 @@ public class EmsBaseMonitorWorkUnitController extends EmsBaseController {
* 修改统计计量信息
*/
@SaCheckPermission("ems/base:baseMonitorWorkUnit:edit")
- @Log(title = "统计计量信息" , businessType = BusinessType.UPDATE)
+ @Log(title = "统计计量信息" , businessType = BusinessType.UPDATE, remark = "修改了统计计量【#emsBaseMonitorWorkUnit.workUnitName}】")
@PutMapping
public R> edit(@RequestBody EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) {
return toAjax(emsBaseMonitorWorkUnitService.updateEmsBaseMonitorWorkUnit(emsBaseMonitorWorkUnit));
@@ -84,7 +84,7 @@ public class EmsBaseMonitorWorkUnitController extends EmsBaseController {
* 删除统计计量信息
*/
@SaCheckPermission("ems/base:baseMonitorWorkUnit:remove")
- @Log(title = "统计计量信息" , businessType = BusinessType.DELETE)
+ @Log(title = "统计计量信息" , businessType = BusinessType.DELETE, remark = "删除了统计计量,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsBaseMonitorWorkUnitService.deleteEmsBaseMonitorWorkUnitByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java
index a2cc989..a357a46 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java
@@ -44,7 +44,7 @@ public class EmsBaseSharePriceController extends EmsBaseController {
* 导出分时电价维护列表
*/
@SaCheckPermission("ems/base:baseSharePrice:export")
- @Log(title = "分时电价维护", businessType = BusinessType.EXPORT)
+ @Log(title = "分时电价维护", businessType = BusinessType.EXPORT, remark = "导出了分时电价数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseSharePrice emsBaseSharePrice) {
List list = emsBaseSharePriceService.selectEmsBaseSharePriceList(emsBaseSharePrice);
@@ -64,7 +64,7 @@ public class EmsBaseSharePriceController extends EmsBaseController {
* 新增分时电价维护
*/
@SaCheckPermission("ems/base:baseSharePrice:add")
- @Log(title = "分时电价维护", businessType = BusinessType.INSERT)
+ @Log(title = "分时电价维护", businessType = BusinessType.INSERT, remark = "新增了分时电价【#emsBaseSharePrice.priceType}】")
@PostMapping
public R> add(@RequestBody EmsBaseSharePrice emsBaseSharePrice) {
return toAjax(emsBaseSharePriceService.insertEmsBaseSharePrice(emsBaseSharePrice));
@@ -74,7 +74,7 @@ public class EmsBaseSharePriceController extends EmsBaseController {
* 修改分时电价维护
*/
@SaCheckPermission("ems/base:baseSharePrice:edit")
- @Log(title = "分时电价维护", businessType = BusinessType.UPDATE)
+ @Log(title = "分时电价维护", businessType = BusinessType.UPDATE, remark = "修改了分时电价【#emsBaseSharePrice.priceType}】")
@PutMapping
public R> edit(@RequestBody EmsBaseSharePrice emsBaseSharePrice) {
return toAjax(emsBaseSharePriceService.updateEmsBaseSharePrice(emsBaseSharePrice));
@@ -84,7 +84,7 @@ public class EmsBaseSharePriceController extends EmsBaseController {
* 删除分时电价维护
*/
@SaCheckPermission("ems/base:baseSharePrice:remove")
- @Log(title = "分时电价维护", businessType = BusinessType.DELETE)
+ @Log(title = "分时电价维护", businessType = BusinessType.DELETE, remark = "删除了分时电价,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsBaseSharePriceService.deleteEmsBaseSharePriceByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java
index d5032fe..f4988fe 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java
@@ -54,7 +54,7 @@ public class EmsBaseWorkUnitController extends EmsBaseController
* 导出统计单元信息列表
*/
@SaCheckPermission("ems/base:baseWorkUnit:export")
- @Log(title = "统计单元信息", businessType = BusinessType.EXPORT)
+ @Log(title = "统计单元信息", businessType = BusinessType.EXPORT, remark = "导出了统计单元数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseWorkUnit emsBaseWorkUnit)
{
@@ -76,7 +76,7 @@ public class EmsBaseWorkUnitController extends EmsBaseController
* 新增统计单元信息
*/
@SaCheckPermission("ems/base:baseWorkUnit:add")
- @Log(title = "统计单元信息", businessType = BusinessType.INSERT)
+ @Log(title = "统计单元信息", businessType = BusinessType.INSERT, remark = "新增了统计单元【#emsBaseWorkUnit.workUnitName}】")
@PostMapping
public R> add(@RequestBody EmsBaseWorkUnit emsBaseWorkUnit)
{
@@ -87,7 +87,7 @@ public class EmsBaseWorkUnitController extends EmsBaseController
* 修改统计单元信息
*/
@SaCheckPermission("ems/base:baseWorkUnit:edit")
- @Log(title = "统计单元信息", businessType = BusinessType.UPDATE)
+ @Log(title = "统计单元信息", businessType = BusinessType.UPDATE, remark = "修改了统计单元【#emsBaseWorkUnit.workUnitName}】")
@PutMapping
public R> edit(@RequestBody EmsBaseWorkUnit emsBaseWorkUnit)
{
@@ -98,7 +98,7 @@ public class EmsBaseWorkUnitController extends EmsBaseController
* 删除统计单元信息
*/
@SaCheckPermission("ems/base:baseWorkUnit:remove")
- @Log(title = "统计单元信息", businessType = BusinessType.DELETE)
+ @Log(title = "统计单元信息", businessType = BusinessType.DELETE, remark = "删除了统计单元,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsControlCommandLogController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsControlCommandLogController.java
index 124b2b5..ffc7df4 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsControlCommandLogController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsControlCommandLogController.java
@@ -49,7 +49,7 @@ public class EmsControlCommandLogController extends BaseController {
* 导出回写命令日志列表
*/
@SaCheckPermission("ems/base:controlCommandLog:export")
- @Log(title = "回写命令日志", businessType = BusinessType.EXPORT)
+ @Log(title = "回写命令日志", businessType = BusinessType.EXPORT, remark = "导出了回写命令日志数据")
@PostMapping("/export")
public void export(EmsControlCommandLogBo bo, HttpServletResponse response) {
List list = emsControlCommandLogService.queryList(bo);
@@ -102,7 +102,7 @@ public class EmsControlCommandLogController extends BaseController {
* 新增回写命令日志
*/
@SaCheckPermission("ems/base:controlCommandLog:add")
- @Log(title = "回写命令日志", businessType = BusinessType.INSERT)
+ @Log(title = "回写命令日志", businessType = BusinessType.INSERT, remark = "新增了回写命令日志【#bo.commandType}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsControlCommandLogBo bo) {
@@ -113,7 +113,7 @@ public class EmsControlCommandLogController extends BaseController {
* 修改回写命令日志
*/
@SaCheckPermission("ems/base:controlCommandLog:edit")
- @Log(title = "回写命令日志", businessType = BusinessType.UPDATE)
+ @Log(title = "回写命令日志", businessType = BusinessType.UPDATE, remark = "修改了回写命令日志【#bo.commandType}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsControlCommandLogBo bo) {
@@ -126,7 +126,7 @@ public class EmsControlCommandLogController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:controlCommandLog:remove")
- @Log(title = "回写命令日志", businessType = BusinessType.DELETE)
+ @Log(title = "回写命令日志", businessType = BusinessType.DELETE, remark = "删除了回写命令日志,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsDataExportTaskController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsDataExportTaskController.java
index 5bed21f..90fa92c 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsDataExportTaskController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsDataExportTaskController.java
@@ -49,7 +49,7 @@ public class EmsDataExportTaskController extends BaseController {
* 导出数据导出任务列表
*/
@SaCheckPermission("ems/base:dataExportTask:export")
- @Log(title = "数据导出任务", businessType = BusinessType.EXPORT)
+ @Log(title = "数据导出任务", businessType = BusinessType.EXPORT, remark = "导出了数据导出任务数据")
@PostMapping("/export")
public void export(EmsDataExportTaskBo bo, HttpServletResponse response) {
List list = emsDataExportTaskService.queryList(bo);
@@ -102,7 +102,7 @@ public class EmsDataExportTaskController extends BaseController {
* 新增数据导出任务
*/
@SaCheckPermission("ems/base:dataExportTask:add")
- @Log(title = "数据导出任务", businessType = BusinessType.INSERT)
+ @Log(title = "数据导出任务", businessType = BusinessType.INSERT, remark = "新增了数据导出任务【#bo.fileName}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsDataExportTaskBo bo) {
@@ -113,7 +113,7 @@ public class EmsDataExportTaskController extends BaseController {
* 修改数据导出任务
*/
@SaCheckPermission("ems/base:dataExportTask:edit")
- @Log(title = "数据导出任务", businessType = BusinessType.UPDATE)
+ @Log(title = "数据导出任务", businessType = BusinessType.UPDATE, remark = "修改了数据导出任务【#bo.fileName}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsDataExportTaskBo bo) {
@@ -126,7 +126,7 @@ public class EmsDataExportTaskController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:dataExportTask:remove")
- @Log(title = "数据导出任务", businessType = BusinessType.DELETE)
+ @Log(title = "数据导出任务", businessType = BusinessType.DELETE, remark = "删除了数据导出任务,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationEndpointController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationEndpointController.java
index 66cfad6..9e80450 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationEndpointController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationEndpointController.java
@@ -100,7 +100,7 @@ public class EmsIntegrationEndpointController extends BaseController {
* 后续如果接入真实协议执行器,优先从工作台服务向下扩展。
*/
@SaCheckPermission("ems/base:integrationEndpoint:edit")
- @Log(title = "协议工作台命令下发", businessType = BusinessType.INSERT)
+ @Log(title = "协议工作台命令下发", businessType = BusinessType.INSERT, remark = "下发了协议工作台命令")
@PostMapping("/dispatchCommand")
public R> dispatchCommand(@RequestBody IntegrationCommandDispatchBo bo) {
return R.ok(integrationWorkbenchService.dispatchCommand(bo));
@@ -110,7 +110,7 @@ public class EmsIntegrationEndpointController extends BaseController {
* 导出对接端点配置列表
*/
@SaCheckPermission("ems/base:integrationEndpoint:export")
- @Log(title = "对接端点配置", businessType = BusinessType.EXPORT)
+ @Log(title = "对接端点配置", businessType = BusinessType.EXPORT, remark = "导出了对接端点配置数据")
@PostMapping("/export")
public void export(EmsIntegrationEndpointBo bo, HttpServletResponse response) {
List list = emsIntegrationEndpointService.queryList(bo);
@@ -163,7 +163,7 @@ public class EmsIntegrationEndpointController extends BaseController {
* 新增对接端点配置
*/
@SaCheckPermission("ems/base:integrationEndpoint:add")
- @Log(title = "对接端点配置", businessType = BusinessType.INSERT)
+ @Log(title = "对接端点配置", businessType = BusinessType.INSERT, remark = "新增了对接端点配置【#bo.endpointName}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsIntegrationEndpointBo bo) {
@@ -174,7 +174,7 @@ public class EmsIntegrationEndpointController extends BaseController {
* 修改对接端点配置
*/
@SaCheckPermission("ems/base:integrationEndpoint:edit")
- @Log(title = "对接端点配置", businessType = BusinessType.UPDATE)
+ @Log(title = "对接端点配置", businessType = BusinessType.UPDATE, remark = "修改了对接端点配置【#bo.endpointName}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsIntegrationEndpointBo bo) {
@@ -187,7 +187,7 @@ public class EmsIntegrationEndpointController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:integrationEndpoint:remove")
- @Log(title = "对接端点配置", businessType = BusinessType.DELETE)
+ @Log(title = "对接端点配置", businessType = BusinessType.DELETE, remark = "删除了对接端点配置,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationPointMapController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationPointMapController.java
index 4fa6a7c..602a8b1 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationPointMapController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsIntegrationPointMapController.java
@@ -49,7 +49,7 @@ public class EmsIntegrationPointMapController extends BaseController {
* 导出对接点位映射列表
*/
@SaCheckPermission("ems/base:integrationPointMap:export")
- @Log(title = "对接点位映射", businessType = BusinessType.EXPORT)
+ @Log(title = "对接点位映射", businessType = BusinessType.EXPORT, remark = "导出了对接点位映射数据")
@PostMapping("/export")
public void export(EmsIntegrationPointMapBo bo, HttpServletResponse response) {
List list = emsIntegrationPointMapService.queryList(bo);
@@ -102,7 +102,7 @@ public class EmsIntegrationPointMapController extends BaseController {
* 新增对接点位映射
*/
@SaCheckPermission("ems/base:integrationPointMap:add")
- @Log(title = "对接点位映射", businessType = BusinessType.INSERT)
+ @Log(title = "对接点位映射", businessType = BusinessType.INSERT, remark = "新增了对接点位映射【#bo.monitorCode}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsIntegrationPointMapBo bo) {
@@ -113,7 +113,7 @@ public class EmsIntegrationPointMapController extends BaseController {
* 修改对接点位映射
*/
@SaCheckPermission("ems/base:integrationPointMap:edit")
- @Log(title = "对接点位映射", businessType = BusinessType.UPDATE)
+ @Log(title = "对接点位映射", businessType = BusinessType.UPDATE, remark = "修改了对接点位映射【#bo.monitorCode}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsIntegrationPointMapBo bo) {
@@ -126,7 +126,7 @@ public class EmsIntegrationPointMapController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:integrationPointMap:remove")
- @Log(title = "对接点位映射", businessType = BusinessType.DELETE)
+ @Log(title = "对接点位映射", businessType = BusinessType.DELETE, remark = "删除了对接点位映射,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsMonitorMetricThresholdController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsMonitorMetricThresholdController.java
index 78e5fbd..2dbc23d 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsMonitorMetricThresholdController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsMonitorMetricThresholdController.java
@@ -59,7 +59,7 @@ public class EmsMonitorMetricThresholdController extends BaseController {
* 导出统一点位阈值列表
*/
@SaCheckPermission("ems/base:monitorMetricThreshold:export")
- @Log(title = "统一点位阈值", businessType = BusinessType.EXPORT)
+ @Log(title = "统一点位阈值", businessType = BusinessType.EXPORT, remark = "导出了统一点位阈值数据")
@PostMapping("/export")
public void export(EmsMonitorMetricThresholdBo bo, HttpServletResponse response) {
List list = emsMonitorMetricThresholdService.queryList(bo);
@@ -112,7 +112,7 @@ public class EmsMonitorMetricThresholdController extends BaseController {
* 新增统一点位阈值
*/
@SaCheckPermission("ems/base:monitorMetricThreshold:add")
- @Log(title = "统一点位阈值", businessType = BusinessType.INSERT)
+ @Log(title = "统一点位阈值", businessType = BusinessType.INSERT, remark = "新增了统一点位阈值【#bo.monitorCode}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsMonitorMetricThresholdBo bo) {
@@ -123,7 +123,7 @@ public class EmsMonitorMetricThresholdController extends BaseController {
* 修改统一点位阈值
*/
@SaCheckPermission("ems/base:monitorMetricThreshold:edit")
- @Log(title = "统一点位阈值", businessType = BusinessType.UPDATE)
+ @Log(title = "统一点位阈值", businessType = BusinessType.UPDATE, remark = "修改了统一点位阈值【#bo.monitorCode}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsMonitorMetricThresholdBo bo) {
@@ -136,7 +136,7 @@ public class EmsMonitorMetricThresholdController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:monitorMetricThreshold:remove")
- @Log(title = "统一点位阈值", businessType = BusinessType.DELETE)
+ @Log(title = "统一点位阈值", businessType = BusinessType.DELETE, remark = "删除了统一点位阈值,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsReportPeriodSummaryController.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsReportPeriodSummaryController.java
index 3e59891..17279e7 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsReportPeriodSummaryController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/controller/EmsReportPeriodSummaryController.java
@@ -58,7 +58,7 @@ public class EmsReportPeriodSummaryController extends BaseController {
* 导出周期报汇总列表
*/
@SaCheckPermission("ems/base:reportPeriodSummary:export")
- @Log(title = "周期报汇总", businessType = BusinessType.EXPORT)
+ @Log(title = "周期报汇总", businessType = BusinessType.EXPORT, remark = "导出了周期报汇总数据")
@PostMapping("/export")
public void export(EmsReportPeriodSummaryBo bo, HttpServletResponse response) {
List list = emsReportPeriodSummaryService.queryList(bo);
@@ -69,7 +69,7 @@ public class EmsReportPeriodSummaryController extends BaseController {
* 导出动态聚合后的周期报表。
*/
@SaCheckPermission("ems/base:reportPeriodSummary:export")
- @Log(title = "周期报汇总", businessType = BusinessType.EXPORT)
+ @Log(title = "周期报汇总", businessType = BusinessType.EXPORT, remark = "导出了周期报汇总聚合数据")
@PostMapping("/aggregateExport")
public void aggregateExport(EmsReportPeriodSummaryBo bo, HttpServletResponse response) {
List list = emsReportPeriodSummaryService.queryAggregateList(bo);
@@ -122,7 +122,7 @@ public class EmsReportPeriodSummaryController extends BaseController {
* 新增周期报汇总
*/
@SaCheckPermission("ems/base:reportPeriodSummary:add")
- @Log(title = "周期报汇总", businessType = BusinessType.INSERT)
+ @Log(title = "周期报汇总", businessType = BusinessType.INSERT, remark = "新增了周期报汇总【#bo.monitorCode}】")
@RepeatSubmit()
@PostMapping()
public R add(@Validated(AddGroup.class) @RequestBody EmsReportPeriodSummaryBo bo) {
@@ -133,7 +133,7 @@ public class EmsReportPeriodSummaryController extends BaseController {
* 修改周期报汇总
*/
@SaCheckPermission("ems/base:reportPeriodSummary:edit")
- @Log(title = "周期报汇总", businessType = BusinessType.UPDATE)
+ @Log(title = "周期报汇总", businessType = BusinessType.UPDATE, remark = "修改了周期报汇总【#bo.monitorCode}】")
@RepeatSubmit()
@PutMapping()
public R edit(@Validated(EditGroup.class) @RequestBody EmsReportPeriodSummaryBo bo) {
@@ -146,7 +146,7 @@ public class EmsReportPeriodSummaryController extends BaseController {
* @param ids 主键串
*/
@SaCheckPermission("ems/base:reportPeriodSummary:remove")
- @Log(title = "周期报汇总", businessType = BusinessType.DELETE)
+ @Log(title = "周期报汇总", businessType = BusinessType.DELETE, remark = "删除了周期报汇总,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java b/ruoyi-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java
index 3b1dbcc..5014e05 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java
@@ -88,6 +88,12 @@ public class EmsBaseCollectDeviceInfo extends BaseEntity {
//@ExcelProperty(value = "启用标识")
private String isFlag;
+ /**
+ * 备注
+ * 这里必须和数据库表结构保持一致,否则 mapper 查询 ebcdi.* 时会因为缺少属性而在结果映射阶段直接报错。
+ */
+ private String remark;
+
/**
* 以下协议接入字段属于技术字段,主要用于兼容 OPC/Modbus 等接入方式,不直接改变采集设备主业务标识。
*/
@@ -224,6 +230,14 @@ public class EmsBaseCollectDeviceInfo extends BaseEntity {
return isFlag;
}
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
public String getTenantId() {
return tenantId;
}
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/CommonClearController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/CommonClearController.java
index fcaf99a..fe8c082 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/CommonClearController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/CommonClearController.java
@@ -72,7 +72,7 @@ public class CommonClearController extends EmsBaseController
* @return 清空结果
*/
@DeleteMapping("/clearAll/{moduleKey}")
- @Log(title = "通用数据清空", businessType = BusinessType.CLEAN)
+ @Log(title = "通用数据清空", businessType = BusinessType.CLEAN, remark = "清空了模块【#moduleKey}】的数据")
public R> clearAll(@PathVariable("moduleKey") String moduleKey)
{
try {
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/DailyFaultRecordController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/DailyFaultRecordController.java
index 5403d56..78bdc75 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/DailyFaultRecordController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/DailyFaultRecordController.java
@@ -48,7 +48,7 @@ public class DailyFaultRecordController extends EmsBaseController
* 导出日常故障记录列表
*/
@SaCheckPermission("ems/info:dailyFaultRecord:export")
- @Log(title = "日常故障记录", businessType = BusinessType.EXPORT)
+ @Log(title = "日常故障记录", businessType = BusinessType.EXPORT, remark = "导出了日常故障记录数据")
@PostMapping("/export")
public void export(HttpServletResponse response, DailyFaultRecord dailyFaultRecord)
{
@@ -70,7 +70,7 @@ public class DailyFaultRecordController extends EmsBaseController
* 新增日常故障记录
*/
@SaCheckPermission("ems/info:dailyFaultRecord:add")
- @Log(title = "日常故障记录", businessType = BusinessType.INSERT)
+ @Log(title = "日常故障记录", businessType = BusinessType.INSERT, remark = "新增了日常故障记录【#dailyFaultRecord.faultSituation}】")
@PostMapping
public R> add(@RequestBody DailyFaultRecord dailyFaultRecord)
{
@@ -81,7 +81,7 @@ public class DailyFaultRecordController extends EmsBaseController
* 修改日常故障记录
*/
@SaCheckPermission("ems/info:dailyFaultRecord:edit")
- @Log(title = "日常故障记录", businessType = BusinessType.UPDATE)
+ @Log(title = "日常故障记录", businessType = BusinessType.UPDATE, remark = "修改了日常故障记录【#dailyFaultRecord.faultSituation}】")
@PutMapping
public R> edit(@RequestBody DailyFaultRecord dailyFaultRecord)
{
@@ -92,7 +92,7 @@ public class DailyFaultRecordController extends EmsBaseController
* 删除日常故障记录
*/
@SaCheckPermission("ems/info:dailyFaultRecord:remove")
- @Log(title = "日常故障记录", businessType = BusinessType.DELETE)
+ @Log(title = "日常故障记录", businessType = BusinessType.DELETE, remark = "删除了日常故障记录,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R> remove(@PathVariable Long[] ids)
{
@@ -103,7 +103,7 @@ public class DailyFaultRecordController extends EmsBaseController
* 导入日常故障记录数据
*/
@SaCheckPermission("ems/info:dailyFaultRecord:add")
- @Log(title = "日常故障记录", businessType = BusinessType.IMPORT)
+ @Log(title = "日常故障记录", businessType = BusinessType.IMPORT, remark = "导入了日常故障记录数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/FaultHandlingRecordController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/FaultHandlingRecordController.java
index 6436336..44fbbe3 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/FaultHandlingRecordController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/FaultHandlingRecordController.java
@@ -48,7 +48,7 @@ public class FaultHandlingRecordController extends EmsBaseController
* 导出故障处置记录列表
*/
@SaCheckPermission("ems/info:faultHandlingRecord:export")
- @Log(title = "故障处置记录", businessType = BusinessType.EXPORT)
+ @Log(title = "故障处置记录", businessType = BusinessType.EXPORT, remark = "导出了故障处置记录数据")
@PostMapping("/export")
public void export(HttpServletResponse response, FaultHandlingRecord faultHandlingRecord)
{
@@ -70,7 +70,7 @@ public class FaultHandlingRecordController extends EmsBaseController
* 新增故障处置记录
*/
@SaCheckPermission("ems/info:faultHandlingRecord:add")
- @Log(title = "故障处置记录", businessType = BusinessType.INSERT)
+ @Log(title = "故障处置记录", businessType = BusinessType.INSERT, remark = "新增了故障处置记录【#faultHandlingRecord.faultPhenomenonAndCause}】")
@PostMapping
public R> add(@RequestBody FaultHandlingRecord faultHandlingRecord)
{
@@ -81,7 +81,7 @@ public class FaultHandlingRecordController extends EmsBaseController
* 修改故障处置记录
*/
@SaCheckPermission("ems/info:faultHandlingRecord:edit")
- @Log(title = "故障处置记录", businessType = BusinessType.UPDATE)
+ @Log(title = "故障处置记录", businessType = BusinessType.UPDATE, remark = "修改了故障处置记录【#faultHandlingRecord.faultPhenomenonAndCause}】")
@PutMapping
public R> edit(@RequestBody FaultHandlingRecord faultHandlingRecord)
{
@@ -92,7 +92,7 @@ public class FaultHandlingRecordController extends EmsBaseController
* 删除故障处置记录
*/
@SaCheckPermission("ems/info:faultHandlingRecord:remove")
- @Log(title = "故障处置记录", businessType = BusinessType.DELETE)
+ @Log(title = "故障处置记录", businessType = BusinessType.DELETE, remark = "删除了故障处置记录,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R> remove(@PathVariable Long[] ids)
{
@@ -103,7 +103,7 @@ public class FaultHandlingRecordController extends EmsBaseController
* 导入故障处置记录数据
*/
@SaCheckPermission("ems/info:faultHandlingRecord:add")
- @Log(title = "故障处置记录", businessType = BusinessType.IMPORT)
+ @Log(title = "故障处置记录", businessType = BusinessType.IMPORT, remark = "导入了故障处置记录数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/LuggageSystemSecurityDoorBatteryLifecycleController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/LuggageSystemSecurityDoorBatteryLifecycleController.java
index 7bbc5ee..a3f9898 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/LuggageSystemSecurityDoorBatteryLifecycleController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/LuggageSystemSecurityDoorBatteryLifecycleController.java
@@ -48,7 +48,7 @@ public class LuggageSystemSecurityDoorBatteryLifecycleController extends EmsBase
* 导出行李系统安全门铅酸电池生命周期列表
*/
@SaCheckPermission("ems/info:securityDoorBatteryLifecycle:export")
- @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.EXPORT)
+ @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.EXPORT, remark = "导出了行李系统安全门铅酸电池生命周期数据")
@PostMapping("/export")
public void export(HttpServletResponse response, LuggageSystemSecurityDoorBatteryLifecycle luggageSystemSecurityDoorBatteryLifecycle)
{
@@ -70,7 +70,7 @@ public class LuggageSystemSecurityDoorBatteryLifecycleController extends EmsBase
* 新增行李系统安全门铅酸电池生命周期
*/
@SaCheckPermission("ems/info:securityDoorBatteryLifecycle:add")
- @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.INSERT)
+ @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.INSERT, remark = "新增了行李系统安全门铅酸电池生命周期【#luggageSystemSecurityDoorBatteryLifecycle.referenceLocation}】")
@PostMapping
public R> add(@RequestBody LuggageSystemSecurityDoorBatteryLifecycle luggageSystemSecurityDoorBatteryLifecycle)
{
@@ -81,7 +81,7 @@ public class LuggageSystemSecurityDoorBatteryLifecycleController extends EmsBase
* 修改行李系统安全门铅酸电池生命周期
*/
@SaCheckPermission("ems/info:securityDoorBatteryLifecycle:edit")
- @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.UPDATE)
+ @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.UPDATE, remark = "修改了行李系统安全门铅酸电池生命周期【#luggageSystemSecurityDoorBatteryLifecycle.referenceLocation}】")
@PutMapping
public R> edit(@RequestBody LuggageSystemSecurityDoorBatteryLifecycle luggageSystemSecurityDoorBatteryLifecycle)
{
@@ -92,7 +92,7 @@ public class LuggageSystemSecurityDoorBatteryLifecycleController extends EmsBase
* 删除行李系统安全门铅酸电池生命周期
*/
@SaCheckPermission("ems/info:securityDoorBatteryLifecycle:remove")
- @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.DELETE)
+ @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.DELETE, remark = "删除了行李系统安全门铅酸电池生命周期,ID:【#objids}】")
@DeleteMapping("/{objids}")
public R> remove(@PathVariable Long[] objids)
{
@@ -103,7 +103,7 @@ public class LuggageSystemSecurityDoorBatteryLifecycleController extends EmsBase
* 导入行李系统安全门铅酸电池生命周期数据
*/
@SaCheckPermission("ems/info:securityDoorBatteryLifecycle:add")
- @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.IMPORT)
+ @Log(title = "行李系统安全门铅酸电池生命周期", businessType = BusinessType.IMPORT, remark = "导入了行李系统安全门铅酸电池生命周期数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, @RequestParam(value = "updateSupport", defaultValue = "false") boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySparePartsRegistrationController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySparePartsRegistrationController.java
index fe36931..3825018 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySparePartsRegistrationController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySparePartsRegistrationController.java
@@ -48,7 +48,7 @@ public class PowerEnergySparePartsRegistrationController extends EmsBaseControll
* 导出动力能源部行输科废旧备件登记列表
*/
@SaCheckPermission("ems/info:sparePartsRegistration:export")
- @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.EXPORT)
+ @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.EXPORT, remark = "导出了动力能源部行输科废旧备件登记数据")
@PostMapping("/export")
public void export(HttpServletResponse response, PowerEnergySparePartsRegistration powerEnergySparePartsRegistration)
{
@@ -70,7 +70,7 @@ public class PowerEnergySparePartsRegistrationController extends EmsBaseControll
* 新增动力能源部行输科废旧备件登记
*/
@SaCheckPermission("ems/info:sparePartsRegistration:add")
- @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.INSERT)
+ @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.INSERT, remark = "新增了动力能源部行输科废旧备件登记【#powerEnergySparePartsRegistration.sparePartsName}】")
@PostMapping
public R> add(@RequestBody PowerEnergySparePartsRegistration powerEnergySparePartsRegistration)
{
@@ -81,7 +81,7 @@ public class PowerEnergySparePartsRegistrationController extends EmsBaseControll
* 修改动力能源部行输科废旧备件登记
*/
@SaCheckPermission("ems/info:sparePartsRegistration:edit")
- @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.UPDATE)
+ @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.UPDATE, remark = "修改了动力能源部行输科废旧备件登记【#powerEnergySparePartsRegistration.sparePartsName}】")
@PutMapping
public R> edit(@RequestBody PowerEnergySparePartsRegistration powerEnergySparePartsRegistration)
{
@@ -92,7 +92,7 @@ public class PowerEnergySparePartsRegistrationController extends EmsBaseControll
* 删除动力能源部行输科废旧备件登记
*/
@SaCheckPermission("ems/info:sparePartsRegistration:remove")
- @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.DELETE)
+ @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.DELETE, remark = "删除了动力能源部行输科废旧备件登记,ID:【#objids}】")
@DeleteMapping("/{objids}")
public R> remove(@PathVariable Long[] objids)
{
@@ -103,7 +103,7 @@ public class PowerEnergySparePartsRegistrationController extends EmsBaseControll
* 导入动力能源部行输科废旧备件登记数据
*/
@SaCheckPermission("ems/info:sparePartsRegistration:add")
- @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.IMPORT)
+ @Log(title = "动力能源部行输科废旧备件登记", businessType = BusinessType.IMPORT, remark = "导入了动力能源部行输科废旧备件登记数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySupervisionChecklistController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySupervisionChecklistController.java
index a21bffb..e666a13 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySupervisionChecklistController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/PowerEnergySupervisionChecklistController.java
@@ -48,7 +48,7 @@ public class PowerEnergySupervisionChecklistController extends EmsBaseController
* 导出动力能源部监督检查清单列表
*/
@SaCheckPermission("ems/info:supervisionChecklist:export")
- @Log(title = "动力能源部监督检查清单", businessType = BusinessType.EXPORT)
+ @Log(title = "动力能源部监督检查清单", businessType = BusinessType.EXPORT, remark = "导出了动力能源部监督检查清单数据")
@PostMapping("/export")
public void export(HttpServletResponse response, PowerEnergySupervisionChecklist powerEnergySupervisionChecklist)
{
@@ -70,7 +70,7 @@ public class PowerEnergySupervisionChecklistController extends EmsBaseController
* 新增动力能源部监督检查清单
*/
@SaCheckPermission("ems/info:supervisionChecklist:add")
- @Log(title = "动力能源部监督检查清单", businessType = BusinessType.INSERT)
+ @Log(title = "动力能源部监督检查清单", businessType = BusinessType.INSERT, remark = "新增了动力能源部监督检查清单【#powerEnergySupervisionChecklist.jobName}】")
@PostMapping
public R> add(@RequestBody PowerEnergySupervisionChecklist powerEnergySupervisionChecklist)
{
@@ -81,7 +81,7 @@ public class PowerEnergySupervisionChecklistController extends EmsBaseController
* 修改动力能源部监督检查清单
*/
@SaCheckPermission("ems/info:supervisionChecklist:edit")
- @Log(title = "动力能源部监督检查清单", businessType = BusinessType.UPDATE)
+ @Log(title = "动力能源部监督检查清单", businessType = BusinessType.UPDATE, remark = "修改了动力能源部监督检查清单【#powerEnergySupervisionChecklist.jobName}】")
@PutMapping
public R> edit(@RequestBody PowerEnergySupervisionChecklist powerEnergySupervisionChecklist)
{
@@ -92,7 +92,7 @@ public class PowerEnergySupervisionChecklistController extends EmsBaseController
* 删除动力能源部监督检查清单
*/
@SaCheckPermission("ems/info:supervisionChecklist:remove")
- @Log(title = "动力能源部监督检查清单", businessType = BusinessType.DELETE)
+ @Log(title = "动力能源部监督检查清单", businessType = BusinessType.DELETE, remark = "删除了动力能源部监督检查清单,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R> remove(@PathVariable Long[] ids)
{
@@ -111,7 +111,7 @@ public class PowerEnergySupervisionChecklistController extends EmsBaseController
/**
* 导入数据
*/
- @Log(title = "动力能源部监督检查清单", businessType = BusinessType.IMPORT)
+ @Log(title = "动力能源部监督检查清单", businessType = BusinessType.IMPORT, remark = "导入了动力能源部监督检查清单数据")
@SaCheckPermission("ems/info:supervisionChecklist:add")
@PostMapping("/importData")
public R> importData(MultipartFile file, boolean updateSupport) throws Exception
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryCheckController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryCheckController.java
index 64c57b9..c949dad 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryCheckController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryCheckController.java
@@ -48,7 +48,7 @@ public class SparePartsInventoryCheckController extends EmsBaseController
* 导出备件盘点记录明细列表
*/
@SaCheckPermission("ems/info:sparePartsInventoryCheck:export")
- @Log(title = "备件盘点记录明细", businessType = BusinessType.EXPORT)
+ @Log(title = "备件盘点记录明细", businessType = BusinessType.EXPORT, remark = "导出了备件盘点记录明细数据")
@PostMapping("/export")
public void export(HttpServletResponse response, SparePartsInventoryCheck sparePartsInventoryCheck)
{
@@ -70,7 +70,7 @@ public class SparePartsInventoryCheckController extends EmsBaseController
* 新增备件盘点记录明细
*/
@SaCheckPermission("ems/info:sparePartsInventoryCheck:add")
- @Log(title = "备件盘点记录明细", businessType = BusinessType.INSERT)
+ @Log(title = "备件盘点记录明细", businessType = BusinessType.INSERT, remark = "新增了备件盘点记录明细【#sparePartsInventoryCheck.checkName}】")
@PostMapping
public R> add(@RequestBody SparePartsInventoryCheck sparePartsInventoryCheck)
{
@@ -81,7 +81,7 @@ public class SparePartsInventoryCheckController extends EmsBaseController
* 修改备件盘点记录明细
*/
@SaCheckPermission("ems/info:sparePartsInventoryCheck:edit")
- @Log(title = "备件盘点记录明细", businessType = BusinessType.UPDATE)
+ @Log(title = "备件盘点记录明细", businessType = BusinessType.UPDATE, remark = "修改了备件盘点记录明细【#sparePartsInventoryCheck.checkName}】")
@PutMapping
public R> edit(@RequestBody SparePartsInventoryCheck sparePartsInventoryCheck)
{
@@ -92,7 +92,7 @@ public class SparePartsInventoryCheckController extends EmsBaseController
* 删除备件盘点记录明细
*/
@SaCheckPermission("ems/info:sparePartsInventoryCheck:remove")
- @Log(title = "备件盘点记录明细", businessType = BusinessType.DELETE)
+ @Log(title = "备件盘点记录明细", businessType = BusinessType.DELETE, remark = "删除了备件盘点记录明细,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R> remove(@PathVariable Long[] ids)
{
@@ -103,7 +103,7 @@ public class SparePartsInventoryCheckController extends EmsBaseController
* 导入备件盘点记录明细数据
*/
@SaCheckPermission("ems/info:sparePartsInventoryCheck:add")
- @Log(title = "备件盘点记录明细", businessType = BusinessType.IMPORT)
+ @Log(title = "备件盘点记录明细", businessType = BusinessType.IMPORT, remark = "导入了备件盘点记录明细数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, @RequestParam(value = "updateSupport", defaultValue = "false") boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryController.java
index 3333903..2fe77c2 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsInventoryController.java
@@ -53,7 +53,7 @@ public class SparePartsInventoryController extends EmsBaseController
* 导出备件库记录主列表(支持动态列)
*/
@SaCheckPermission("ems/info:sparePartsInventory:export")
- @Log(title = "备件库记录主", businessType = BusinessType.EXPORT)
+ @Log(title = "备件库记录主", businessType = BusinessType.EXPORT, remark = "导出了备件库记录主数据")
@PostMapping("/export")
public void export(HttpServletResponse response, SparePartsInventory sparePartsInventory) throws IOException
{
@@ -110,7 +110,7 @@ public class SparePartsInventoryController extends EmsBaseController
* 新增备件库记录主
*/
@SaCheckPermission("ems/info:sparePartsInventory:add")
- @Log(title = "备件库记录主", businessType = BusinessType.INSERT)
+ @Log(title = "备件库记录主", businessType = BusinessType.INSERT, remark = "新增了备件库记录主【#sparePartsInventory.itemName}】")
@PostMapping
public R> add(@RequestBody SparePartsInventory sparePartsInventory)
{
@@ -121,7 +121,7 @@ public class SparePartsInventoryController extends EmsBaseController
* 新增备件库记录主(包含动态列)
*/
@SaCheckPermission("ems/info:sparePartsInventory:add")
- @Log(title = "备件库记录主", businessType = BusinessType.INSERT)
+ @Log(title = "备件库记录主", businessType = BusinessType.INSERT, remark = "新增了备件库记录主【#sparePartsInventoryVO.itemName}】")
@PostMapping("/withDynamicColumns")
public R> addWithDynamicColumns(@RequestBody SparePartsInventoryExportVO sparePartsInventoryVO)
{
@@ -132,7 +132,7 @@ public class SparePartsInventoryController extends EmsBaseController
* 修改备件库记录主
*/
@SaCheckPermission("ems/info:sparePartsInventory:edit")
- @Log(title = "备件库记录主", businessType = BusinessType.UPDATE)
+ @Log(title = "备件库记录主", businessType = BusinessType.UPDATE, remark = "修改了备件库记录主【#sparePartsInventory.itemName}】")
@PutMapping
public R> edit(@RequestBody SparePartsInventory sparePartsInventory)
{
@@ -143,7 +143,7 @@ public class SparePartsInventoryController extends EmsBaseController
* 修改备件库记录主(包含动态列)
*/
@SaCheckPermission("ems/info:sparePartsInventory:edit")
- @Log(title = "备件库记录主", businessType = BusinessType.UPDATE)
+ @Log(title = "备件库记录主", businessType = BusinessType.UPDATE, remark = "修改了备件库记录主【#sparePartsInventoryVO.itemName}】")
@PutMapping("/withDynamicColumns")
public R> editWithDynamicColumns(@RequestBody SparePartsInventoryExportVO sparePartsInventoryVO)
{
@@ -165,7 +165,7 @@ public class SparePartsInventoryController extends EmsBaseController
* 删除备件库记录主
*/
@SaCheckPermission("ems/info:sparePartsInventory:remove")
- @Log(title = "备件库记录主", businessType = BusinessType.DELETE)
+ @Log(title = "备件库记录主", businessType = BusinessType.DELETE, remark = "删除了备件库记录主,ID:【#objids}】")
@DeleteMapping("/{objids}")
public R> remove(@PathVariable Long[] objids)
{
@@ -176,7 +176,7 @@ public class SparePartsInventoryController extends EmsBaseController
* 导入备件库记录主数据(支持动态列)
*/
@SaCheckPermission("ems/info:sparePartsInventory:add")
- @Log(title = "备件库记录主", businessType = BusinessType.IMPORT)
+ @Log(title = "备件库记录主", businessType = BusinessType.IMPORT, remark = "导入了备件库记录主数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, @RequestParam(value = "updateSupport", defaultValue = "false") boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsUsageRecordController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsUsageRecordController.java
index c42e817..1c6d637 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsUsageRecordController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/SparePartsUsageRecordController.java
@@ -48,7 +48,7 @@ public class SparePartsUsageRecordController extends EmsBaseController
* 导出动力能源部行输科备件领用更换记录列表
*/
@SaCheckPermission("ems/info:sparePartsUsageRecord:export")
- @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.EXPORT)
+ @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.EXPORT, remark = "导出了动力能源部行输科备件领用更换记录数据")
@PostMapping("/export")
public void export(HttpServletResponse response, SparePartsUsageRecord sparePartsUsageRecord)
{
@@ -70,7 +70,7 @@ public class SparePartsUsageRecordController extends EmsBaseController
* 新增动力能源部行输科备件领用更换记录
*/
@SaCheckPermission("ems/info:sparePartsUsageRecord:add")
- @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.INSERT)
+ @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.INSERT, remark = "新增了动力能源部行输科备件领用更换记录【#sparePartsUsageRecord.sparePartName}】")
@PostMapping
public R> add(@RequestBody SparePartsUsageRecord sparePartsUsageRecord)
{
@@ -81,7 +81,7 @@ public class SparePartsUsageRecordController extends EmsBaseController
* 修改动力能源部行输科备件领用更换记录
*/
@SaCheckPermission("ems/info:sparePartsUsageRecord:edit")
- @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.UPDATE)
+ @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.UPDATE, remark = "修改了动力能源部行输科备件领用更换记录【#sparePartsUsageRecord.sparePartName}】")
@PutMapping
public R> edit(@RequestBody SparePartsUsageRecord sparePartsUsageRecord)
{
@@ -92,7 +92,7 @@ public class SparePartsUsageRecordController extends EmsBaseController
* 删除动力能源部行输科备件领用更换记录
*/
@SaCheckPermission("ems/info:sparePartsUsageRecord:remove")
- @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.DELETE)
+ @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.DELETE, remark = "删除了动力能源部行输科备件领用更换记录,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R> remove(@PathVariable Long[] ids)
{
@@ -103,7 +103,7 @@ public class SparePartsUsageRecordController extends EmsBaseController
* 导入动力能源部行输科备件领用更换记录数据
*/
@SaCheckPermission("ems/info:sparePartsUsageRecord:add")
- @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.IMPORT)
+ @Log(title = "动力能源部行输科备件领用更换记录", businessType = BusinessType.IMPORT, remark = "导入了动力能源部行输科备件领用更换记录数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/UpsBatteryLifecycleController.java b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/UpsBatteryLifecycleController.java
index c7c6fe4..030dd27 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/UpsBatteryLifecycleController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/info/controller/UpsBatteryLifecycleController.java
@@ -48,7 +48,7 @@ public class UpsBatteryLifecycleController extends EmsBaseController
* 导出行李系统UPS电池生命周期列表
*/
@SaCheckPermission("ems/info:upsBatteryLifecycle:export")
- @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.EXPORT)
+ @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.EXPORT, remark = "导出了行李系统UPS电池生命周期数据")
@PostMapping("/export")
public void export(HttpServletResponse response, UpsBatteryLifecycle upsBatteryLifecycle)
{
@@ -70,7 +70,7 @@ public class UpsBatteryLifecycleController extends EmsBaseController
* 新增行李系统UPS电池生命周期
*/
@SaCheckPermission("ems/info:upsBatteryLifecycle:add")
- @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.INSERT)
+ @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.INSERT, remark = "新增了行李系统UPS电池生命周期【#upsBatteryLifecycle.upsInstallationCabinetName}】")
@PostMapping
public R> add(@RequestBody UpsBatteryLifecycle upsBatteryLifecycle)
{
@@ -81,7 +81,7 @@ public class UpsBatteryLifecycleController extends EmsBaseController
* 修改行李系统UPS电池生命周期
*/
@SaCheckPermission("ems/info:upsBatteryLifecycle:edit")
- @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.UPDATE)
+ @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.UPDATE, remark = "修改了行李系统UPS电池生命周期【#upsBatteryLifecycle.upsInstallationCabinetName}】")
@PutMapping
public R> edit(@RequestBody UpsBatteryLifecycle upsBatteryLifecycle)
{
@@ -92,7 +92,7 @@ public class UpsBatteryLifecycleController extends EmsBaseController
* 删除行李系统UPS电池生命周期
*/
@SaCheckPermission("ems/info:upsBatteryLifecycle:remove")
- @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.DELETE)
+ @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.DELETE, remark = "删除了行李系统UPS电池生命周期,ID:【#ids}】")
@DeleteMapping("/{ids}")
public R> remove(@PathVariable Long[] ids)
{
@@ -103,7 +103,7 @@ public class UpsBatteryLifecycleController extends EmsBaseController
* 导入行李系统UPS电池生命周期数据
*/
@SaCheckPermission("ems/info:upsBatteryLifecycle:add")
- @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.IMPORT)
+ @Log(title = "行李系统UPS电池生命周期", businessType = BusinessType.IMPORT, remark = "导入了行李系统UPS电池生命周期数据")
@PostMapping("/importData")
public R> importData(MultipartFile file, @RequestParam(value = "updateSupport", defaultValue = "false") boolean updateSupport) throws Exception
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java
index e273427..c3c1998 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java
@@ -10,6 +10,8 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.ems.common.web.EmsBaseController;
import org.dromara.ems.record.domain.EmsRecordAlarmData;
+import org.dromara.ems.record.domain.vo.AlarmHandleResultVo;
+import org.dromara.ems.record.domain.vo.EmsRealtimeAlarmBatchResultVo;
import org.dromara.ems.record.domain.vo.EmsRecordAlarmDataSummaryVo;
import org.dromara.ems.record.service.IEmsRecordAlarmDataService;
import org.springframework.web.bind.annotation.*;
@@ -57,7 +59,7 @@ public class EmsRecordAlarmDataController extends EmsBaseController
* 导出异常数据记录列表
*/
@SaCheckPermission("ems/record:recordAlarmData:export")
- @Log(title = "异常数据记录", businessType = BusinessType.EXPORT)
+ @Log(title = "异常数据记录", businessType = BusinessType.EXPORT, remark = "导出了异常数据记录数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsRecordAlarmData emsRecordAlarmData)
{
@@ -79,7 +81,7 @@ public class EmsRecordAlarmDataController extends EmsBaseController
* 新增异常数据记录
*/
@SaCheckPermission("ems/record:recordAlarmData:add")
- @Log(title = "异常数据记录", businessType = BusinessType.INSERT)
+ @Log(title = "异常数据记录", businessType = BusinessType.INSERT, remark = "新增了异常数据记录【#emsRecordAlarmData.alarmTitle}】")
@PostMapping
public R> add(@RequestBody EmsRecordAlarmData emsRecordAlarmData)
{
@@ -90,7 +92,7 @@ public class EmsRecordAlarmDataController extends EmsBaseController
* 修改异常数据记录
*/
@SaCheckPermission("ems/record:recordAlarmData:edit")
- @Log(title = "异常数据记录", businessType = BusinessType.UPDATE)
+ @Log(title = "异常数据记录", businessType = BusinessType.UPDATE, remark = "修改了异常数据记录【#emsRecordAlarmData.alarmTitle}】")
@PutMapping
public R> edit(@RequestBody EmsRecordAlarmData emsRecordAlarmData)
{
@@ -101,7 +103,7 @@ public class EmsRecordAlarmDataController extends EmsBaseController
* 删除异常数据记录
*/
@SaCheckPermission("ems/record:recordAlarmData:remove")
- @Log(title = "异常数据记录", businessType = BusinessType.DELETE)
+ @Log(title = "异常数据记录", businessType = BusinessType.DELETE, remark = "删除了异常数据记录,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
@@ -113,15 +115,21 @@ public class EmsRecordAlarmDataController extends EmsBaseController
* @param objIds
* @return
*/
+ @SaCheckPermission("ems/record:recordAlarmData:edit")
@PostMapping("/handleExceptions/{objIds}")
- public R> handleExceptions(@PathVariable Long[] objIds)
+ public R handleExceptions(@PathVariable Long[] objIds)
{
- return toAjax(emsRecordAlarmDataService.handleExceptionsAlarmData(objIds));
+ AlarmHandleResultVo result = emsRecordAlarmDataService.handleExceptionsAlarmData(objIds);
+ if (result.getUpdatedCount() <= 0 && result.getAlreadyHandledCount() <= 0) {
+ return R.fail("没有可回写的告警记录", result);
+ }
+ return success(result);
}
/**
* 获取异常数据表总数(包含所有告警类型)
*/
+ @SaCheckPermission("ems/record:recordAlarmData:list")
@GetMapping("/getAlarmDataTotalCount")
public int getAlarmDataTotalCount()
{
@@ -135,18 +143,19 @@ public class EmsRecordAlarmDataController extends EmsBaseController
* @param alarmDataList 异常数据记录列表
* @return 结果
*/
- @Log(title = "WebSocket告警数据", businessType = BusinessType.INSERT)
+ @SaCheckPermission("ems/record:recordAlarmData:add")
+ @Log(title = "WebSocket告警数据", businessType = BusinessType.INSERT, remark = "接收了WebSocket告警数据")
@PostMapping("/saveWebSocketAlarmData")
- public R> saveWebSocketAlarmData(@RequestBody List alarmDataList)
+ public R saveWebSocketAlarmData(@RequestBody List alarmDataList)
{
if (alarmDataList == null || alarmDataList.isEmpty()) {
- return error("告警数据不能为空");
+ return R.fail("告警数据不能为空", new EmsRealtimeAlarmBatchResultVo());
}
- int result = emsRecordAlarmDataService.saveWebSocketAlarmDataBatch(alarmDataList);
- if (result > 0) {
- return success("保存成功,共保存 " + result + " 条告警记录");
+ EmsRealtimeAlarmBatchResultVo result = emsRecordAlarmDataService.saveWebSocketAlarmDataBatch(alarmDataList);
+ if (result.getInsertedCount() > 0 || result.getDuplicateCount() > 0) {
+ return success(result);
}
- return error("保存失败,没有新增任何记录");
+ return R.fail("保存失败,没有新增任何记录", result);
}
}
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java
index 614619c..e18384e 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java
@@ -46,7 +46,7 @@ public class EmsRecordAlarmRuleController extends EmsBaseController
* 导出异常告警规则列表
*/
@SaCheckPermission("ems/record:recordAlarmRule:export")
- @Log(title = "异常告警规则", businessType = BusinessType.EXPORT)
+ @Log(title = "异常告警规则", businessType = BusinessType.EXPORT, remark = "导出了异常告警规则数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsRecordAlarmRule emsRecordAlarmRule)
{
@@ -68,7 +68,7 @@ public class EmsRecordAlarmRuleController extends EmsBaseController
* 新增异常告警规则
*/
@SaCheckPermission("ems/record:recordAlarmRule:add")
- @Log(title = "异常告警规则", businessType = BusinessType.INSERT)
+ @Log(title = "异常告警规则", businessType = BusinessType.INSERT, remark = "新增了异常告警规则【#emsRecordAlarmRule.ruleName}】")
@PostMapping
public R> add(@RequestBody EmsRecordAlarmRule emsRecordAlarmRule)
{
@@ -79,7 +79,7 @@ public class EmsRecordAlarmRuleController extends EmsBaseController
* 修改异常告警规则
*/
@SaCheckPermission("ems/record:recordAlarmRule:edit")
- @Log(title = "异常告警规则", businessType = BusinessType.UPDATE)
+ @Log(title = "异常告警规则", businessType = BusinessType.UPDATE, remark = "修改了异常告警规则【#emsRecordAlarmRule.ruleName}】")
@PutMapping
public R> edit(@RequestBody EmsRecordAlarmRule emsRecordAlarmRule)
{
@@ -90,7 +90,7 @@ public class EmsRecordAlarmRuleController extends EmsBaseController
* 删除异常告警规则
*/
@SaCheckPermission("ems/record:recordAlarmRule:remove")
- @Log(title = "异常告警规则", businessType = BusinessType.DELETE)
+ @Log(title = "异常告警规则", businessType = BusinessType.DELETE, remark = "删除了异常告警规则,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java
index d6afd9d..6431c1c 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java
@@ -55,7 +55,7 @@ public class EmsRecordDnbInstantController extends EmsBaseController {
* 导出电实时数据列表
*/
@SaCheckPermission("ems/record:recordDnbInstant:export")
- @Log(title = "电实时数据", businessType = BusinessType.EXPORT)
+ @Log(title = "电实时数据", businessType = BusinessType.EXPORT, remark = "导出了电实时数据数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsRecordDnbInstant emsRecordDnbInstant) {
List list = emsRecordDnbInstantService.selectEmsRecordDnbInstantList(emsRecordDnbInstant);
@@ -75,7 +75,7 @@ public class EmsRecordDnbInstantController extends EmsBaseController {
* 新增电实时数据
*/
@SaCheckPermission("ems/record:recordDnbInstant:add")
- @Log(title = "电实时数据", businessType = BusinessType.INSERT)
+ @Log(title = "电实时数据", businessType = BusinessType.INSERT, remark = "新增了电实时数据【#emsRecordDnbInstant.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) {
return toAjax(emsRecordDnbInstantService.insertEmsRecordDnbInstant(emsRecordDnbInstant));
@@ -85,7 +85,7 @@ public class EmsRecordDnbInstantController extends EmsBaseController {
* 修改电实时数据
*/
@SaCheckPermission("ems/record:recordDnbInstant:edit")
- @Log(title = "电实时数据", businessType = BusinessType.UPDATE)
+ @Log(title = "电实时数据", businessType = BusinessType.UPDATE, remark = "修改了电实时数据【#emsRecordDnbInstant.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) {
return toAjax(emsRecordDnbInstantService.updateEmsRecordDnbInstant(emsRecordDnbInstant));
@@ -95,7 +95,7 @@ public class EmsRecordDnbInstantController extends EmsBaseController {
* 删除电实时数据
*/
@SaCheckPermission("ems/record:recordDnbInstant:remove")
- @Log(title = "电实时数据", businessType = BusinessType.DELETE)
+ @Log(title = "电实时数据", businessType = BusinessType.DELETE, remark = "删除了电实时数据,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsRecordDnbInstantService.deleteEmsRecordDnbInstantByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java
index 06a98b8..7d8ffe5 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java
@@ -44,7 +44,7 @@ public class EmsRecordSteamInstantController extends EmsBaseController {
* 导出蒸汽实时数据列表
*/
@SaCheckPermission("ems/record:recordSteamInstant:export")
- @Log(title = "蒸汽实时数据", businessType = BusinessType.EXPORT)
+ @Log(title = "蒸汽实时数据", businessType = BusinessType.EXPORT, remark = "导出了蒸汽实时数据数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsRecordSteamInstant emsRecordSteamInstant) {
List list = emsRecordSteamInstantService.selectEmsRecordSteamInstantList(emsRecordSteamInstant);
@@ -64,7 +64,7 @@ public class EmsRecordSteamInstantController extends EmsBaseController {
* 新增蒸汽实时数据
*/
@SaCheckPermission("ems/record:recordSteamInstant:add")
- @Log(title = "蒸汽实时数据", businessType = BusinessType.INSERT)
+ @Log(title = "蒸汽实时数据", businessType = BusinessType.INSERT, remark = "新增了蒸汽实时数据【#emsRecordSteamInstant.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
return toAjax(emsRecordSteamInstantService.insertEmsRecordSteamInstant(emsRecordSteamInstant));
@@ -74,7 +74,7 @@ public class EmsRecordSteamInstantController extends EmsBaseController {
* 修改蒸汽实时数据
*/
@SaCheckPermission("ems/record:recordSteamInstant:edit")
- @Log(title = "蒸汽实时数据", businessType = BusinessType.UPDATE)
+ @Log(title = "蒸汽实时数据", businessType = BusinessType.UPDATE, remark = "修改了蒸汽实时数据【#emsRecordSteamInstant.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
return toAjax(emsRecordSteamInstantService.updateEmsRecordSteamInstant(emsRecordSteamInstant));
@@ -84,7 +84,7 @@ public class EmsRecordSteamInstantController extends EmsBaseController {
* 删除蒸汽实时数据
*/
@SaCheckPermission("ems/record:recordSteamInstant:remove")
- @Log(title = "蒸汽实时数据", businessType = BusinessType.DELETE)
+ @Log(title = "蒸汽实时数据", businessType = BusinessType.DELETE, remark = "删除了蒸汽实时数据,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsRecordSteamInstantService.deleteEmsRecordSteamInstantByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java
index 8805ada..8ff073d 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java
@@ -46,7 +46,7 @@ public class EmsRecordWaterInstantController extends EmsBaseController
* 导出水实时数据列表
*/
@SaCheckPermission("ems/record:recordWaterInstant:export")
- @Log(title = "水实时数据", businessType = BusinessType.EXPORT)
+ @Log(title = "水实时数据", businessType = BusinessType.EXPORT, remark = "导出了水实时数据数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsRecordWaterInstant emsRecordWaterInstant)
{
@@ -68,7 +68,7 @@ public class EmsRecordWaterInstantController extends EmsBaseController
* 新增水实时数据
*/
@SaCheckPermission("ems/record:recordWaterInstant:add")
- @Log(title = "水实时数据", businessType = BusinessType.INSERT)
+ @Log(title = "水实时数据", businessType = BusinessType.INSERT, remark = "新增了水实时数据【#emsRecordWaterInstant.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant)
{
@@ -79,7 +79,7 @@ public class EmsRecordWaterInstantController extends EmsBaseController
* 修改水实时数据
*/
@SaCheckPermission("ems/record:recordWaterInstant:edit")
- @Log(title = "水实时数据", businessType = BusinessType.UPDATE)
+ @Log(title = "水实时数据", businessType = BusinessType.UPDATE, remark = "修改了水实时数据【#emsRecordWaterInstant.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant)
{
@@ -90,7 +90,7 @@ public class EmsRecordWaterInstantController extends EmsBaseController
* 删除水实时数据
*/
@SaCheckPermission("ems/record:recordWaterInstant:remove")
- @Log(title = "水实时数据", businessType = BusinessType.DELETE)
+ @Log(title = "水实时数据", businessType = BusinessType.DELETE, remark = "删除了水实时数据,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java
index c296849..60b7cdc 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java
@@ -46,7 +46,7 @@ public class EmsVibrationInstantController extends EmsBaseController
* 导出震动实时数据列表
*/
@SaCheckPermission("ems/record:recordVibrationInstant:export")
- @Log(title = "震动实时数据", businessType = BusinessType.EXPORT)
+ @Log(title = "震动实时数据", businessType = BusinessType.EXPORT, remark = "导出了震动实时数据数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsVibrationInstant emsVibrationInstant)
{
@@ -68,7 +68,7 @@ public class EmsVibrationInstantController extends EmsBaseController
* 新增震动实时数据
*/
@SaCheckPermission("ems/record:recordVibrationInstant:add")
- @Log(title = "震动实时数据", businessType = BusinessType.INSERT)
+ @Log(title = "震动实时数据", businessType = BusinessType.INSERT, remark = "新增了震动实时数据【#emsVibrationInstant.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsVibrationInstant emsVibrationInstant)
{
@@ -79,7 +79,7 @@ public class EmsVibrationInstantController extends EmsBaseController
* 修改震动实时数据
*/
@SaCheckPermission("ems/record:recordVibrationInstant:edit")
- @Log(title = "震动实时数据", businessType = BusinessType.UPDATE)
+ @Log(title = "震动实时数据", businessType = BusinessType.UPDATE, remark = "修改了震动实时数据【#emsVibrationInstant.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsVibrationInstant emsVibrationInstant)
{
@@ -90,7 +90,7 @@ public class EmsVibrationInstantController extends EmsBaseController
* 删除震动实时数据
*/
@SaCheckPermission("ems/record:recordVibrationInstant:remove")
- @Log(title = "震动实时数据", businessType = BusinessType.DELETE)
+ @Log(title = "震动实时数据", businessType = BusinessType.DELETE, remark = "删除了震动实时数据,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/RecordIotenvInstantController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/RecordIotenvInstantController.java
index 9aba25e..d39b9ac 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/RecordIotenvInstantController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/RecordIotenvInstantController.java
@@ -55,7 +55,7 @@ public class RecordIotenvInstantController extends EmsBaseController
* 导出逻辑已迁移到ServiceImpl,支持大数据量导出
*/
@SaCheckPermission("ems/record:recordIotenvInstant:export")
- @Log(title = "物联网数据", businessType = BusinessType.EXPORT)
+ @Log(title = "物联网数据", businessType = BusinessType.EXPORT, remark = "导出了物联网数据数据")
@PostMapping("/export")
public void export(HttpServletResponse response, RecordIotenvInstant recordIotenvInstant) throws ParseException
{
@@ -114,7 +114,7 @@ public class RecordIotenvInstantController extends EmsBaseController
* 新增物联网数据
*/
@SaCheckPermission("ems/record:recordIotenvInstant:add")
- @Log(title = "物联网数据", businessType = BusinessType.INSERT)
+ @Log(title = "物联网数据", businessType = BusinessType.INSERT, remark = "新增了物联网数据【#recordIotenvInstant.monitorName}】")
@PostMapping
public R> add(@RequestBody RecordIotenvInstant recordIotenvInstant)
{
@@ -125,7 +125,7 @@ public class RecordIotenvInstantController extends EmsBaseController
* 修改物联网数据
*/
@SaCheckPermission("ems/record:recordIotenvInstant:edit")
- @Log(title = "物联网数据", businessType = BusinessType.UPDATE)
+ @Log(title = "物联网数据", businessType = BusinessType.UPDATE, remark = "修改了物联网数据【#recordIotenvInstant.monitorName}】")
@PutMapping
public R> edit(@RequestBody RecordIotenvInstant recordIotenvInstant)
{
@@ -136,7 +136,7 @@ public class RecordIotenvInstantController extends EmsBaseController
* 删除物联网数据
*/
@SaCheckPermission("ems/record:recordIotenvInstant:remove")
- @Log(title = "物联网数据", businessType = BusinessType.DELETE)
+ @Log(title = "物联网数据", businessType = BusinessType.DELETE, remark = "删除了物联网数据,ID:【#objids}】")
@DeleteMapping("/{objids}")
public R> remove(@PathVariable Long[] objids)
{
@@ -162,7 +162,8 @@ public class RecordIotenvInstantController extends EmsBaseController
return success(latestRecords);
} catch (Exception e) {
logger.error("获取设备最新数据失败", e);
- return error("获取设备最新数据失败:" + e.getMessage());
+ // 这里统一返回脱敏文案,避免把底层表名、SQL 或网络细节直接暴露给前端。
+ return error("获取设备最新数据失败,请稍后重试或联系管理员");
}
}
@@ -177,7 +178,8 @@ public class RecordIotenvInstantController extends EmsBaseController
return success(latestRecords);
} catch (Exception e) {
logger.error("根据父节点ID获取设备最新数据失败,parentId: " + parentId, e);
- return error("获取设备最新数据失败:" + e.getMessage());
+ // 这里沿用统一脱敏口径,避免节点参数错误时把内部异常链直接回传给浏览器。
+ return error("获取设备最新数据失败,请稍后重试或联系管理员");
}
}
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java
index ef5d7e3..112a069 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java
@@ -121,7 +121,7 @@ public class TWTempertureDataController extends EmsBaseController
* 导出物联网实时数据列表
*/
@SaCheckPermission("ems/record:recordIOTInstant:export")
- @Log(title = "物联网实时数据", businessType = BusinessType.EXPORT)
+ @Log(title = "物联网实时数据", businessType = BusinessType.EXPORT, remark = "导出了物联网实时数据数据")
@PostMapping("/export")
public void export(HttpServletResponse response, TWTempertureData tWTempertureData)
{
@@ -143,7 +143,7 @@ public class TWTempertureDataController extends EmsBaseController
* 新增物联网实时数据
*/
@SaCheckPermission("ems/record:recordIOTInstant:add")
- @Log(title = "物联网实时数据", businessType = BusinessType.INSERT)
+ @Log(title = "物联网实时数据", businessType = BusinessType.INSERT, remark = "新增了物联网实时数据【#tWTempertureData.monitorName}】")
@PostMapping
public R> add(@RequestBody TWTempertureData tWTempertureData)
{
@@ -154,7 +154,7 @@ public class TWTempertureDataController extends EmsBaseController
* 修改物联网实时数据
*/
@SaCheckPermission("ems/record:recordIOTInstant:edit")
- @Log(title = "物联网实时数据", businessType = BusinessType.UPDATE)
+ @Log(title = "物联网实时数据", businessType = BusinessType.UPDATE, remark = "修改了物联网实时数据【#tWTempertureData.monitorName}】")
@PutMapping
public R> edit(@RequestBody TWTempertureData tWTempertureData)
{
@@ -165,7 +165,7 @@ public class TWTempertureDataController extends EmsBaseController
* 删除物联网实时数据
*/
@SaCheckPermission("ems/record:recordIOTInstant:remove")
- @Log(title = "物联网实时数据", businessType = BusinessType.DELETE)
+ @Log(title = "物联网实时数据", businessType = BusinessType.DELETE, remark = "删除了物联网实时数据,ID:【#objids}】")
@DeleteMapping("/{objids}")
public R> remove(@PathVariable Long[] objids)
{
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java b/ruoyi-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java
index 3dcf513..35abfc4 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java
@@ -80,6 +80,17 @@ public class EmsRecordAlarmData extends BaseEntity
private String beginOperationTime;
private String endOperationTime;
+ /**
+ * 告警报表需要按记录时间窗口聚合,这里单独补起止字段,避免复用操作时间造成口径混乱。
+ */
+ private String beginCollectTime;
+ private String endCollectTime;
+
+ /**
+ * 报表页经常一次选中多个点位,这里保留多点位筛选字段,避免把 IN 查询拆成前端多次请求。
+ */
+ private String[] monitorIds;
+
/** 原因 */
@ExcelProperty(value = "原因")
private String cause;
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java b/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java
index 1857137..914ccc6 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java
@@ -44,7 +44,7 @@ public class EmsReportPointDnbController extends EmsBaseController {
* 导出电整点数据列表
*/
@SaCheckPermission("ems/report:reportPointDnb:export")
- @Log(title = "电整点数据", businessType = BusinessType.EXPORT)
+ @Log(title = "电整点数据", businessType = BusinessType.EXPORT, remark = "导出了电整点数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsReportPointDnb emsReportPointDnb) {
List list = emsReportPointDnbService.selectEmsReportPointDnbList(emsReportPointDnb);
@@ -64,7 +64,7 @@ public class EmsReportPointDnbController extends EmsBaseController {
* 新增电整点数据
*/
@SaCheckPermission("ems/report:reportPointDnb:add")
- @Log(title = "电整点数据", businessType = BusinessType.INSERT)
+ @Log(title = "电整点数据", businessType = BusinessType.INSERT, remark = "新增了电整点数据【#emsReportPointDnb.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsReportPointDnb emsReportPointDnb) {
return toAjax(emsReportPointDnbService.insertEmsReportPointDnb(emsReportPointDnb));
@@ -74,7 +74,7 @@ public class EmsReportPointDnbController extends EmsBaseController {
* 修改电整点数据
*/
@SaCheckPermission("ems/report:reportPointDnb:edit")
- @Log(title = "电整点数据", businessType = BusinessType.UPDATE)
+ @Log(title = "电整点数据", businessType = BusinessType.UPDATE, remark = "修改了电整点数据【#emsReportPointDnb.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsReportPointDnb emsReportPointDnb) {
return toAjax(emsReportPointDnbService.updateEmsReportPointDnb(emsReportPointDnb));
@@ -84,7 +84,7 @@ public class EmsReportPointDnbController extends EmsBaseController {
* 删除电整点数据
*/
@SaCheckPermission("ems/report:reportPointDnb:remove")
- @Log(title = "电整点数据", businessType = BusinessType.DELETE)
+ @Log(title = "电整点数据", businessType = BusinessType.DELETE, remark = "删除了电整点数据,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsReportPointDnbService.deleteEmsReportPointDnbByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java b/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java
index f296711..60c46a5 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java
@@ -44,7 +44,7 @@ public class EmsReportPointSteamController extends EmsBaseController {
* 导出蒸汽整点数据列表
*/
@SaCheckPermission("ems/report:reportPointSteam:export")
- @Log(title = "蒸汽整点数据", businessType = BusinessType.EXPORT)
+ @Log(title = "蒸汽整点数据", businessType = BusinessType.EXPORT, remark = "导出了蒸汽整点数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsReportPointSteam emsReportPointSteam) {
List list = emsReportPointSteamService.selectEmsReportPointSteamList(emsReportPointSteam);
@@ -64,7 +64,7 @@ public class EmsReportPointSteamController extends EmsBaseController {
* 新增蒸汽整点数据
*/
@SaCheckPermission("ems/report:reportPointSteam:add")
- @Log(title = "蒸汽整点数据", businessType = BusinessType.INSERT)
+ @Log(title = "蒸汽整点数据", businessType = BusinessType.INSERT, remark = "新增了蒸汽整点数据【#emsReportPointSteam.monitorCode}】")
@PostMapping
public R> add(@RequestBody EmsReportPointSteam emsReportPointSteam) {
return toAjax(emsReportPointSteamService.insertEmsReportPointSteam(emsReportPointSteam));
@@ -74,7 +74,7 @@ public class EmsReportPointSteamController extends EmsBaseController {
* 修改蒸汽整点数据
*/
@SaCheckPermission("ems/report:reportPointSteam:edit")
- @Log(title = "蒸汽整点数据", businessType = BusinessType.UPDATE)
+ @Log(title = "蒸汽整点数据", businessType = BusinessType.UPDATE, remark = "修改了蒸汽整点数据【#emsReportPointSteam.monitorCode}】")
@PutMapping
public R> edit(@RequestBody EmsReportPointSteam emsReportPointSteam) {
return toAjax(emsReportPointSteamService.updateEmsReportPointSteam(emsReportPointSteam));
@@ -84,7 +84,7 @@ public class EmsReportPointSteamController extends EmsBaseController {
* 删除蒸汽整点数据
*/
@SaCheckPermission("ems/report:reportPointSteam:remove")
- @Log(title = "蒸汽整点数据", businessType = BusinessType.DELETE)
+ @Log(title = "蒸汽整点数据", businessType = BusinessType.DELETE, remark = "删除了蒸汽整点数据,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsReportPointSteamService.deleteEmsReportPointSteamByObjIds(objIds));
diff --git a/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.java b/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.java
index fe0ca29..9fff086 100644
--- a/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.java
+++ b/ruoyi-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.java
@@ -44,7 +44,7 @@ public class EmsReportPointWaterController extends EmsBaseController {
* 导出水整点数据列表
*/
@SaCheckPermission("ems/report:reportPointWater:export")
- @Log(title = "水整点数据", businessType = BusinessType.EXPORT)
+ @Log(title = "水整点数据", businessType = BusinessType.EXPORT, remark = "导出了水整点数据")
@PostMapping("/export")
public void export(HttpServletResponse response, EmsReportPointWater emsReportPointWater) {
List list = emsReportPointWaterService.selectEmsReportPointWaterList(emsReportPointWater);
@@ -64,7 +64,7 @@ public class EmsReportPointWaterController extends EmsBaseController {
* 新增水整点数据
*/
@SaCheckPermission("ems/report:reportPointWater:add")
- @Log(title = "水整点数据", businessType = BusinessType.INSERT)
+ @Log(title = "水整点数据", businessType = BusinessType.INSERT, remark = "新增了水整点数据【#emsReportPointWater.monitorName}】")
@PostMapping
public R> add(@RequestBody EmsReportPointWater emsReportPointWater) {
return toAjax(emsReportPointWaterService.insertEmsReportPointWater(emsReportPointWater));
@@ -74,7 +74,7 @@ public class EmsReportPointWaterController extends EmsBaseController {
* 修改水整点数据
*/
@SaCheckPermission("ems/report:reportPointWater:edit")
- @Log(title = "水整点数据", businessType = BusinessType.UPDATE)
+ @Log(title = "水整点数据", businessType = BusinessType.UPDATE, remark = "修改了水整点数据【#emsReportPointWater.monitorName}】")
@PutMapping
public R> edit(@RequestBody EmsReportPointWater emsReportPointWater) {
return toAjax(emsReportPointWaterService.updateEmsReportPointWater(emsReportPointWater));
@@ -84,7 +84,7 @@ public class EmsReportPointWaterController extends EmsBaseController {
* 删除水整点数据
*/
@SaCheckPermission("ems/report:reportPointWater:remove")
- @Log(title = "水整点数据", businessType = BusinessType.DELETE)
+ @Log(title = "水整点数据", businessType = BusinessType.DELETE, remark = "删除了水整点数据,ID:【#objIds}】")
@DeleteMapping("/{objIds}")
public R> remove(@PathVariable Long[] objIds) {
return toAjax(emsReportPointWaterService.deleteEmsReportPointWaterByObjIds(objIds));