diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java index 83ba66c..c199859 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java @@ -6,7 +6,9 @@ import com.github.pagehelper.PageInfo; import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.utils.poi.ExcelUtil; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.securityControl.common.security.utils.SecurityUtils; import com.sercurityControl.proteam.domain.vo.ReturnCodeEntity; @@ -57,7 +59,7 @@ public class ManageController extends BaseController { * @return */ @PostMapping("getPageInfo") - @Log(title = "单位管理", menu = "施工单位管理->监理单位管理", businessType = BusinessType.QUERY, grade = OperationType.QUERY_BUSINESS, details = "施工单位-监理单位") + @SysLog(title = "监理单位管理", model = "工程信息->监理单位管理", operaType = OperaType.QUERY, details = "查询监理单位数据",logType = 1) public Map getPageInfo(SupeConsUserVo supeConsUserVo) { PageHelper.startPage(supeConsUserVo.getPage(), supeConsUserVo.getLimit()); List deviceList = service.getPageInfo(supeConsUserVo); @@ -73,7 +75,7 @@ public class ManageController extends BaseController { } @PostMapping("insertData") - @Log(title = "单位管理", menu = "施工单位管理->监理单位管理", businessType = BusinessType.INSERT, details = "施工单位-监理单位", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "监理单位管理", model = "工程信息->监理单位管理", operaType = OperaType.INSERT, details = "新增监理单位数据",logType = 1) public ReturnCodeEntity insertData(SupeConsUserVo supeConsUserVo) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -86,7 +88,7 @@ public class ManageController extends BaseController { } @PostMapping("updateData") - @Log(title = "单位管理", menu = "施工单位管理->监理单位管理", businessType = BusinessType.UPDATE, details = "施工单位-监理单位", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "监理单位管理", model = "工程信息->监理单位管理", operaType = OperaType.UPDATE, details = "修改监理单位数据",logType = 1) public ReturnCodeEntity updateData(SupeConsUserVo deviceVo) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -105,7 +107,7 @@ public class ManageController extends BaseController { * @return */ @PostMapping("deleteData") - @Log(title = "单位管理", menu = "施工单位管理->监理单位管理", businessType = BusinessType.DELETE, details = "删除单位", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "监理单位管理", model = "工程信息->监理单位管理", operaType = OperaType.DELETE, details = "删除监理单位数据",logType = 1) public ReturnCodeEntity deleteData(String keyId) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -124,7 +126,6 @@ public class ManageController extends BaseController { * @return */ @PostMapping("getDataDetail") - @Log(title = "单位管理", menu = "施工单位管理->监理单位管理", businessType = BusinessType.QUERY, details = "查看单位详情", grade = OperationType.QUERY_BUSINESS) public SupeConsUserVo getDataDetail(String keyId) { SupeConsUserVo supeConsUserVo = null; try { @@ -143,6 +144,7 @@ public class ManageController extends BaseController { * @param supeConsUserVo */ @GetMapping("exportDevice") + @SysLog(title = "监理单位管理", model = "工程信息->监理单位管理", operaType = OperaType.EXPORT, details = "导出监理单位数据",logType = 1) public void exportDevice(HttpServletResponse response, SupeConsUserVo supeConsUserVo) { List studentsList = service.getPageInfo(supeConsUserVo); ExcelUtil util = new ExcelUtil(SupeConsUserVo.class); @@ -175,6 +177,7 @@ public class ManageController extends BaseController { * @date 2024/1/23 11:07 */ @GetMapping("downLoadExcelModel") + @SysLog(title = "监理单位管理", model = "工程信息->监理单位管理", operaType = OperaType.DOWNLOAD, details = "模板下载",logType = 1) public void downLoadExcelModel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; @@ -207,7 +210,7 @@ public class ManageController extends BaseController { } @PostMapping("/importExcel") - @Log(title = "监理/施工单位数据导入", menu = "监理/施工单位数据导入", businessType = BusinessType.IMPORT, details = "监理/施工单位数据导入", grade = OperationType.IMPORT_BUSINESS) + @SysLog(title = "监理单位管理", model = "工程信息->监理单位管理", operaType = OperaType.IMPORT, details = "导入监理单位数据",logType = 1) public void importExcel(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TRiskPressDropRateController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TRiskPressDropRateController.java index 2c8c897..d92421c 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TRiskPressDropRateController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TRiskPressDropRateController.java @@ -2,7 +2,9 @@ package com.sercurityControl.proteam.controller; import com.alibaba.fastjson2.JSONObject; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.sercurityControl.proteam.domain.dto.RiskDelParamDto; import com.sercurityControl.proteam.util.ImportExcelUtils; @@ -61,7 +63,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "数据导入") @PostMapping("/importExcel") - //@Log(title = "压降率计算", businessType = BusinessType.IMPORT, details = "数据导入") + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.IMPORT, details = "导入压降率数据",logType = 1) public AjaxResult importExcel(MultipartFile file, HttpServletRequest request) throws Exception { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -82,14 +84,13 @@ public class TRiskPressDropRateController extends BaseController { * @return 单条数据 */ @GetMapping("/{id}") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "通过主键查询单条数据") public AjaxResult queryById(@PathVariable("id") String id) { return success(tRiskPressDropRateService.queryById(id)); } @ApiOperation("模板下载") @GetMapping("/downloadExcel") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "模板下载", grade = OperationType.DOWNLOAD_BUSINESS) + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.DOWNLOAD, details = "模板下载",logType = 1) public void downloadExcel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; @@ -129,7 +130,6 @@ public class TRiskPressDropRateController extends BaseController { * @return 删除是否成功 */ @DeleteMapping("/id") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.DELETE, details = "删除数据", grade = OperationType.DELETE_BUSINESS) public AjaxResult deleteById(String id) { tRiskPressDropRateService.deleteById(id); return success(); @@ -144,7 +144,6 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "获取风险压降率的工程") @GetMapping("/getProNameList") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "获取风险压降率的工程") public AjaxResult getProNameList(@RequestParam("cityName") String cityName) { return AjaxResult.success(tRiskPressDropRateService.getProNameList(cityName)); } @@ -158,7 +157,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "根据地市、或者工程来删除数据") @PostMapping("/delProList") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "根据地市、或者工程来删除数据", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.DELETE, details = "删除压降率数据",logType = 1) public AjaxResult delProList(RiskDelParamDto paramDto) { tRiskPressDropRateService.delProList(paramDto); return success(); @@ -173,7 +172,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "获取风险压降率数据") @PostMapping("/getRiskBloodList") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "获取风险压降率数据") + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.QUERY, details = "查询压降率数据",logType = 1) public TableDataInfo getRiskBloodList(TRiskPressDropRate tRiskPressDropRate) { startPage(); return getDataTable(tRiskPressDropRateService.getRiskBloodList(tRiskPressDropRate)); @@ -188,7 +187,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "风险压降率计算") @PostMapping("/getRiskDropRate") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "风险压降率计算") + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.QUERY, details = "查询压降率计算数据",logType = 1) public AjaxResult getRiskDropRate(TRiskPressDropRate pressDropRate) { return AjaxResult.success(tRiskPressDropRateService.getRiskDropRate(pressDropRate)); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/UavPatrolController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/UavPatrolController.java index ef541ae..c227c3e 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/UavPatrolController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/UavPatrolController.java @@ -4,7 +4,9 @@ import com.securityControl.common.core.web.controller.BaseController; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.core.web.page.TableDataInfo; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.sercurityControl.proteam.domain.ClassData; import com.sercurityControl.proteam.domain.UAVBandProEntity; @@ -36,7 +38,7 @@ public class UavPatrolController extends BaseController { **/ @ApiOperation(value = "无人机树") @PostMapping("/getUavData") - @Log(title = "无人机巡视", menu = "无人机巡视", businessType = BusinessType.QUERY, details = "无人机树") + @SysLog(title = "无人机巡视", model = "工程信息->无人机巡视", operaType = OperaType.QUERY, details = "查询无人机数据",logType = 1) public AjaxResult getUavData(String userId) { return service.getUavData(userId); } @@ -48,7 +50,7 @@ public class UavPatrolController extends BaseController { **/ @ApiOperation(value = "绑定信息") @PostMapping("/getUavBandProList") - @Log(title = "无人机巡视", menu = "无人机巡视", businessType = BusinessType.QUERY, details = "获取无人机绑定信息") + @SysLog(title = "工程绑定", model = "工程信息->无人机巡视->工程绑定", operaType = OperaType.QUERY, details = "查询无人机绑定工程数据",logType = 1) public TableDataInfo getUavBandProList() { startPage(); return getDataTable(service.getUavBandProList()); @@ -62,7 +64,6 @@ public class UavPatrolController extends BaseController { **/ @ApiOperation(value = "获取工程集合") @PostMapping("/getProList") - @Log(title = "无人机巡视", menu = "无人机巡视", businessType = BusinessType.QUERY, details = "获取工程集合") public AjaxResult getProList() { return service.getProList(); } @@ -74,7 +75,6 @@ public class UavPatrolController extends BaseController { **/ @ApiOperation(value = "获取工程集合") @PostMapping("/getClass") - @Log(title = "无人机巡视", menu = "无人机巡视", businessType = BusinessType.QUERY, details = "获取工程集合") public TableDataInfo getClass(ClassData entity) { startPage(); return getDataTable(service.getClass(entity)); @@ -88,7 +88,7 @@ public class UavPatrolController extends BaseController { **/ @ApiOperation(value = "修改设备绑定工程") @PostMapping("/updateBand") - @Log(title = "无人机巡视", menu = "无人机巡视", businessType = BusinessType.UPDATE, details = "修改设备绑定工程", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "无人机巡视", model = "工程信息->无人机巡视", operaType = OperaType.UPDATE, details = "修改无人机绑定工程数据",logType = 1) public AjaxResult updateBand(UAVBandProEntity entity) { return service.updateBand(entity); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/VideoController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/VideoController.java index 29289b8..cdb5c70 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/VideoController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/VideoController.java @@ -7,7 +7,9 @@ import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.core.web.controller.BaseController; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.sercurityControl.proteam.domain.*; import com.sercurityControl.proteam.service.VideoService; import com.sercurityControl.proteam.service.impl.VideoRequest; @@ -63,7 +65,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "地级市查询树节点数据") @PostMapping("/getMenuListCity") - @Log(title = "无人机巡视", businessType = BusinessType.UPDATE, details = "地级市查询树节点数据") + @SysLog(title = "实时监控", model = "视频监控->实时监控", operaType = OperaType.QUERY, details = "查询实时监控数据",logType = 1) public AjaxResult getMenuListCity(String orgId, String keyWord) { return service.getMenuListCity(orgId, keyWord); } @@ -76,7 +78,6 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "省外球机树列表查询") @PostMapping("/getMenuListSWCity") - @Log(title = "无人机巡视", businessType = BusinessType.UPDATE, details = "地级市查询树节点数据") public AjaxResult getMenuListSWCity(String orgId, String keyWord) { return service.initTreeSwCity(orgId, keyWord); } @@ -87,7 +88,6 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "风险等级查询树节点数据") @PostMapping("/getMenuListRisk") - @Log(title = "无人机巡视", businessType = BusinessType.UPDATE, details = "getMenuListRisk") public AjaxResult getMenuListRisk(String orgId, String keyWord) { return service.getMenuListRisk(orgId, keyWord); } @@ -102,7 +102,6 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "固定球机查询树节点数据") @PostMapping("/getMenuListRegular") - @Log(title = "视频监控", businessType = BusinessType.UPDATE, details = "getMenuListRegular") public AjaxResult getMenuListRegular(String orgId, String keyWord) { try { List regularList = service.getMenuListRegular(orgId, keyWord); @@ -121,7 +120,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "风险等级查询树节点数据") @PostMapping("/getQueryRecord") - @Log(title = "历史记录", businessType = BusinessType.QUERY, details = "查询录像") + @SysLog(title = "历史记录", model = "视频监控->历史记录", operaType = OperaType.QUERY, details = "查询历史记录",logType = 1) public AjaxResult getQueryRecord(QueryRecordEntity entity) { if ("1".equals(entity.getType())) { return AjaxResult.success(request.getSesQueryRecord(entity)); @@ -138,6 +137,7 @@ public class VideoController extends BaseController { */ @PostMapping("set3DyunConfig") + @SysLog(title = "实时监控", model = "视频监控->实时监控", operaType = OperaType.UPDATE, details = "设置3D云台",logType = 1) public AjaxResult set3DyunConfig(String Sx, String Sy, String Ex, String Ey, String puid){ AjaxResult ar = new AjaxResult(); String msg="设置失败"; @@ -159,7 +159,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "风险等级查询树节点数据") @PostMapping("/getQueryImage") - @Log(title = "历史记录", businessType = BusinessType.QUERY, details = "查询历史图片") + @SysLog(title = "历史记录", model = "视频监控->历史记录", operaType = OperaType.QUERY, details = "查询历史图片",logType = 1) public AjaxResult getQueryImage(QueryImageEntity entity) { try { return AjaxResult.success(request.getQueryImageByDevice(entity)); @@ -177,7 +177,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "风险等级查询树节点数据") @PostMapping("/getQueryDescriptionInfo") - @Log(title = "历史记录", businessType = BusinessType.QUERY, details = "查询上下线数据") + @SysLog(title = "历史记录", model = "视频监控->历史记录", operaType = OperaType.QUERY, details = "查询上下线记录",logType = 1) public AjaxResult getQueryDescriptionInfo(QueryDescriptionInfoEntity entity) { try { return AjaxResult.success(request.getQueryDevStatusDescriptionInfo(entity)); @@ -299,7 +299,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "获取视频诊断信息") @PostMapping("/getVideoDiagnosis") - @Log(title = "视频诊断", menu = "频诊断->获取视频诊断信息", businessType = BusinessType.QUERY, details = "获取视频诊断信息") + @SysLog(title = "视频诊断通知", model = "消息通知->视频诊断通知", operaType = OperaType.QUERY, details = "查询视频诊断通知数据",logType = 1) public Map getVideoDiagnosis(VideoDiagnosis entity) { if (StringUtils.isBlank(entity.getCreateDate())) { entity.setCreateDate(DateTimeHelper.getNowDate()); @@ -334,7 +334,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "添加视频诊断数据") @PostMapping("/addVideoData") - @Log(title = "视频诊断", menu = "视频诊断->添加视频诊断数据", businessType = BusinessType.QUERY, details = "添加视频诊断数据") + @SysLog(title = "视频诊断通知", model = "消息通知->视频诊断通知", operaType = OperaType.INSERT, details = "添加视频诊断数据",logType = 1) public AjaxResult addVideoData(VideoDiagnosis entity) { return service.addVideoData(entity); } @@ -348,7 +348,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "删除视频诊断数据") @PostMapping("/delVideoData") - @Log(title = "视频诊断", menu = "视频诊断->删除视频诊断数据", businessType = BusinessType.QUERY, details = "删除视频诊断数据") + @SysLog(title = "视频诊断通知", model = "消息通知->视频诊断通知", operaType = OperaType.DELETE, details = "删除视频诊断数据",logType = 1) public AjaxResult delVideoData(VideoDiagnosis entity) { try { service.delVideoData(entity); @@ -361,7 +361,6 @@ public class VideoController extends BaseController { @ApiOperation(value = "根据id获取视频诊断数据详情") @PostMapping("/getVideoDataById") - @Log(title = "视频诊断", menu = "视频诊断->删除视频诊断数据", businessType = BusinessType.QUERY, details = "删除视频诊断数据") public AjaxResult getVideoDataById(VideoDiagnosis entity) { try { VideoDiagnosis videoDiagnosis = service.getVideoDataById(entity); @@ -382,7 +381,7 @@ public class VideoController extends BaseController { */ @ApiOperation(value = "更新视频诊断数据") @PostMapping("/updateVideoData") - @Log(title = "视频诊断", menu = "视频诊断->更新视频诊断数据", businessType = BusinessType.QUERY, details = "更新视频诊断数据") + @SysLog(title = "视频诊断通知", model = "消息通知->视频诊断通知", operaType = OperaType.UPDATE, details = "修改视频诊断数据",logType = 1) public AjaxResult updateVideoData(VideoDiagnosis entity) { try { service.updateVideoData(entity); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java index 4d839bb..b153380 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java @@ -6,7 +6,9 @@ import com.securityControl.common.core.utils.aes.Aes; import com.securityControl.common.core.utils.poi.ExcelUtil; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.sercurityControl.proteam.domain.ProData; import com.sercurityControl.proteam.domain.WeekRiskEntity; @@ -37,7 +39,7 @@ public class WeekRiskController { private WeekRiskService service; @PostMapping("/getWeekRiskList") - @Log(title = "周风险管理", menu = "设备管理->周风险管理", businessType = BusinessType.QUERY, details = "周风险详情列表", grade = OperationType.QUERY_BUSINESS) + @SysLog(title = "周风险明细", model = "工程信息->周风险明细", operaType = OperaType.QUERY, details = "查询周风险明细数据",logType = 1) public Map getWeekRiskList(WeekRiskEntity weekRiskEntity) { PageHelper.startPage(weekRiskEntity.getPage(), weekRiskEntity.getLimit()); List deviceList = service.getWeekRiskList(weekRiskEntity); @@ -69,7 +71,7 @@ public class WeekRiskController { * @return 集合 */ @GetMapping("/exportProData") - @Log(title = "周风险详情", menu = "工程信息->周风险详情", businessType = BusinessType.EXPORT, details = "周风险详情导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "周风险明细", model = "工程信息->周风险明细", operaType = OperaType.EXPORT, details = "导出周风险明细数据",logType = 1) public void exportProData(HttpServletResponse response, WeekRiskEntity weekRiskEntity) { List list = service.getWeekRiskList(weekRiskEntity); ExcelUtil util = new ExcelUtil(WeekRiskEntity.class); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BidTowerMainController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BidTowerMainController.java index dd11d7a..7ad2954 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BidTowerMainController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BidTowerMainController.java @@ -6,7 +6,9 @@ import com.github.pagehelper.PageInfo; import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.sercurityControl.proteam.dutyTask.domain.BidTowerVo; import com.sercurityControl.proteam.dutyTask.domain.TowerVo; @@ -103,6 +105,7 @@ public class BidTowerMainController extends BaseController { * @date 2023-08-04 16:43 */ @PostMapping("addBidTowerInfo") + @SysLog(title = "杆塔维护", model = "工程信息->杆塔维护", operaType = OperaType.INSERT, details = "新增杆塔数据",logType = 1) public AjaxResult addBidTowerInfo(BidTowerVo vo) { try { if (StringUtils.isBlank(vo.getId())) { @@ -142,7 +145,7 @@ public class BidTowerMainController extends BaseController { * @date 2024/1/16 10:11 */ @PostMapping(value = "getSingleTowerMainList") - @Log(title = "单项工程杆塔维护列表", menu = "单项工程杆塔维护列表", businessType = BusinessType.QUERY, details = "单项工程杆塔维护列表") + @SysLog(title = "杆塔维护", model = "工程信息->杆塔维护", operaType = OperaType.QUERY, details = "查询单项工程数据",logType = 1) public Map getSingleTowerMainList(BidTowerVo vo) { PageHelper.startPage(Integer.parseInt(vo.getPage()), Integer.parseInt(vo.getLimit())); Map map = new HashMap(6); @@ -165,7 +168,7 @@ public class BidTowerMainController extends BaseController { * @date 2024/1/16 13:34 */ @PostMapping(value = "getTowerListById") - @Log(title = "工程杆塔信息", menu = "工程杆塔信息", businessType = BusinessType.QUERY, details = "工程杆塔信息") + @SysLog(title = "杆塔维护", model = "工程信息->杆塔维护", operaType = OperaType.QUERY, details = "查询工程杆塔数据",logType = 1) public Map getTowerListById(BidTowerVo vo) { PageHelper.startPage(Integer.parseInt(vo.getPage()), Integer.parseInt(vo.getLimit())); Map map = new HashMap(6); @@ -189,6 +192,7 @@ public class BidTowerMainController extends BaseController { * @date 2024/1/16 14:18 */ @GetMapping("downLoadExcelModel2") + @SysLog(title = "杆塔维护", model = "工程信息->杆塔维护", operaType = OperaType.DOWNLOAD, details = "导入模板下载",logType = 1) public void downLoadExcelModel2(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; @@ -228,6 +232,7 @@ public class BidTowerMainController extends BaseController { * @date 2024/1/16 14:27 */ @PostMapping("delTowerData") + @SysLog(title = "杆塔维护", model = "工程信息->杆塔维护", operaType = OperaType.DELETE, details = "删除工程杆塔数据",logType = 1) public AjaxResult delTowerData(BidTowerVo vo) { return service.delTowerData(vo); } @@ -241,7 +246,7 @@ public class BidTowerMainController extends BaseController { * @date 2024/1/16 15:03 */ @PostMapping("/importExcel2") - @Log(title = "杆塔信息导入", menu = "杆塔信息导入", businessType = BusinessType.IMPORT, details = "杆塔信息导入", grade = OperationType.IMPORT_BUSINESS) + @SysLog(title = "杆塔维护", model = "工程信息->杆塔维护", operaType = OperaType.IMPORT, details = "导入工程杆塔数据",logType = 1) public void importExcel2(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ProInfoMgeController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ProInfoMgeController.java index 958890d..2e51209 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ProInfoMgeController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ProInfoMgeController.java @@ -11,7 +11,9 @@ import com.securityControl.common.core.utils.aes.Aes; import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.securityControl.common.security.utils.SecurityUtils; import com.sercurityControl.proteam.dutyTask.domain.ExportProData; @@ -124,7 +126,7 @@ public class ProInfoMgeController extends BaseController { } @PostMapping("/importExcel") - @Log(title = "工程数据导入", menu = "工程管理->工程数据导入", businessType = BusinessType.IMPORT, details = "工程数据导入", grade = OperationType.IMPORT_BUSINESS) + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.IMPORT, details = "导入工程数据",logType = 1) public void importExcel(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { try { List lstObj = (List) ProImportExcelHelper.readExcel(file, ProInfoEntity.class); @@ -216,7 +218,7 @@ public class ProInfoMgeController extends BaseController { */ @ApiOperation(value = "工程管理-工程信息") @PostMapping(value = "getProInfoList") - @Log(title = "工程信息", menu = "工程管理-工程信息", businessType = BusinessType.QUERY, details = "工程信息列表") + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.QUERY, details = "查询工程数据",logType = 1) public Map getProInfoList(ProInfoEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); if (StringUtils.isNotBlank(entity.getKgDate())) { @@ -258,6 +260,7 @@ public class ProInfoMgeController extends BaseController { * @date 2023-05-25 17:53 */ @PostMapping("editProInfoData") + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.UPDATE, details = "修改工程数据",logType = 1) public AjaxResult editProInfoData(ProInfoEntity entity) { try { if (StringUtils.isBlank(entity.getProStatus())) { @@ -273,6 +276,7 @@ public class ProInfoMgeController extends BaseController { } } @PostMapping("delPower") + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.DELETE, details = "删除工程数据",logType = 1) public AjaxResult delPower(ProInfoEntity entity) { try { int num= service.delPower(entity); @@ -295,6 +299,7 @@ public class ProInfoMgeController extends BaseController { * @date 2023-05-26 11:47 */ @PostMapping(value = "getProByUnit") + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.QUERY, details = "查询工程总览数据",logType = 1) public AjaxResult getProByUnit(ProInfoEntity entity) { Map map = null; try { @@ -336,6 +341,7 @@ public class ProInfoMgeController extends BaseController { * @date 2023-07-05 14:45 */ @PostMapping("addOrUpdatePowerProData") + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.INSERT, details = "更新输变电工程数据",logType = 1) public AjaxResult addOrUpdatePowerProData(ProInfoEntity entity) { try { service.addOrUpdatePowerProData(entity); @@ -375,6 +381,7 @@ public class ProInfoMgeController extends BaseController { * @date 2023-07-05 19:54 */ @PostMapping(value = "addOrUpdateProData") + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.INSERT, details = "新增单项工程数据",logType = 1) public AjaxResult addOrUpdateProData(ProInfoEntity entity) { try { service.addOrUpdateProData(entity); @@ -435,6 +442,7 @@ public class ProInfoMgeController extends BaseController { * @date 2023-07-20 11:02 */ @PostMapping(value = "exportProData") + @SysLog(title = "工程维护", model = "工程信息->工程维护", operaType = OperaType.EXPORT, details = "导出工程数据",logType = 1) public void exportProData(HttpServletRequest request, HttpServletResponse response, @RequestBody ProInfoEntity entity) { try { List list = new ArrayList<>(); @@ -500,7 +508,7 @@ public class ProInfoMgeController extends BaseController { */ @ApiOperation(value = "工程管理-工程信息") @PostMapping(value = "getProEditHistoryList") - @Log(title = "工程信息", menu = "工程管理-工程信息", businessType = BusinessType.QUERY, details = "工程修改历史记录") + @SysLog(title = "工程修改记录", model = "工程信息->工程维护->工程修改记录", operaType = OperaType.QUERY, details = "查询工程修改历史记录",logType = 1) public Map getProEditHistoryList(ProInfoEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16);