添加操作日志联动

fiveep-controller/src/main/java/com/bizmatics/controller/web/AlarmPowerController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.service.AlarmPowerService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.vo.AlarmGradeVO;
 import com.bizmatics.service.vo.AlarmVO;
 import com.bizmatics.service.vo.ApCountVO;
@@ -132,6 +134,7 @@ public class AlarmPowerController {
      * @param alarmPower
      * @return
      */
+    @Log(title = "电力告警", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult<Boolean> update(@RequestBody AlarmPower alarmPower){
         return ApiResult.success(alarmPowerService.updateById(alarmPower));
@@ -151,6 +154,7 @@ public class AlarmPowerController {
      * @param siteId 站点
      * @return
      */
+    @Log(title = "电力告警", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public ApiResult<String> export(@RequestParam(required = false) Date startTime,
                                                   @RequestParam(required = false) Date endTime,

fiveep-controller/src/main/java/com/bizmatics/controller/web/AuthorityConfigController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.SysTenantConfig;
 import com.bizmatics.model.vo.TenantMenuVo;
 import com.bizmatics.service.SysPlatformMenuService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +46,7 @@ public class AuthorityConfigController {
      * @param tenantMenuVo
      * @return
      */
+    @Log(title = "权限配置", businessType = BusinessType.UPDATE)
     @PostMapping("updateMenu")
     public ApiResult<Void> updateMenu(@RequestBody TenantMenuVo tenantMenuVo) {
         sysPlatformMenuService.updateMenu(tenantMenuVo);

fiveep-controller/src/main/java/com/bizmatics/controller/web/BulletinAlarmConfigController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-06-07
- */
-@Controller
-@RequestMapping("/bulletinAlarmConfig")
-public class BulletinAlarmConfigController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/BulletinCruxConfigController.java

@@ -8,6 +8,8 @@ import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.vo.BulletinHistoricalConfigAddVo;
 import com.bizmatics.service.BulletinCruxConfigService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,6 +49,7 @@ public class BulletinCruxConfigController {
      * @param bulletinCruxConfig
      * @return
      */
+    @Log(title = "数据看板", businessType = BusinessType.INSERT)
     @PostMapping("editBulletinCruxConfig")
     public ApiResult<Void> editBulletinCruxConfig(@RequestBody BulletinCruxConfig bulletinCruxConfig) {
         bulletinCruxConfigService.editBulletinCruxConfig(bulletinCruxConfig);
@@ -59,6 +62,7 @@ public class BulletinCruxConfigController {
      * @param bulletinHistoricalConfigAddVo
      * @return
      */
+    @Log(title = "数据看板", businessType = BusinessType.INSERT)
     @PostMapping("editBulletinHistoricalConfig")
     public ApiResult<Void> editBulletinHistoricalConfig(@RequestBody BulletinHistoricalConfigAddVo bulletinHistoricalConfigAddVo) {
         bulletinCruxConfigService.editBulletinHistoricalConfig(bulletinHistoricalConfigAddVo);
@@ -71,6 +75,7 @@ public class BulletinCruxConfigController {
      * @param bulletinAlarmConfig
      * @return
      */
+    @Log(title = "数据看板", businessType = BusinessType.INSERT)
     @PostMapping("editBulletinAlarmConfig")
     public ApiResult<Void> editBulletinAlarmConfig(@RequestBody BulletinAlarmConfig bulletinAlarmConfig) {
         bulletinCruxConfigService.editBulletinAlarmConfig(bulletinAlarmConfig);
@@ -83,6 +88,7 @@ public class BulletinCruxConfigController {
      * @param id 配置ID
      * @return
      */
+    @Log(title = "数据看板", businessType = BusinessType.DELETE)
     @GetMapping("/delBulletinCruxConfig")
     public ApiResult<Void> delBulletinCruxConfig(@RequestParam(value = "id") Integer id) {
         bulletinCruxConfigService.delBulletinCruxConfig(id);
@@ -96,6 +102,7 @@ public class BulletinCruxConfigController {
      * @param id 配置ID
      * @return
      */
+    @Log(title = "数据看板", businessType = BusinessType.DELETE)
     @GetMapping("/delBulletinHistoricalConfig")
     public ApiResult<Void> delBulletinHistoricalConfig(@RequestParam(value = "id") Integer id) {
         bulletinCruxConfigService.delBulletinHistoricalConfig(id);
@@ -109,6 +116,7 @@ public class BulletinCruxConfigController {
      * @param id 配置ID
      * @return
      */
+    @Log(title = "数据看板", businessType = BusinessType.DELETE)
     @GetMapping("/delBulletinAlarmConfig")
     public ApiResult<Void> delBulletinAlarmConfig(@RequestParam(value = "id") Integer id) {
         bulletinCruxConfigService.delBulletinAlarmConfig(id);

fiveep-controller/src/main/java/com/bizmatics/controller/web/BulletinHistoricalConfigController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-06-06
- */
-@Controller
-@RequestMapping("/bulletinHistoricalConfig")
-public class BulletinHistoricalConfigController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/BulletinHistoricalRelationController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-06-06
- */
-@Controller
-@RequestMapping("/bulletinHistoricalRelation")
-public class BulletinHistoricalRelationController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/BulletinStatusConfigController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-06-01
- */
-@Controller
-@RequestMapping("/bulletinStatusConfig")
-public class BulletinStatusConfigController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -7,6 +7,8 @@ import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.vo.DeviceAnalogVariableListOneVo;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.service.DeviceAnalogVariableListService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,6 +34,7 @@ public class DeviceAnalogVariableListController {
      * @param deviceAnalogVariableList
      * @return
      */
+    @Log(title = "站点管理-变量列表", businessType = BusinessType.INSERT)
     @PostMapping("variableListAdd")
     public ApiResult<Void> variableListAdd(@RequestBody DeviceAnalogVariableList deviceAnalogVariableList) {
         deviceAnalogVariableListService.variableListAdd(deviceAnalogVariableList);
@@ -44,6 +47,7 @@ public class DeviceAnalogVariableListController {
      * @param deviceAnalogVariableList
      * @return
      */
+    @Log(title = "站点管理-变量列表", businessType = BusinessType.DELETE)
     @PostMapping("variableListUpdate")
     public ApiResult<Void> variableListUpdate(@RequestBody DeviceAnalogVariableList deviceAnalogVariableList) {
         deviceAnalogVariableListService.variableListUpdate(deviceAnalogVariableList);
@@ -56,7 +60,7 @@ public class DeviceAnalogVariableListController {
      * @param id 变量列表主键ID
      * @return
      */
-
+    @Log(title = "站点管理-变量列表", businessType = BusinessType.DELETE)
     @GetMapping("variableListDel")
     public ApiResult<Void> variableListDel(@RequestParam int id) {
         deviceAnalogVariableListService.variableListDel(id);
@@ -126,6 +130,7 @@ public class DeviceAnalogVariableListController {
      * @param dataArea 1.模拟量 2.状态量 3.参数量
      * @return
      */
+    @Log(title = "站点管理-变量列表", businessType = BusinessType.EXPORT)
     @GetMapping("variableListExport")
     public ApiResult<String> variableListExport(@RequestParam Integer siteId,
                                                 @RequestParam(required = false) String variableName,
@@ -139,6 +144,7 @@ public class DeviceAnalogVariableListController {
      * @return
      * @throws Exception
      */
+    @Log(title = "站点管理-变量列表", businessType = BusinessType.IMPORT)
     @PostMapping("/variableListImport")
     public ApiResult<Void> variableListImport(@RequestParam("file") MultipartFile file){
         deviceAnalogVariableListService.variableListImport(file);

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAttributeController.java

@@ -6,6 +6,8 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.vo.MonitorDeviceListVO;
 import com.bizmatics.service.DeviceAttributeService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -30,6 +32,7 @@ public class DeviceAttributeController {
      * @param deviceAttribute
      * @return
      */
+    @Log(title = "站点管理/设备管理-监控设备", businessType = BusinessType.INSERT)
     @PostMapping("deviceNewsAdd")
     public ApiResult<Void> deviceNewsAdd(@RequestBody DeviceAttribute deviceAttribute) {
         deviceAttributeService.deviceNewsAdd(deviceAttribute);
@@ -43,6 +46,7 @@ public class DeviceAttributeController {
      * @param deviceAttribute
      * @return
      */
+    @Log(title = "站点管理/设备管理-监控设备", businessType = BusinessType.UPDATE)
     @PostMapping("deviceNewsUpdate")
     public ApiResult<Void> deviceNewsUpdate(@RequestBody DeviceAttribute deviceAttribute) {
         deviceAttributeService.deviceNewsUpdate(deviceAttribute);
@@ -87,6 +91,7 @@ public class DeviceAttributeController {
      * @param id
      * @return
      */
+    @Log(title = "站点管理/设备管理-监控设备", businessType = BusinessType.DELETE)
     @GetMapping("deviceNewsDel")
     public ApiResult<Void> deviceNewsDel(@RequestParam Integer id) {
         deviceAttributeService.deviceNewsDel(id);
@@ -115,6 +120,7 @@ public class DeviceAttributeController {
      * @param id     监控漫设备ID
      * @return
      */
+    @Log(title = "站点管理/设备管理-监控设备", businessType = BusinessType.EXPORT)
     @GetMapping("deviceAttributeExport")
     public ApiResult<String> deviceAttributeExport(@RequestParam Integer siteId,
                                                    @RequestParam(value = "id", required = false, defaultValue = "0") Integer id
@@ -128,6 +134,7 @@ public class DeviceAttributeController {
      * @return
      * @throws Exception
      */
+    @Log(title = "站点管理/设备管理-监控设备", businessType = BusinessType.IMPORT)
     @PostMapping("/deviceAttributeImport")
     public ApiResult<Void> deviceAttributeImport(@RequestParam("file") MultipartFile file) {
         deviceAttributeService.deviceAttributeImport(file);

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -9,6 +9,8 @@ import com.bizmatics.model.vo.CorrespondDeviceListVO;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.model.vo.DeviceOneVo;
 import com.bizmatics.service.DeviceService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.vo.DeviceCountVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +89,7 @@ public class DeviceController {
      * @param device
      * @return
      */
+    @Log(title = "设备管理-通信设备", businessType = BusinessType.INSERT)
     @PostMapping("correspondDeviceAdd")
     public ApiResult<Void> correspondDeviceAdd(@RequestBody Device device) {
         deviceService.correspondDeviceAdd(device);
@@ -99,6 +102,7 @@ public class DeviceController {
      * @param device
      * @return
      */
+    @Log(title = "设备管理-通信设备", businessType = BusinessType.UPDATE)
     @PostMapping("correspondDeviceUpdate")
     public ApiResult<Void> correspondDeviceUpdate(@RequestBody Device device) {
         deviceService.correspondDeviceUpdate(device);
@@ -111,6 +115,7 @@ public class DeviceController {
      * @param id
      * @return
      */
+    @Log(title = "设备管理-通信设备", businessType = BusinessType.DELETE)
     @GetMapping("correspondDeviceDel")
     public ApiResult<Void> correspondDeviceDel(@RequestParam int id) {
         deviceService.correspondDeviceDel(id);
@@ -173,6 +178,7 @@ public class DeviceController {
      * @param deviceName    设备名称
      * @return
      */
+    @Log(title = "设备管理-通信设备", businessType = BusinessType.INSERT)
     @GetMapping("variableCloning")
     public ApiResult<Void> variableCloning(@RequestParam Integer type,
                                            @RequestParam String newDeviceCode,
@@ -206,6 +212,7 @@ public class DeviceController {
      * @param deviceType 1：183用电设备，2：视频监控设备，3：171用电设备，4：173用电设备，5：158智能网关，6：其他
      * @return
      */
+    @Log(title = "设备管理-摄像头", businessType = BusinessType.EXPORT)
     @GetMapping("deviceExport")
     public ApiResult<String> deviceExport(@RequestParam(value = "siteId", required = false, defaultValue = "0") Integer siteId,
                                           @RequestParam(required = false) String deviceName,
@@ -220,6 +227,7 @@ public class DeviceController {
      * @param deviceName 设备名称
      * @return
      */
+    @Log(title = "设备管理-通信设备", businessType = BusinessType.EXPORT)
     @GetMapping("correspondDeviceExport")
     public ApiResult<String> correspondDeviceExport(@RequestParam(required = false) String deviceName) {
         return ApiResult.success(deviceService.correspondDeviceExport(deviceName));
@@ -232,6 +240,7 @@ public class DeviceController {
      * @return
      * @throws Exception
      */
+    @Log(title = "设备管理-通信设备", businessType = BusinessType.IMPORT)
     @PostMapping("/deviceImport")
     public ApiResult<Void> deviceImport(@RequestParam("file") MultipartFile file){
         deviceService.deviceImport(file);

fiveep-controller/src/main/java/com/bizmatics/controller/web/DevopsWorkOrderController.java

@@ -6,6 +6,8 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.PatrolInspectors;
 import com.bizmatics.model.vo.*;
 import com.bizmatics.service.DevopsWorkOrderService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,6 +32,7 @@ public class DevopsWorkOrderController {
      * @param devopsWorkOrderVo
      * @return
      */
+    @Log(title = "运维管理-工单管理", businessType = BusinessType.INSERT)
     @PostMapping("devopsWorkOrderAdd")
     public ApiResult<Void> devopsWorkOrderAdd(@RequestBody DevopsWorkOrderVo devopsWorkOrderVo) {
         devopsWorkOrderService.devopsWorkOrderAdd(devopsWorkOrderVo);
@@ -42,6 +45,7 @@ public class DevopsWorkOrderController {
      * @param devopsWorkOrderVo
      * @return
      */
+    @Log(title = "运维管理-工单管理", businessType = BusinessType.UPDATE)
     @PostMapping("devopsWorkOrderUpdate")
     public ApiResult<Void> devopsWorkOrderUpdate(@RequestBody DevopsWorkOrderVo devopsWorkOrderVo) {
         devopsWorkOrderService.devopsWorkOrderUpdate(devopsWorkOrderVo);
@@ -55,6 +59,7 @@ public class DevopsWorkOrderController {
      * @param id 工单ID
      * @return
      */
+    @Log(title = "运维管理-工单管理", businessType = BusinessType.DELETE)
     @GetMapping("devopsWorkOrderDel")
     public ApiResult<Void> devopsWorkOrderDel(@RequestParam Integer id
     ) {
@@ -68,6 +73,7 @@ public class DevopsWorkOrderController {
      * @param inspectionDeviceId 巡检设备ID
      * @return
      */
+    @Log(title = "运维管理-工单管理", businessType = BusinessType.DELETE)
     @GetMapping("devopsOrderDeviceDel")
     public ApiResult<Void> devopsOrderDeviceDel(@RequestParam Integer inspectionDeviceId
     ) {
@@ -81,6 +87,7 @@ public class DevopsWorkOrderController {
      * @param inspectorsId 人员ID
      * @return
      */
+    @Log(title = "运维管理-工单管理", businessType = BusinessType.DELETE)
     @GetMapping("devopsOrderInspectorsDel")
     public ApiResult<Void> devopsOrderInspectorsDel(@RequestParam Integer inspectorsId
     ) {
@@ -190,6 +197,7 @@ public class DevopsWorkOrderController {
      * @param endTime   结束时间
      * @return
      */
+    @Log(title = "运维管理-工作量统计", businessType = BusinessType.EXPORT)
     @GetMapping("workloadStatisticsExport")
     public ApiResult<String> workloadStatisticsExport(@RequestParam(required = false) Integer siteId,
                                                       @RequestParam(required = false) String startTime,

fiveep-controller/src/main/java/com/bizmatics/controller/web/HookupController.java

@@ -10,6 +10,8 @@ import com.bizmatics.model.vo.HookupComponentCompleteOneVo;
 import com.bizmatics.model.vo.HookupComponentCompleteVo;
 import com.bizmatics.model.vo.HookupOneVo;
 import com.bizmatics.service.HookupService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -75,6 +77,7 @@ public class HookupController {
      * @param hookupComponentCompleteOneVoList
      * @return
      */
+    @Log(title = "配电图", businessType = BusinessType.INSERT)
     @PostMapping("setHookupComponentComplete")
     public ApiResult<Void> setHookupComponentComplete(@RequestBody List<HookupComponentCompleteOneVo> hookupComponentCompleteOneVoList) {
         hookupService.setHookupComponentComplete(hookupComponentCompleteOneVoList);

fiveep-controller/src/main/java/com/bizmatics/controller/web/HtAnalogDataController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.vo.DataManagementOneVO;
 import com.bizmatics.model.vo.SingleLoopReportOneVo;
 import com.bizmatics.service.HtAnalogDataService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.vo.CommonIcoVO;
 import com.bizmatics.service.vo.HadCountVO;
 import com.bizmatics.service.vo.RealScoreVO;
@@ -187,6 +189,7 @@ public class HtAnalogDataController {
      * @param endTime    结束时间
      * @return
      */
+    @Log(title = "数据管理-用能月报", businessType = BusinessType.EXPORT)
     @GetMapping("monthlyReportExport")
     public ApiResult<String> monthlyReportExport(@RequestParam String deviceCode,
                                                  @RequestParam int cycle,

fiveep-controller/src/main/java/com/bizmatics/controller/web/HtSwitchDataController.java

@@ -1,26 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import com.bizmatics.service.HtSwitchDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 历史消费组开关
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/htSwitchData")
-public class HtSwitchDataController {
-
-
-    @Autowired
-    private HtSwitchDataService htSwitchDataService;
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolCheckEntryController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.PatrolCheckEntry;
 import com.bizmatics.service.PatrolCheckEntryService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,6 +31,7 @@ public class PatrolCheckEntryController {
      * @param patrolCheckEntry
      * @return
      */
+    @Log(title = "巡检管理-检查条目-检查项", businessType = BusinessType.INSERT)
     @PostMapping("patrolCheckEntryAdd")
     public ApiResult<Void> patrolCheckEntryAdd(@RequestBody PatrolCheckEntry patrolCheckEntry
     ) {
@@ -43,6 +46,7 @@ public class PatrolCheckEntryController {
      * @param patrolCheckEntry
      * @return
      */
+    @Log(title = "巡检管理-检查条目-检查项", businessType = BusinessType.UPDATE)
     @PostMapping("patrolCheckEntryUpdate")
     public ApiResult<Void> patrolCheckEntryUpdate(@RequestBody PatrolCheckEntry patrolCheckEntry
     ) {
@@ -57,6 +61,7 @@ public class PatrolCheckEntryController {
      * @param id 检查条目检查项id
      * @return
      */
+    @Log(title = "巡检管理-检查条目-检查项", businessType = BusinessType.DELETE)
     @GetMapping("patrolCheckEntryDel")
     public ApiResult<Void> patrolCheckEntryDel(@RequestParam Integer id
     ) {

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolDeviceTypeController.java

@@ -4,6 +4,8 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.vo.PatrolDeviceListVO;
 import com.bizmatics.service.PatrolDeviceTypeService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +33,7 @@ public class PatrolDeviceTypeController {
      * @param deviceTypeName 设备类型名称
      * @return
      */
+    @Log(title = "巡检管理-检查条目-检查条目设备类型", businessType = BusinessType.INSERT)
     @GetMapping("patrolDeviceTypeAdd")
     public ApiResult<Void> patrolDeviceTypeAdd(@RequestParam(required = false) String deviceTypeName
     ) {
@@ -45,6 +48,7 @@ public class PatrolDeviceTypeController {
      * @param deviceTypeName 设备类型名称
      * @return
      */
+    @Log(title = "巡检管理-检查条目-检查条目设备类型", businessType = BusinessType.UPDATE)
     @GetMapping("patrolDeviceTypeUpdate")
     public ApiResult<Void> patrolDeviceTypeUpdate(@RequestParam Integer id,
                                                   @RequestParam(required = false) String deviceTypeName
@@ -59,6 +63,7 @@ public class PatrolDeviceTypeController {
      * @param id 检查条目设备类型id
      * @return
      */
+    @Log(title = "巡检管理-检查条目-检查条目设备类型", businessType = BusinessType.DELETE)
     @GetMapping("patrolDeviceTypeDel")
     public ApiResult<Void> patrolDeviceTypeDel(@RequestParam Integer id
     ) {

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectionContentController.java

@@ -7,6 +7,8 @@ import com.bizmatics.model.vo.PatrolInspectionContentListVo;
 import com.bizmatics.model.vo.PatrolInspectionContentVo;
 import com.bizmatics.model.vo.SiteDeviceCountVo;
 import com.bizmatics.service.PatrolInspectionContentService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,6 +33,7 @@ public class PatrolInspectionContentController {
      * @param patrolInspectionContentVo
      * @return
      */
+    @Log(title = "巡检管理-巡检内容", businessType = BusinessType.INSERT)
     @PostMapping("patrolInspectionContentAdd")
     public ApiResult<Void> patrolInspectionContentAdd(@RequestBody PatrolInspectionContentVo patrolInspectionContentVo
     ) {
@@ -44,6 +47,7 @@ public class PatrolInspectionContentController {
      * @param patrolInspectionContentVo
      * @return
      */
+    @Log(title = "巡检管理-巡检内容", businessType = BusinessType.UPDATE)
     @PostMapping("patrolInspectionContentUpdate")
     public ApiResult<Void> patrolInspectionContentUpdate(@RequestBody PatrolInspectionContentVo patrolInspectionContentVo
     ) {
@@ -57,6 +61,7 @@ public class PatrolInspectionContentController {
      * @param id 巡检内容id
      * @return
      */
+    @Log(title = "巡检管理-巡检内容", businessType = BusinessType.DELETE)
     @GetMapping("patrolInspectionContentDel")
     public ApiResult<Void> patrolInspectionContentDel(@RequestParam Integer id
     ) {

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectionDeviceController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.PatrolInspectionDevice;
 import com.bizmatics.model.vo.PatrolInspectionDeviceVo;
 import com.bizmatics.service.PatrolInspectionDeviceService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,6 +35,7 @@ public class PatrolInspectionDeviceController {
      * @param deviceTypeId         设备类型
      * @return
      */
+    @Log(title = "巡检管理-巡检设备", businessType = BusinessType.INSERT)
     @GetMapping("patrolInspectionDeviceAdd")
     public ApiResult<Void> patrolInspectionDeviceAdd(@RequestParam String inspectionDeviceName,
                                                      @RequestParam Integer siteId,
@@ -48,6 +51,7 @@ public class PatrolInspectionDeviceController {
      * @param patrolInspectionDevice
      * @return
      */
+    @Log(title = "巡检管理-巡检设备", businessType = BusinessType.UPDATE)
     @PostMapping("patrolInspectionDeviceUpdate")
     public ApiResult<Void> patrolInspectionDeviceUpdate(@RequestBody PatrolInspectionDevice patrolInspectionDevice
     ) {
@@ -61,6 +65,7 @@ public class PatrolInspectionDeviceController {
      * @param id 巡检设备ID
      * @return
      */
+    @Log(title = "巡检管理-巡检设备", businessType = BusinessType.DELETE)
     @GetMapping("patrolInspectionDeviceDel")
     public ApiResult<Void> patrolInspectionDeviceDel(@RequestParam Integer id
     ) {

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectionSchemeController.java

@@ -10,6 +10,8 @@ import com.bizmatics.model.vo.PatrolInspectionSchemeListVo;
 import com.bizmatics.model.vo.PatrolInspectionSchemeOneVo;
 import com.bizmatics.model.vo.PatrolInspectionSchemeVo;
 import com.bizmatics.service.PatrolInspectionSchemeService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,6 +36,7 @@ public class PatrolInspectionSchemeController {
      * @param patrolInspectionSchemeVo
      * @return
      */
+    @Log(title = "巡检管理-巡检计划", businessType = BusinessType.INSERT)
     @PostMapping("patrolInspectionSchemeAdd")
     public ApiResult<Void> patrolInspectionSchemeAdd(@RequestBody PatrolInspectionSchemeVo patrolInspectionSchemeVo
     ) {
@@ -47,6 +50,7 @@ public class PatrolInspectionSchemeController {
      * @param patrolInspectionSchemeVo
      * @return
      */
+    @Log(title = "巡检管理-巡检计划", businessType = BusinessType.UPDATE)
     @PostMapping("patrolInspectionSchemeUpdate")
     public ApiResult<Void> patrolInspectionSchemeUpdate(@RequestBody PatrolInspectionSchemeVo patrolInspectionSchemeVo
     ) {
@@ -60,6 +64,7 @@ public class PatrolInspectionSchemeController {
      * @param id
      * @return
      */
+    @Log(title = "巡检管理-巡检计划", businessType = BusinessType.UPDATE)
     @GetMapping("patrolInspectionSchemeDel")
     public ApiResult<Void> patrolInspectionSchemeDel(@RequestParam Integer id
     ) {
@@ -127,6 +132,7 @@ public class PatrolInspectionSchemeController {
      * @param id 巡检线路ID
      * @return
      */
+    @Log(title = "巡检管理-巡检计划", businessType = BusinessType.DELETE)
     @GetMapping("patrolInspectionRouteDel")
     public ApiResult<Void> patrolInspectionRouteDel(@RequestParam Integer id
     ) {

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectionTeamController.java

@@ -1,18 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * 团队管理-未开发
- *
- * @author ya
- * @since 2021-10-18
- */
-@Controller
-@RequestMapping("/patrolInspectionTeam")
-public class PatrolInspectionTeamController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectorsController.java

@@ -1,18 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * 人员管理-未开发
- *
- * @author ya
- * @since 2021-10-18
- */
-@Controller
-@RequestMapping("/patrolInspectors")
-public class PatrolInspectorsController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolManufacturerController.java

@@ -1,18 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * 厂家管理-未开发
- *
- * @author ya
- * @since 2021-10-15
- */
-@Controller
-@RequestMapping("/patrolManufacturer")
-public class PatrolManufacturerController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/PlatformAreaController.java

@@ -9,6 +9,8 @@ import com.bizmatics.model.vo.PlatformAreaVo;
 import com.bizmatics.model.vo.SiteDeviceList;
 import com.bizmatics.model.vo.SiteListVo;
 import com.bizmatics.service.PlatformAreaService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,6 +36,7 @@ public class PlatformAreaController {
      * @param platformArea
      * @return
      */
+    @Log(title = "台区管理", businessType = BusinessType.INSERT)
     @PostMapping("platformAreaAdd")
     public ApiResult<Void> platformAreaAdd(@RequestBody PlatformArea platformArea) {
         platformAreaService.platformAreaAdd(platformArea);
@@ -46,6 +49,7 @@ public class PlatformAreaController {
      * @param platformArea
      * @return
      */
+    @Log(title = "台区管理", businessType = BusinessType.UPDATE)
     @PostMapping("platformAreaUpdate")
     public ApiResult<Void> platformAreaUpdate(@RequestBody PlatformArea platformArea) {
         platformAreaService.platformAreaUpdate(platformArea);
@@ -86,6 +90,7 @@ public class PlatformAreaController {
      * @param id 台区ID
      * @return
      */
+    @Log(title = "台区管理", businessType = BusinessType.DELETE)
     @GetMapping("platformAreaDel")
     public ApiResult<Void> platformAreaDel(@RequestParam int id) {
         platformAreaService.platformAreaDel(id);
@@ -110,6 +115,7 @@ public class PlatformAreaController {
      * @param deviceVo
      * @return
      */
+    @Log(title = "台区管理", businessType = BusinessType.UPDATE)
     @PostMapping("siteDeviceUpdate")
     public ApiResult<Void> siteDeviceUpdate(@RequestBody DeviceVo deviceVo) {
         platformAreaService.siteDeviceUpdate(deviceVo);
@@ -124,6 +130,7 @@ public class PlatformAreaController {
      * @param deviceAttributeId
      * @return
      */
+    @Log(title = "台区管理", businessType = BusinessType.DELETE)
     @GetMapping("siteDeviceDel")
     public ApiResult<Void> siteDeviceDel(@RequestParam int deviceId,
                                          @RequestParam int deviceAttributeId) {

fiveep-controller/src/main/java/com/bizmatics/controller/web/PowerQualityConfigController.java

@@ -4,6 +4,8 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.PowerQualityConfig;
 import com.bizmatics.service.PowerQualityConfigService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +30,7 @@ public class PowerQualityConfigController {
      * @param powerQualityConfig
      * @return
      */
+    @Log(title = "站点管理-电能质量评分配置", businessType = BusinessType.INSERT)
     @PostMapping("powerQualityAdd")
     public ApiResult<Void> powerQualityAdd(@RequestBody PowerQualityConfig powerQualityConfig) {
         powerQualityConfigService.powerQualityAdd(powerQualityConfig);
@@ -40,6 +43,7 @@ public class PowerQualityConfigController {
      * @param powerQualityConfig
      * @return
      */
+    @Log(title = "站点管理-电能质量评分配置", businessType = BusinessType.UPDATE)
     @PostMapping("powerQualityUpdate")
     public ApiResult<Void> powerQualityUpdate(@RequestBody PowerQualityConfig powerQualityConfig) {
         powerQualityConfigService.powerQualityUpdate(powerQualityConfig);
@@ -52,6 +56,7 @@ public class PowerQualityConfigController {
      * @param id 电能质量评分配置表主键ID
      * @return
      */
+    @Log(title = "站点管理-电能质量评分配置", businessType = BusinessType.DELETE)
     @GetMapping("powerQualityDel")
     public ApiResult<Void> powerQualityDel(@RequestParam int id) {
         powerQualityConfigService.powerQualityDel(id);

fiveep-controller/src/main/java/com/bizmatics/controller/web/RtAnalogDataController.java

@@ -3,6 +3,8 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.RtAnalogDataService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.vo.RadCountVO;
 import com.bizmatics.service.vo.RealScoreOneVO;
 import com.bizmatics.service.vo.RealScoreVO;
@@ -128,6 +130,7 @@ public class RtAnalogDataController {
      * @param queryType 类型 日 月 年
      * @return
      */
+    @Log(title = "数据报表", businessType = BusinessType.EXPORT)
     @GetMapping("/DataReportExport")
     public ApiResult<String> export(@RequestParam Integer siteId,
                                     @RequestParam(required = false) Date startTime,

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteController.java

@@ -4,6 +4,8 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.*;
 import com.bizmatics.service.SiteService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 import com.bizmatics.service.vo.SiteVOT;
@@ -99,6 +101,7 @@ public class SiteController {
      * @param siteVOT
      * @return
      */
+    @Log(title = "站点管理-基础信息", businessType = BusinessType.INSERT)
     @PostMapping("siteAdd")
     public ApiResult<Void> siteAdd(@RequestBody SiteVOT siteVOT) {
         if (siteVOT.getId()==0){
@@ -114,6 +117,7 @@ public class SiteController {
      * @param id
      * @return
      */
+    @Log(title = "站点管理-基础信息", businessType = BusinessType.DELETE)
     @GetMapping("siteDel")
     public ApiResult<Void> siteDel(@RequestParam(required = false) String id) {
             siteService.sitedel(id);

fiveep-controller/src/main/java/com/bizmatics/controller/web/SitedtlController.java

@@ -6,6 +6,8 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.vo.SitedtlArchivesVo;
 import com.bizmatics.model.vo.SitedtlVo;
 import com.bizmatics.service.SitedtlService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +30,7 @@ public class SitedtlController {
      * @param sitedtlArchivesVo
      * @return
      */
+    @Log(title = "运维管理-现场档案", businessType = BusinessType.INSERT)
     @PostMapping("sitedtlAdd")
     public ApiResult<Void> sitedtlAdd(@RequestBody SitedtlArchivesVo sitedtlArchivesVo) {
         sitedtlService.sitedtlAdd(sitedtlArchivesVo);
@@ -40,6 +43,7 @@ public class SitedtlController {
      * @param sitedtlArchivesVo
      * @return
      */
+    @Log(title = "运维管理-现场档案", businessType = BusinessType.UPDATE)
     @PostMapping("sitedtlUpdate")
     public ApiResult<Void> sitedtlUpdate(@RequestBody SitedtlArchivesVo sitedtlArchivesVo) {
         sitedtlService.sitedtlUpdate(sitedtlArchivesVo);
@@ -72,6 +76,7 @@ public class SitedtlController {
      * @param electricTestOverdue 电试超期
      * @return
      */
+    @Log(title = "运维管理-现场档案", businessType = BusinessType.EXPORT)
     @GetMapping("variableListExport")
     public ApiResult<String> variableListExport(@RequestParam(value = "siteId", required = false, defaultValue = "0") Integer siteId,
                                                 @RequestParam(required = false) String electricTestOverdue

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysPlatformController.java

@@ -6,6 +6,8 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.vo.PlatformMenuVo;
 import com.bizmatics.model.vo.SysPlatformVo;
 import com.bizmatics.service.SysPlatformService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -62,6 +64,7 @@ public class SysPlatformController {
      * @param platformMenuVo
      * @return
      */
+    @Log(title = "模板管理", businessType = BusinessType.INSERT)
     @PostMapping("updatePlatformMenu")
     public ApiResult<Void> updatePlatformMenu(@RequestBody PlatformMenuVo platformMenuVo) {
         sysPlatformService.updatePlatformMenu(platformMenuVo);

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysPlatformMenuController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 平台和菜单关联表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-05-18
- */
-@Controller
-@RequestMapping("/sysPlatformMenu")
-public class SysPlatformMenuController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysTenantConfigController.java

@@ -12,6 +12,8 @@ import com.bizmatics.model.vo.SysTenantTwoVo;
 import com.bizmatics.service.PatrolInspectionDeviceService;
 import com.bizmatics.service.SysTenantConfigService;
 import com.bizmatics.service.SysTenantService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -84,6 +86,7 @@ public class SysTenantConfigController {
      * @param sysTenantConfig
      * @return
      */
+    @Log(title = "租户管理-系统配置", businessType = BusinessType.INSERT)
     @PostMapping("addMiddleConfig")
     public ApiResult<Void> addMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
         sysTenantConfigService.addMiddleConfig(sysTenantConfig);
@@ -95,6 +98,7 @@ public class SysTenantConfigController {
      * @param sysTenantConfig
      * @return
      */
+    @Log(title = "租户管理-系统配置", businessType = BusinessType.UPDATE)
     @PostMapping("updaMiddleConfig")
     public ApiResult<Void> updaMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
         sysTenantConfigService.updaMiddleConfig(sysTenantConfig);

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysTenantMenuController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 租户和菜单关联表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-05-18
- */
-@Controller
-@RequestMapping("/sysTenantMenu")
-public class SysTenantMenuController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/TenantConfigController.java

@@ -9,6 +9,8 @@ import com.bizmatics.model.vo.SysTenantOneVo;
 import com.bizmatics.model.vo.SysTenantTwoVo;
 import com.bizmatics.service.SysPlatformService;
 import com.bizmatics.service.SysTenantService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -49,6 +51,7 @@ public class TenantConfigController {
      * @param sysTenant
      * @return
      */
+    @Log(title = "租户管理-单位管理", businessType = BusinessType.INSERT)
     @PostMapping("addTenantData")
     public ApiResult<Void> addTenantData(@RequestBody SysTenant sysTenant) {
         sysTenantService.addTenantData(sysTenant);
@@ -61,6 +64,7 @@ public class TenantConfigController {
      * @param sysTenant
      * @return
      */
+    @Log(title = "租户管理-单位管理", businessType = BusinessType.UPDATE)
     @PostMapping("updateTenantData")
     public ApiResult<Void> updateTenantData(@RequestBody SysTenant sysTenant) {
         sysTenantService.updateTenantData(sysTenant);

fiveep-controller/src/main/java/com/bizmatics/controller/web/UserConfigController.java

@@ -10,6 +10,8 @@ import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.SysTenantTwoVo;
 import com.bizmatics.service.SysTenantService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysUserService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,7 @@ public class UserConfigController extends BaseController {
      * @param user
      * @return
      */
+    @Log(title = "租户管理-管理员配置", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping("/addUserData")
     public ApiResult<Void> addUserData(@Validated @RequestBody SysUser user) {
@@ -71,6 +74,7 @@ public class UserConfigController extends BaseController {
      * @param user
      * @return
      */
+    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
     @Transactional
     @PostMapping("/updateserData")
     public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
@@ -95,6 +99,7 @@ public class UserConfigController extends BaseController {
      * @param userId 用户ID
      * @return
      */
+    @Log(title = "租户管理-管理员配置", businessType = BusinessType.DELETE)
     @GetMapping("/delUsers")
     public ApiResult<Void> delUsers(@RequestParam Long userId) {
         SysUser user = new SysUser();
@@ -118,6 +123,7 @@ public class UserConfigController extends BaseController {
      * @param UserId      用户ID
      * @return
      */
+    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public ApiResult updatePwd(String newPassword, Long UserId) {
         SysUser sysUser = userService.selectUserById(UserId);

fiveep-controller/src/main/java/com/bizmatics/controller/web/WcBlackoutPlanController.java

@@ -7,6 +7,8 @@ import com.bizmatics.model.WcBlackoutPlan;
 import com.bizmatics.model.vo.PlannedOutageVo;
 import com.bizmatics.model.vo.WcBlackoutPlanVo;
 import com.bizmatics.service.WcBlackoutPlanService;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,6 +33,7 @@ public class WcBlackoutPlanController {
      * @param wcBlackoutPlan
      * @return
      */
+    @Log(title = "停电计划", businessType = BusinessType.INSERT)
     @PostMapping("plannedOutageAdd")
     public ApiResult<Void> plannedOutageAdd(@RequestBody WcBlackoutPlan wcBlackoutPlan) {
         wcBlackoutPlanService.plannedOutageAdd(wcBlackoutPlan);
@@ -44,6 +47,7 @@ public class WcBlackoutPlanController {
      * @param wcBlackoutPlan
      * @return
      */
+    @Log(title = "停电计划", businessType = BusinessType.UPDATE)
     @PostMapping("plannedOutageUpdate")
     public ApiResult<Void> plannedOutageUpdate(@RequestBody WcBlackoutPlan wcBlackoutPlan) {
         wcBlackoutPlanService.plannedOutageUpdate(wcBlackoutPlan);
@@ -56,6 +60,7 @@ public class WcBlackoutPlanController {
      * @param id
      * @return
      */
+    @Log(title = "停电计划", businessType = BusinessType.DELETE)
     @GetMapping("plannedOutageDel")
     public ApiResult<Void> plannedOutageDel(@RequestParam int id) {
         wcBlackoutPlanService.plannedOutageDel(id);
@@ -82,6 +87,7 @@ public class WcBlackoutPlanController {
      * @param type      状态 1 未执行 2执行中 3 已执行
      * @return
      */
+    @Log(title = "停电计划", businessType = BusinessType.EXPORT)
     @GetMapping("outagePlanListExport")
     public ApiResult<String> outagePlanListExport(@RequestParam(value = "startTime", required = false) String startTime,
                                                   @RequestParam(value = "endTime", required = false) String endTime,

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysConfigController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.exception.BusinessErrorCode;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.page.TableDataInfo;
 import com.bizmatics.model.system.SysConfig;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysConfigService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,7 @@ public class SysConfigController extends BaseController
     /**
      * 新增参数配置
      */
+    @Log(title = "参数配置", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:config:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysConfig config)
@@ -76,6 +79,7 @@ public class SysConfigController extends BaseController
     /**
      * 修改参数配置
      */
+    @Log(title = "参数配置", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysConfig config)
@@ -91,6 +95,7 @@ public class SysConfigController extends BaseController
     /**
      * 删除参数配置
      */
+    @Log(title = "参数配置", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @DeleteMapping("/{configIds}")
     public ApiResult remove(@PathVariable Long[] configIds)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDeptController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.exception.BusinessErrorCode;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.SysDept;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysDeptService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -99,6 +101,7 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
+    @Log(title = "部门信息", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysDept dept)
@@ -114,6 +117,7 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
+    @Log(title = "部门信息", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysDept dept)
@@ -138,6 +142,7 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
+    @Log(title = "部门信息", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @DeleteMapping("/{deptId}")
     public ApiResult remove(@PathVariable Long deptId)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDictDataController.java

@@ -3,6 +3,8 @@ package com.bizmatics.controller.web.system;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.page.TableDataInfo;
 import com.bizmatics.model.system.SysDictData;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysDictDataService;
 import com.bizmatics.service.system.ISysDictTypeService;
 import com.bizmatics.service.util.SecurityUtils;
@@ -67,6 +69,7 @@ public class SysDictDataController extends BaseController
     /**
      * 新增字典类型
      */
+    @Log(title = "数据字典信息", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysDictData dict)
@@ -78,6 +81,7 @@ public class SysDictDataController extends BaseController
     /**
      * 修改保存字典类型
      */
+    @Log(title = "数据字典信息", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysDictData dict)
@@ -89,6 +93,7 @@ public class SysDictDataController extends BaseController
     /**
      * 删除字典类型
      */
+    @Log(title = "数据字典信息", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @DeleteMapping("/{dictCodes}")
     public ApiResult remove(@PathVariable Long[] dictCodes)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDictTypeController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.exception.BusinessErrorCode;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.page.TableDataInfo;
 import com.bizmatics.model.system.SysDictType;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysDictTypeService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +50,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 新增字典类型
      */
+    @Log(title = "数据字典信息", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysDictType dict)
@@ -63,6 +66,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 修改字典类型
      */
+    @Log(title = "数据字典信息", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysDictType dict)
@@ -78,6 +82,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 删除字典类型
      */
+    @Log(title = "数据字典信息", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @DeleteMapping("/{dictIds}")
     public ApiResult remove(@PathVariable Long[] dictIds)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysMenuController.java

@@ -7,6 +7,8 @@ import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.utils.ServletUtils;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.SysMenu;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysMenuService;
 import com.bizmatics.service.system.impl.TokenService;
 import com.bizmatics.service.config.security.LoginUser;
@@ -88,6 +90,7 @@ public class SysMenuController extends BaseController
     /**
      * 新增菜单
      */
+    @Log(title = "菜单信息", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysMenu menu)
@@ -108,6 +111,7 @@ public class SysMenuController extends BaseController
     /**
      * 修改菜单
      */
+    @Log(title = "菜单信息", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysMenu menu)
@@ -132,6 +136,7 @@ public class SysMenuController extends BaseController
     /**
      * 删除菜单
      */
+    @Log(title = "菜单信息", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @DeleteMapping("/{menuId}")
     public ApiResult remove(@PathVariable("menuId") Long menuId)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysNoticeController.java

@@ -3,6 +3,8 @@ package com.bizmatics.controller.web.system;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.page.TableDataInfo;
 import com.bizmatics.model.system.SysNotice;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysNoticeService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +52,7 @@ public class SysNoticeController extends BaseController
     /**
      * 新增通知公告
      */
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysNotice notice)
@@ -61,6 +64,7 @@ public class SysNoticeController extends BaseController
     /**
      * 修改通知公告
      */
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysNotice notice)
@@ -72,6 +76,7 @@ public class SysNoticeController extends BaseController
     /**
      * 删除通知公告
      */
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @DeleteMapping("/{noticeIds}")
     public ApiResult remove(@PathVariable Long[] noticeIds)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysPostController.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.exception.BusinessErrorCode;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.page.TableDataInfo;
 import com.bizmatics.model.system.SysPost;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysPostService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,7 @@ public class SysPostController extends BaseController
     /**
      * 新增岗位
      */
+    @Log(title = "新增岗位", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:post:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysPost post)
@@ -71,6 +74,7 @@ public class SysPostController extends BaseController
     /**
      * 修改岗位
      */
+    @Log(title = "新增岗位", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysPost post)
@@ -90,6 +94,7 @@ public class SysPostController extends BaseController
     /**
      * 删除岗位
      */
+    @Log(title = "新增岗位", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @DeleteMapping("/{postIds}")
     public ApiResult remove(@PathVariable Long[] postIds)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysProfileController.java

@@ -6,6 +6,8 @@ import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.utils.ServletUtils;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.system.ISysUserService;
 import com.bizmatics.service.system.impl.TokenService;
 import com.bizmatics.service.config.security.LoginUser;
@@ -49,6 +51,7 @@ public class SysProfileController extends BaseController
     /**
      * 修改用户
      */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult updateProfile(@RequestBody SysUser user)
     {
@@ -82,6 +85,7 @@ public class SysProfileController extends BaseController
     /**
      * 重置密码
      */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public ApiResult updatePwd(String oldPassword, String newPassword)
     {

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysRoleController.java

@@ -68,7 +68,7 @@ public class SysRoleController extends BaseController
     /**
      * 新增角色
      */
-    @Log(title = "新增角色", businessType = BusinessType.INSERT)
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysRole role)
@@ -89,6 +89,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysRole role)
@@ -119,6 +120,7 @@ public class SysRoleController extends BaseController
         return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(),"修改角色'" + role.getRoleName() + "'失败，请联系管理员");
     }
 //    @PreAuthorize("@ss.hasPermi('system:role:editOne')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping(value = "/editOne")
     public ApiResult editOne(@Validated @RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
@@ -133,6 +135,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存数据权限
      */
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PutMapping("/dataScope")
     public ApiResult dataScope(@RequestBody SysRole role)
@@ -144,6 +147,7 @@ public class SysRoleController extends BaseController
     /**
      * 状态修改
      */
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PutMapping("/changeStatus")
     public ApiResult changeStatus(@RequestBody SysRole role)
@@ -156,6 +160,7 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @DeleteMapping("/{roleIds}")
     public ApiResult remove(@PathVariable Long[] roleIds)

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysUserController.java

@@ -11,6 +11,8 @@ import com.bizmatics.model.page.TableDataInfo;
 import com.bizmatics.model.system.SysRole;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.persistence.mapper.system.SysUserMapper;
+import com.bizmatics.service.aop.BusinessType;
+import com.bizmatics.service.aop.Log;
 import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysPostService;
 import com.bizmatics.service.system.ISysRoleService;
@@ -85,6 +87,7 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
+    @Log(title = "用户信息", businessType = BusinessType.INSERT)
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Transactional
     @PostMapping
@@ -124,6 +127,7 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
+    @Log(title = "用户信息", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Transactional
     @PutMapping
@@ -154,6 +158,7 @@ public class SysUserController extends BaseController {
     /**
      * 删除用户
      */
+    @Log(title = "用户信息", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @DeleteMapping("/{userIds}")
     public ApiResult<Void> remove(@PathVariable Long[] userIds) {
@@ -163,6 +168,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
+    @Log(title = "用户信息", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @PutMapping("/resetPwd")
     public ApiResult<Void> resetPwd(@RequestBody SysUser user) {
@@ -175,6 +181,7 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
+    @Log(title = "用户信息", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping("/changeStatus")
     public ApiResult<Void> changeStatus(@RequestBody SysUser user) {
@@ -219,6 +226,7 @@ public class SysUserController extends BaseController {
     /**
      * 个人中心-信息编辑
      */
+    @Log(title = "个人中心", businessType = BusinessType.UPDATE)
     @PostMapping("/setUserData")
     public ApiResult<Void> setUserData(@RequestBody SysUser user) {
 //        userService.checkUserAllowed(user);
@@ -236,6 +244,7 @@ public class SysUserController extends BaseController {
     /**
      * 个人中心-重置密码
      */
+    @Log(title = "个人中心", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public ApiResult updatePwd(String oldPassword, String newPassword) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
@@ -260,6 +269,7 @@ public class SysUserController extends BaseController {
     /**
      * 租户管理-管理员配置-新增
      */
+    @Log(title = "租户管理-", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping("/addUserData")
     public ApiResult<Void> addUserData(@Validated @RequestBody SysUser user) {
@@ -285,6 +295,7 @@ public class SysUserController extends BaseController {
     }
 
 
+    @Log(title = "用户管理-", businessType = BusinessType.UPDATE)
     @Transactional
     @PostMapping("/updateserData")
     public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {