From 5209ed41c0917917d2a16e75726c00ecebb3512d Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 18 Dec 2024 18:00:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BD=93=E6=97=A5=E7=AB=99=E7=8F=AD?= =?UTF-8?q?=E4=BC=9A-=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proteam/controller/TeamController.java | 13 +++++++++++++ .../dutyTask/controller/TodayTaskController.java | 12 ++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TeamController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TeamController.java index ac1cb20..57bed4d 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TeamController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TeamController.java @@ -1,5 +1,6 @@ package com.sercurityControl.proteam.controller; +import com.securityControl.common.core.utils.SensitizedUtil; import com.securityControl.common.core.utils.aes.Aes; import com.securityControl.common.core.utils.poi.ExcelUtil; import com.securityControl.common.core.web.controller.BaseController; @@ -238,6 +239,9 @@ public class TeamController extends BaseController { @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "班组评价信息导出", grade = OperationType.EXPORT_BUSINESS) public void exportTeamEvaData(HttpServletResponse response, TeamEvaData teamEvaData) { List list = service.getTeamEvaList(teamEvaData); + for (TeamEvaData item : list) { + item.setPhone(SensitizedUtil.mobilePhone(item.getPhone())); + } ExcelUtil util = new ExcelUtil(TeamEvaData.class); util.exportExcel(response, list, "班组评价"); } @@ -252,6 +256,9 @@ public class TeamController extends BaseController { @Log(title = "班组明细", menu = "班组信息->班组黑名单", businessType = BusinessType.EXPORT, details = "班组拉黑信息导出", grade = OperationType.EXPORT_BUSINESS) public void exportTeamBlackData(HttpServletResponse response, TeamBlackData teamBlackData) { List list = service.getTeamBlackList(teamBlackData); + for (TeamBlackData item : list) { + item.setIdNumber(SensitizedUtil.idCardNum(item.getIdNumber(),6,4)); + } ExcelUtil util = new ExcelUtil(TeamBlackData.class); util.exportExcel(response, list, "班组拉黑"); } @@ -266,6 +273,9 @@ public class TeamController extends BaseController { @Log(title = "班组明细", menu = "班组信息->站班会记录", businessType = BusinessType.EXPORT, details = "站班会记录信息导出", grade = OperationType.EXPORT_BUSINESS) public void exportClassData(HttpServletResponse response, ClassData classData) { List list = service.getClassList(classData); + for (ClassData item : list) { + item.setWorkManagerPhone(SensitizedUtil.mobilePhone(item.getWorkManagerPhone())); + } ExcelUtil util = new ExcelUtil(ClassData.class); util.exportExcel(response, list, "站班会记录"); } @@ -281,6 +291,9 @@ public class TeamController extends BaseController { @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "班组人员信息导出", grade = OperationType.EXPORT_BUSINESS) public void exportTeamPeopleData(HttpServletResponse response, PeopleEntity entity) { List list = service.getTeamPeople(entity); + for (PeopleEntity item : list) { + item.setCard(SensitizedUtil.idCardNum(item.getCard(),6,4)); + } ExcelUtil util = new ExcelUtil(PeopleEntity.class); util.exportExcel(response, list, "班组人员信息"); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java index d861a01..7976dbc 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java @@ -82,7 +82,7 @@ public class TodayTaskController { */ @ApiOperation(value = "值班任务-今日任务表格数据") @PostMapping(value = "getTodayTaskList") - @Log(title = "今日任务", menu = "值班任务->今日任务", businessType = BusinessType.QUERY, details = "今日任务列表") + @SysLog(title = "当日站班会", model = "值班任务->当日站班会", operaType = OperaType.QUERY, details = "查询当日站班会",logType = 1) public Map getTodayTaskList(TodayTaskDto todayTaskDto) { if (StringUtils.isBlank(todayTaskDto.getWorkDay())) { todayTaskDto.setStartTime(DateTimeHelper.getNowDate()); @@ -125,7 +125,7 @@ public class TodayTaskController { * @date 2022-12-23 14:16 */ @GetMapping(value = "exportData") - @Log(title = "今日任务", menu = "值班任务->今日任务", businessType = BusinessType.EXPORT, details = "今日任务导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "当日站班会", model = "值班任务->当日站班会", operaType = OperaType.EXPORT, details = "导出当日站班会",logType = 1) public void exportData(HttpServletRequest request, HttpServletResponse response, TodayTaskDto todayTaskDto) { if (StringUtils.isBlank(todayTaskDto.getWorkDay())) { todayTaskDto.setStartTime(DateTimeHelper.getNowDate()); @@ -178,7 +178,6 @@ public class TodayTaskController { * 球机上线时长分页处理 */ @PostMapping("getBallTimeList") - @SysLog(title = "远程巡视", model= "值班任务->今日任务", operaType = OperaType.QUERY, details = "远程巡视详情查看") public Map getBallTimeList(DeviceUpDownVo deviceUpDownVo) { Map map = Maps.newHashMap(); try { @@ -219,6 +218,7 @@ public class TodayTaskController { * @return */ @PostMapping("getZbhDetail") + @SysLog(title = "远程巡视", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.EXPORT, details = "查询远程巡视",logType = 1) public String getClassMettingDetails(ClassMettingVo classMettingVo) { try { ClassMettingVo vo = service.getClassMettingDetails(classMettingVo); @@ -348,7 +348,7 @@ public class TodayTaskController { */ @PostMapping(value = "uploadExceptionReport", headers = "content-type=multipart/form-data") @ResponseBody - //@Log(title = "异常报备", businessType = BusinessType.INSERT, details = "新增异常报备", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "异常报备", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增异常报备",logType = 1) public AjaxResult uploadExceptionReport(HttpServletRequest request, @RequestParam("file[]") MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -405,7 +405,7 @@ public class TodayTaskController { */ @PostMapping(value = "uploadNoticeVio", headers = "content-type=multipart/form-data") @ResponseBody - //@Log(title = "违章下发", businessType = BusinessType.INSERT, details = "新增违章下发", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "违章下发", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增违章下发",logType = 1) public AjaxResult uploadNoticeVio(HttpServletRequest request, @RequestParam(value = "file[]",required = false) MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -546,7 +546,7 @@ public class TodayTaskController { * @date 2022-12-19 13:39 */ @PostMapping("updateImportTeam") - //@Log(title = "远程巡视", businessType = BusinessType.UPDATE, details = "修改重点关注班组", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "重点巡查", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增重点巡查",logType = 1) public AjaxResult updateImportTeam(String importTeam, String idNumber) { try { service.updateImportTeam(importTeam, idNumber); From 4843c354496cfb12b2c0e9e14e27fe2b06714cb6 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 18 Dec 2024 18:27:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proteam/controller/NewDutyController.java | 4 +- .../proteam/controller/StagingController.java | 3 ++ .../controller/DutyStatisticsController.java | 6 ++- .../controller/NewDailyReportController.java | 5 +- .../controller/SuperStatisticsController.java | 47 ++++++++++--------- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java index 572225e..775c31c 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java @@ -42,9 +42,7 @@ public class NewDutyController { * @return */ @PostMapping(value = "getPageList") - @SysLog(title = "综合展示", model = "综合展示->日计划", operaType = OperaType.EXPORT, details = "导出日计划数据信息") - - @Log(title = "今日任务", menu = "值班任务->值班任务", businessType = BusinessType.QUERY, details = "今日任务列表") + @SysLog(title = "值班员", model = "值班任务->值班员", operaType = OperaType.QUERY, details = "查询值班员",logType = 1) public Map getPageList(NewDutyVo vo) { PageHelper.startPage(vo.getPage(), vo.getLimit()); List deviceList = service.getPageList(vo); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java index b248c94..fee96c1 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java @@ -2,6 +2,8 @@ package com.sercurityControl.proteam.controller; import com.securityControl.common.core.web.domain.AjaxResult; +import com.securityControl.common.log.annotation.SysLog; +import com.securityControl.common.log.enums.OperaType; import com.sercurityControl.proteam.domain.dto.LoginDto; import com.sercurityControl.proteam.service.StagingService; import lombok.extern.slf4j.Slf4j; @@ -30,6 +32,7 @@ public class StagingController { * @return map */ @PostMapping("getWorkPlan") + @SysLog(title = "工作台", model = "值班任务->工作台", operaType = OperaType.QUERY, details = "查询工作台",logType = 1) public Map getWorkPlan(LoginDto loginDto) { return service.getWorkPlan(loginDto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java index bc5c013..6082a89 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java @@ -8,7 +8,9 @@ import com.github.pagehelper.PageInfo; import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.utils.aes.DateTimeHelper; 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.DutyStatisticsEntity; import com.sercurityControl.proteam.dutyTask.service.DutyStatisticsService; @@ -46,7 +48,7 @@ public class DutyStatisticsController { Logger logger = LoggerFactory.getLogger(TodayTaskController.class); @PostMapping(value = "getDutyStatisticsList") - @Log(title = "值班统计", menu = "值班任务->值班统计", businessType = BusinessType.QUERY, details = "值班统计列表") + @SysLog(title = "值班统计", model = "值班任务->值班统计", operaType = OperaType.QUERY, details = "查询值班统计",logType = 1) public Map getDutyStatisticsList(DutyStatisticsEntity entity) { if (StringUtils.isBlank(entity.getCreateTime())) { entity.setCreateTime(DateTimeHelper.getNowDate()); @@ -84,7 +86,7 @@ public class DutyStatisticsController { * @date 2022-12-21 16:58 */ @GetMapping("exportData") - @Log(title = "值班统计", menu = "值班任务->值班统计", businessType = BusinessType.EXPORT, details = "值班统计导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "值班统计", model = "值班任务->值班统计", operaType = OperaType.DOWNLOAD, details = "导出值班统计",logType = 1) public void exportData(HttpServletRequest request, HttpServletResponse response, DutyStatisticsEntity entity) { if (StringUtils.isBlank(entity.getCreateTime())) { entity.setCreateTime(DateTimeHelper.getNowDate()); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java index 9a0197a..13c1295 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java @@ -3,7 +3,9 @@ package com.sercurityControl.proteam.dutyTask.controller; 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.*; import com.sercurityControl.proteam.dutyTask.service.DayPaperService; @@ -44,7 +46,7 @@ public class NewDailyReportController { private DayPaperService dayPaperService; @GetMapping("downloadDaily") - @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.DOWNLOAD, details = "下载值班日报",logType = 1) public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) { download(request, response, currentDay, chineseDate); } @@ -56,6 +58,7 @@ public class NewDailyReportController { * @date 2024/10/26 15:48 */ @PostMapping("getDailyData") + @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.QUERY, details = "查询值班日报",logType = 1) public AjaxResult getDailyData(String currentDay) { Map map = null; try { diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java index fcb817f..4774f62 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java @@ -12,7 +12,9 @@ import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.core.utils.aes.SM4Utils; 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.securityControl.system.api.model.LoginUser; @@ -84,7 +86,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-19 16:33 */ @PostMapping(value = "getSuperStatisticsList") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章统计列表") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.QUERY, details = "查询违章统计",logType = 1) public Map getSuperStatisticsList(NoticeVioEntity noticeVioEntity) { if (StringUtils.isBlank(noticeVioEntity.getCreateTime())) { Calendar cal = Calendar.getInstance(); @@ -180,7 +182,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-19 17:39 */ @PostMapping(value = "getNoticeVoiById") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章详情查看") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.QUERY, details = "查询违章详情",logType = 1) public AjaxResult getNoticeVoiById(String params) { try { NoticeVioEntity noticeVioEntity = service.getNoticeVoiById(params); @@ -203,7 +205,7 @@ public class SuperStatisticsController extends BaseController { */ @PostMapping(value = "editUploadNoticeVio", headers = "content-type=multipart/form-data") @ResponseBody - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.UPDATE, details = "修改违章", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.UPDATE, details = "修改违章",logType = 1) public AjaxResult uploadNoticeVio(HttpServletRequest request, @RequestParam(value = "file[]", required = false) MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -266,7 +268,7 @@ public class SuperStatisticsController extends BaseController { */ @PostMapping("delNoticeVoiById") @ResponseBody - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.DELETE, details = "删除违章", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.DELETE, details = "删除违章",logType = 1) public AjaxResult delNoticeVoiById(String params, String type) { try { service.delNoticeVoiById(params, type); @@ -288,7 +290,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 14:49 */ @PostMapping(value = "getVoiTypeList") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章类别列表") + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.QUERY, details = "查询违章类别",logType = 1) public Map getVoiTypeList(VoiTypeEntity voiTypeEntity) { PageHelper.startPage(Integer.parseInt(voiTypeEntity.getPage()), Integer.parseInt(voiTypeEntity.getLimit())); Map map = new HashMap(16); @@ -320,7 +322,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:26 */ @PostMapping(value = "addOrUpdateVoiType") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "新增/修改违章类别", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.INSERT, details = "新增违章类别",logType = 1) public AjaxResult addOrUpdateVoiType(VoiTypeEntity voiTypeEntity) { try { int result = service.voiTypeIsExist(voiTypeEntity.getCode()); @@ -359,7 +361,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("getVoiTypeById") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章类别详情查看") + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.QUERY, details = "查询违章类别详情",logType = 1) public AjaxResult getVoiTypeById(String params) { try { VoiTypeEntity entity = service.getVoiTypeById(params); @@ -378,7 +380,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("delVoiTypeById") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.DELETE, details = "删除违章类别", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.DELETE, details = "删除违章类别",logType = 1) public AjaxResult delVoiTypeById(String params) { try { int result = service.isHasVoiInfo(params); @@ -403,7 +405,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 16:47 */ @PostMapping(value = "getVoiInfoList") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章依据列表") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.QUERY, details = "查询违章违章依据",logType = 1) public Map getVoiInfoList(VoiInfoEntity voiInfoEntity) { PageHelper.startPage(Integer.parseInt(voiInfoEntity.getPage()), Integer.parseInt(voiInfoEntity.getLimit())); Map map = new HashMap(16); @@ -435,7 +437,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:26 */ @PostMapping(value = "addOrUpdateVoiInfo") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.INSERT, details = "新增/修改违章依据") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.INSERT, details = "新增违章依据",logType = 1) public AjaxResult addOrUpdateVoiInfo(VoiInfoEntity voiInfoEntity) { try { int result = service.voiInfoIsExist(voiInfoEntity); @@ -484,7 +486,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("getVoiInfoById") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章依据详情查看") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.QUERY, details = "查询违章依据详情",logType = 1) public AjaxResult getVoiInfoById(String params) { try { VoiInfoEntity entity = service.getVoiInfoById(params); @@ -503,7 +505,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("delVoiInfoById") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.DELETE, details = "删除违章依据") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.DELETE, details = "删除违章依据",logType = 1) public AjaxResult delVoiInfoById(String params) { try { service.delVoiInfoById(params); @@ -523,7 +525,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-21 9:29 */ @GetMapping("downLoadExcelModel") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章依据导入模板下载", grade = OperationType.DOWNLOAD_BUSINESS) + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.DOWNLOAD, details = "违章依据导入模板下载",logType = 1) public void downLoadExcelModel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; @@ -565,7 +567,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-21 9:45 */ @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 { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); @@ -741,7 +743,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-21 16:58 */ @GetMapping("exportData") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.EXPORT, details = "违章统计导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.EXPORT, details = "导出违章统计",logType = 1) public void exportData(HttpServletRequest request, HttpServletResponse response, NoticeVioEntity noticeVioEntity) { if (StringUtils.isBlank(noticeVioEntity.getCreateTime())) { Calendar cal = Calendar.getInstance(); @@ -831,7 +833,7 @@ public class SuperStatisticsController extends BaseController { */ @PostMapping(value = "uploadNoticeVioRect", headers = "content-type=multipart/form-data") @ResponseBody - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.INSERT, details = "违章整改") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.UPDATE, details = "违章整改",logType = 1) public AjaxResult uploadNoticeVioRect(HttpServletRequest request, @RequestParam(value = "file[]") MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -917,7 +919,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-22 13:58 */ @PostMapping(value = "rectCheck") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.UPDATE, details = "违章审核") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.UPDATE, details = "违章审核",logType = 1) public AjaxResult rectCheck(NoticeVoiRectEntity entity) { try { service.rectCheck(entity); @@ -936,7 +938,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-30 10:33 */ @PostMapping("getNoticeSheet") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章通知单查看") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.QUERY, details = "查询违章通知单",logType = 1) public AjaxResult getNoticeSheet(NoticeVioEntity entity) { try { Map map = service.getNoticeSheet(entity); @@ -957,7 +959,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-30 14:06 */ @GetMapping("downLoadNoticeSheet") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.EXPORT, details = "通知单导出") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.DOWNLOAD, details = "下载违章通知单",logType = 1) public void downLoadNoticeSheet(HttpServletRequest request, HttpServletResponse response, NoticeVioEntity entity) { Map data = new HashMap<>(16); List> voiImgList = new ArrayList<>(); @@ -1099,7 +1101,7 @@ public class SuperStatisticsController extends BaseController { } @PostMapping(value = "getVoiRecordList") - @Log(title = "今日站班会", menu = "值班任务->今日站班会", businessType = BusinessType.QUERY, details = "违章记录列表") + @SysLog(title = "违章记录", model = "值班任务->违章统计->违章记录", operaType = OperaType.QUERY, details = "查询违章记录",logType = 1) public Map getVoiRecordList(NoticeVioEntity noticeVioEntity) { PageHelper.startPage(Integer.parseInt(noticeVioEntity.getPage()), Integer.parseInt(noticeVioEntity.getLimit())); Map map = new HashMap(16); @@ -1131,7 +1133,7 @@ public class SuperStatisticsController extends BaseController { * @date 2023-07-21 16:08 */ @PostMapping(value = "getProVoiRecordList") - @Log(title = "今日站班会", menu = "值班任务->今日站班会", businessType = BusinessType.QUERY, details = "累计违章记录列表") + @SysLog(title = "累计违章记录", model = "值班任务->违章统计->累计违章记录", operaType = OperaType.QUERY, details = "查询累计违章记录",logType = 1) public Map getProVoiRecordList(NoticeVioEntity noticeVioEntity) { if (StringUtils.isNotEmpty(noticeVioEntity.getCreateTime())) { String[] dateArr = noticeVioEntity.getCreateTime().split(" - "); @@ -1312,7 +1314,7 @@ public class SuperStatisticsController extends BaseController { @PostMapping(value = "getVoiCheckLists") - @Log(title = "违章审核记录列表", menu = "违章审核记录列表", businessType = BusinessType.QUERY, details = "违章审核记录列表") + @SysLog(title = "违章审核记录", model = "值班任务->违章统计->违章审核记录", operaType = OperaType.QUERY, details = "查询违章审核记录",logType = 1) public Map getVoiCheckLists(NoticeVioEntity vo) { PageHelper.startPage(Integer.parseInt(vo.getPage()), Integer.parseInt(vo.getLimit())); Map map = new HashMap(6); @@ -1483,6 +1485,7 @@ public class SuperStatisticsController extends BaseController { * @date 2024/12/3 11:09 */ @GetMapping(value = "exportExcel") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.EXPORT, details = "导出违章统计",logType = 1) public void exportExcel(HttpServletRequest request, HttpServletResponse response, NoticeVioEntity dto) { try { AjaxResult ajaxResult = service.getVioStatistics(dto); From f2d489b3ebf770ebb7b9ffa3dd1c8331e3405666 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 19 Dec 2024 09:49:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysProblemController.java | 9 ++++++++ .../controller/AbnormalRepController.java | 4 +++- .../controller/BallStatusStatisticWeb.java | 14 ++++++----- .../controller/DutyMgeController.java | 13 +++++++++-- .../controller/SuperStatisticsController.java | 2 +- .../controller/TodayTaskController.java | 6 ++--- .../controller/VoiPhotoLibraryController.java | 6 +++-- .../controller/WorkPermitController.java | 23 ++++++++++--------- 8 files changed, 51 insertions(+), 26 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java index ddd8205..c528d52 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java @@ -5,7 +5,9 @@ import com.github.pagehelper.PageInfo; import com.securityControl.common.core.utils.poi.ExcelUtil; 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.TicketData; import com.sercurityControl.proteam.domain.vo.DeviceVo; @@ -45,6 +47,7 @@ public class SysProblemController { * @return 集合 */ @PostMapping("/getProblemPage") + @SysLog(title = "问题反馈", model = "值班任务->问题反馈", operaType = OperaType.QUERY, details = "查询问题反馈数据",logType = 1) public Map getProblemPage(SysProblemVo problemVo) { PageHelper.startPage(problemVo.getPage(), problemVo.getLimit()); List deviceList = service.getProblemPage(problemVo); @@ -60,6 +63,7 @@ public class SysProblemController { } @PostMapping("/getApplicationPage") + @SysLog(title = "报岗管理", model = "值班任务->报岗管理", operaType = OperaType.QUERY, details = "查询报岗数据",logType = 1) public Map getApplicationPage(JobApplication problemVo) { PageHelper.startPage(problemVo.getPage(), problemVo.getLimit()); List deviceList = service.getApplicationPage(problemVo); @@ -80,6 +84,7 @@ public class SysProblemController { * @return 集合 */ @PostMapping("/addProblem") + @SysLog(title = "问题反馈", model = "值班任务->问题反馈", operaType = OperaType.INSERT, details = "新增问题反馈",logType = 1) public ReturnCodeEntity addProblem(SysProblemVo problemVo) { return service.addProblem(problemVo); } @@ -91,6 +96,7 @@ public class SysProblemController { * @return 集合 */ @PostMapping("/updateProblem") + @SysLog(title = "问题反馈", model = "值班任务->问题反馈", operaType = OperaType.UPDATE, details = "修改问题反馈",logType = 1) public ReturnCodeEntity updateProblem(SysProblemVo problemVo) { return service.updateProblem(problemVo); } @@ -102,6 +108,7 @@ public class SysProblemController { * @return 集合 */ @PostMapping("/updateProblemHf") + @SysLog(title = "问题反馈", model = "值班任务->问题反馈", operaType = OperaType.UPDATE, details = "回复问题反馈",logType = 1) public ReturnCodeEntity updateProblemHf(SysProblemVo problemVo) { return service.updateProblemHf(problemVo); } @@ -113,6 +120,7 @@ public class SysProblemController { * @return 集合 */ @PostMapping("/delete") + @SysLog(title = "问题反馈", model = "值班任务->问题反馈", operaType = OperaType.DELETE, details = "删除问题反馈",logType = 1) public ReturnCodeEntity delete(SysProblemVo problemVo) { return service.delete(problemVo); } @@ -124,6 +132,7 @@ public class SysProblemController { } @GetMapping("exportData") + @SysLog(title = "报岗管理", model = "值班任务->报岗管理", operaType = OperaType.EXPORT, details = "导出报岗数据",logType = 1) public void exportDevice(HttpServletResponse response, JobApplication jobApplication) { List deviceList = service.getApplicationPage(jobApplication); ExcelUtil util = new ExcelUtil(JobApplication.class); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AbnormalRepController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AbnormalRepController.java index 5604a88..4a58e28 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AbnormalRepController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AbnormalRepController.java @@ -7,7 +7,9 @@ import com.securityControl.common.core.utils.StringUtils; 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.sercurityControl.proteam.dutyTask.domain.AbnormalRepDto; import com.sercurityControl.proteam.dutyTask.domain.AbnormalRepVo; import com.sercurityControl.proteam.dutyTask.service.AbnormalRepService; @@ -50,7 +52,7 @@ public class AbnormalRepController { * @date 2023-06-26 11:04 */ @PostMapping(value = "getAbnormalRepList") - @Log(title = "异常上报统计", menu = "异常上报统计->异常上报统计列表", businessType = BusinessType.QUERY, details = "异常上报统计列表") + @SysLog(title = "异常上报统计", model = "值班任务->异常上报统计", operaType = OperaType.QUERY, details = "查询异常上报",logType = 1) public Map getAbnormalRepList(AbnormalRepDto dto) { if (StringUtils.isBlank(dto.getDate())) { dto.setStartTime(DateTimeHelper.getNowDate()); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java index d748bc6..7c7b4b8 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java @@ -7,7 +7,9 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.securityControl.common.core.utils.SensitizedUtil; 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.BallOnlineDetailEntity; import com.sercurityControl.proteam.dutyTask.domain.BallOnlineStatisticEntity; @@ -52,7 +54,7 @@ public class BallStatusStatisticWeb { */ @ApiOperation(value = "值班任务-球机运行状态列表-球机开机情况统计") @PostMapping(value = "getBallKjList") - @Log(title = "球机运行状态", menu = "值班任务->球机运行状态", businessType = BusinessType.QUERY, details = "球机运行状态-球机开机情况统计") + @SysLog(title = "球机在线率统计", model = "值班任务->球机在线率统计", operaType = OperaType.QUERY, details = "查询球机在线率",logType = 1) public Map getBallKjList(BallStatusStatisticEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); @@ -85,7 +87,7 @@ public class BallStatusStatisticWeb { */ @ApiOperation(value = "值班任务-球机运行状态列表-球机未开机详情") @PostMapping(value = "getBallOffLineList") - @Log(title = "球机未开机详情", menu = "值班任务->球机未开机详情", businessType = BusinessType.QUERY, details = "球机运行状态-球机未开机详情") + @SysLog(title = "球机未开机详情", model = "值班任务->球机在线率统计->球机未开机详情", operaType = OperaType.QUERY, details = "查询球机未开机详情",logType = 1) public Map getBallOffLineList(BallStatusDetailEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); @@ -118,7 +120,7 @@ public class BallStatusStatisticWeb { */ @ApiOperation(value = "值班任务-球机运行状态列表-球机在线时长情况统计") @PostMapping(value = "getBallHgList") - @Log(title = "球机在线时长情况统计", menu = "值班任务->球机在线时长情况统计", businessType = BusinessType.QUERY, details = "球机运行状态-球机在线时长情况统计") + @SysLog(title = "球机在线率统计", model = "值班任务->球机在线率统计", operaType = OperaType.QUERY, details = "查询球机在线率",logType = 1) public Map getBallHgList(BallOnlineStatisticEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); @@ -144,7 +146,7 @@ public class BallStatusStatisticWeb { @ApiOperation(value = "值班任务-球机运行状态列表-球机在线时长不合格详情") @PostMapping(value = "getBallBhgDetailList") - @Log(title = "球机在线时长不合格详情", menu = "值班任务->球机在线时长不合格详情", businessType = BusinessType.QUERY, details = "球机运行状态-球机在线时长不合格详情") + @SysLog(title = "球机在线时长不合格详情", model = "值班任务->球机在线率统计->球机在线时长不合格详情", operaType = OperaType.QUERY, details = "查询球机在线时长不合格详情",logType = 1) public Map getBallBhgDetailList(BallOnlineDetailEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); @@ -169,7 +171,7 @@ public class BallStatusStatisticWeb { } @GetMapping(value = "exportData") - @Log(title = "球机运行情况导出", menu = "值班任务->球机运行情况导出", businessType = BusinessType.EXPORT, details = "球机运行情况导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "球机在线率统计", model = "值班任务->球机在线率统计", operaType = OperaType.EXPORT, details = "导出球机在线率",logType = 1) public void exportData(HttpServletRequest request, HttpServletResponse response, BallStatusDetailEntity entity, BallOnlineDetailEntity o) { String titleName = "球机未开机详情"; if (Objects.equals("2", entity.getType())) { @@ -209,7 +211,7 @@ public class BallStatusStatisticWeb { } @GetMapping(value = "exportData2") - @Log(title = "球机运行情况导出", menu = "值班任务->球机运行情况导出", businessType = BusinessType.EXPORT, details = "球机运行情况导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "球机在线率统计", model = "值班任务->球机在线率统计", operaType = OperaType.EXPORT, details = "导出球机在线率",logType = 1) public void exportData2(HttpServletRequest request, HttpServletResponse response, BallStatusStatisticEntity entity, BallOnlineStatisticEntity o) { String titleName = "当日球机开机情况统计"; if (Objects.equals("2", entity.getType())) { diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyMgeController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyMgeController.java index 5cd1b82..12dd2e7 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyMgeController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyMgeController.java @@ -9,7 +9,9 @@ import com.securityControl.common.core.constant.Constants; 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.sercurityControl.proteam.dutyTask.domain.*; import com.sercurityControl.proteam.dutyTask.service.DutyMgeService; import com.sercurityControl.proteam.util.DateTimeHelper; @@ -52,7 +54,7 @@ public class DutyMgeController { * @date 2023-07-25 9:26 */ @PostMapping(value = "getDutyPersonList") - @Log(title = "值班人员管理", menu = "值班人员管理->值班人员列表", businessType = BusinessType.QUERY, details = "值班人员列表") + @SysLog(title = "值班人员管理", model = "值班任务->排班管理->值班人员管理", operaType = OperaType.QUERY, details = "查询值班人员",logType = 1) public Map getDutyPersonList(DutyPersonEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); @@ -107,6 +109,7 @@ public class DutyMgeController { * @date 2023-07-25 10:16 */ @PostMapping("addOrUpdateData") + @SysLog(title = "值班人员管理", model = "值班任务->排班管理->值班人员管理", operaType = OperaType.UPDATE, details = "修改值班人员",logType = 1) public AjaxResult addOrUpdateData(DutyPersonEntity entity) { try { service.addOrUpdateData(entity); @@ -129,6 +132,7 @@ public class DutyMgeController { * @date 2023-07-25 10:51 */ @PostMapping("delData") + @SysLog(title = "值班人员管理", model = "值班任务->排班管理->值班人员管理", operaType = OperaType.DELETE, details = "删除值班人员",logType = 1) public AjaxResult delData(DutyPersonEntity entity) { try { service.delData(entity); @@ -184,6 +188,7 @@ public class DutyMgeController { * @date 2023-07-27 15:18 */ @PostMapping("addSchedulingPersonData") + @SysLog(title = "排班管理", model = "值班任务->排班管理", operaType = OperaType.INSERT, details = "新增排班",logType = 1) public AjaxResult addSchedulingPersonData(String params) { try { JSONObject jsonObject = JSONObject.parseObject(params); @@ -214,6 +219,7 @@ public class DutyMgeController { * @date 2023-08-02 10:05 */ @PostMapping("emptyScheduling") + @SysLog(title = "排班管理", model = "值班任务->排班管理", operaType = OperaType.DELETE, details = "清空排班数据",logType = 1) public AjaxResult emptyScheduling(String date) { try { service.emptyScheduling(date); @@ -273,6 +279,7 @@ public class DutyMgeController { * @date 2023-07-27 15:35 */ @PostMapping(value = "getSchedulingPersonData") + @SysLog(title = "排班管理", model = "值班任务->排班管理", operaType = OperaType.QUERY, details = "查询排班人员",logType = 1) public AjaxResult getSchedulingPersonData(SchedulingPersonVo vo) { Map map = new HashMap<>(16); try { @@ -293,6 +300,7 @@ public class DutyMgeController { * @date 2023-07-28 10:03 */ @GetMapping(value = "downLoadSchedulingWord") + @SysLog(title = "排班管理", model = "值班任务->排班管理", operaType = OperaType.DOWNLOAD, details = "下载排班数据",logType = 1) public void downLoadSchedulingWord(HttpServletRequest request, HttpServletResponse response, SchedulingPersonVo vo) { Map data = new HashMap<>(16); try { @@ -418,7 +426,7 @@ public class DutyMgeController { * @date 2023-07-28 15:44 */ @PostMapping(value = "getUserBandingList") - @Log(title = "用户绑定值班员表", menu = "排班管理->用户绑定值班员表", businessType = BusinessType.QUERY, details = "用户绑定值班员列表") + @SysLog(title = "用户绑定值班员", model = "值班任务->用户绑定值班员", operaType = OperaType.QUERY, details = "查询用户绑定值班员",logType = 1) public Map getUserBandingList(UserBandingVo vo) { PageHelper.startPage(Integer.parseInt(vo.getPage()), Integer.parseInt(vo.getLimit())); Map map = new HashMap(16); @@ -450,6 +458,7 @@ public class DutyMgeController { * @date 2023-07-28 15:49 */ @PostMapping("removeUserBanding") + @SysLog(title = "用户绑定值班员", model = "值班任务->排班管理->用户绑定值班员", operaType = OperaType.DELETE, details = "删除用户绑定值班员",logType = 1) public AjaxResult removeUserBanding(UserBandingVo vo) { try { service.removeUserBanding(vo); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java index 4774f62..46e8233 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java @@ -1314,7 +1314,7 @@ public class SuperStatisticsController extends BaseController { @PostMapping(value = "getVoiCheckLists") - @SysLog(title = "违章审核记录", model = "值班任务->违章统计->违章审核记录", operaType = OperaType.QUERY, details = "查询违章审核记录",logType = 1) + @SysLog(title = "违章审核记录", model = "值班任务->违章审核记录", operaType = OperaType.QUERY, details = "查询违章审核记录",logType = 1) public Map getVoiCheckLists(NoticeVioEntity vo) { PageHelper.startPage(Integer.parseInt(vo.getPage()), Integer.parseInt(vo.getLimit())); Map map = new HashMap(6); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java index 7976dbc..283e49e 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java @@ -348,7 +348,7 @@ public class TodayTaskController { */ @PostMapping(value = "uploadExceptionReport", headers = "content-type=multipart/form-data") @ResponseBody - @SysLog(title = "异常报备", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增异常报备",logType = 1) + @SysLog(title = "远程巡视", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增异常报备",logType = 1) public AjaxResult uploadExceptionReport(HttpServletRequest request, @RequestParam("file[]") MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -405,7 +405,7 @@ public class TodayTaskController { */ @PostMapping(value = "uploadNoticeVio", headers = "content-type=multipart/form-data") @ResponseBody - @SysLog(title = "违章下发", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增违章下发",logType = 1) + @SysLog(title = "远程巡视", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增违章下发",logType = 1) public AjaxResult uploadNoticeVio(HttpServletRequest request, @RequestParam(value = "file[]",required = false) MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -546,7 +546,7 @@ public class TodayTaskController { * @date 2022-12-19 13:39 */ @PostMapping("updateImportTeam") - @SysLog(title = "重点巡查", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增重点巡查",logType = 1) + @SysLog(title = "远程巡视", model = "值班任务->当日站班会->远程巡视", operaType = OperaType.INSERT, details = "新增重点巡查",logType = 1) public AjaxResult updateImportTeam(String importTeam, String idNumber) { try { service.updateImportTeam(importTeam, idNumber); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/VoiPhotoLibraryController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/VoiPhotoLibraryController.java index 2ca9ec3..6d0af87 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/VoiPhotoLibraryController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/VoiPhotoLibraryController.java @@ -7,7 +7,9 @@ import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.core.utils.aes.StringHelper; 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.security.utils.SecurityUtils; import com.sercurityControl.proteam.domain.ty.MqImageVo; import com.sercurityControl.proteam.domain.vo.DeviceVo; @@ -48,7 +50,7 @@ public class VoiPhotoLibraryController { * @date 2022-12-26 14:10 */ @PostMapping(value = "getVoiPhotoLibraryList") - @Log(title = "违章库照片", menu = "违章照片库", businessType = BusinessType.QUERY, details = "违章库照片列表") + @SysLog(title = "违章库照片", model = "值班任务->违章库照片", operaType = OperaType.QUERY, details = "查询违章库照片",logType = 1) public Map getVoiPhotoLibraryList(VoiWarnEntity entity) { if (StringHelper.isEmpty(entity.getCreateTime())){ entity.setStartTime(DateTimeHelper.getNowDay()); @@ -88,7 +90,7 @@ public class VoiPhotoLibraryController { * @date 2022-12-26 18:22 */ @PostMapping(value = "confirmVoiImg") - @Log(title = "违章库照片", menu = "违章照片库", businessType = BusinessType.QUERY, details = "违章照片确认") + @SysLog(title = "违章库照片", model = "值班任务->违章库照片", operaType = OperaType.UPDATE, details = "确认违章照片",logType = 1) public AjaxResult confirmVoiImg(VoiWarnEntity entity) { String code="200"; try { diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/WorkPermitController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/WorkPermitController.java index b9e584a..b7d8f6e 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/WorkPermitController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/WorkPermitController.java @@ -7,7 +7,9 @@ import com.securityControl.common.core.utils.StringUtils; 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.*; @@ -64,6 +66,7 @@ public class WorkPermitController extends BaseController { * @date 2023-05-11 10:37 */ @PostMapping(value = "getWorkPermitAndXhList") + @SysLog(title = "作业许可及销号", model = "值班任务->作业许可及销号", operaType = OperaType.QUERY, details = "查询作业许可及销号",logType = 1) public AjaxResult getWorkPermitAndXhList(WorkPermitAndXhEntity entity) { try { List list = new ArrayList<>(); @@ -165,7 +168,7 @@ public class WorkPermitController extends BaseController { * @date 2023-05-08 15:19 */ @PostMapping(value = "getBackboneScoreList") - @Log(title = "作业许可及销号", menu = "作业许可及销号->骨干成绩", businessType = BusinessType.QUERY, details = "骨干成绩列表") + @SysLog(title = "骨干成绩", model = "值班任务->作业许可及销号->骨干成绩", operaType = OperaType.QUERY, details = "查询骨干成绩",logType = 1) public Map getBackboneScoreList(BackboneScoreEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); @@ -198,7 +201,7 @@ public class WorkPermitController extends BaseController { * @date 2023-05-08 16:22 */ @GetMapping("downLoadExcelModel") - @Log(title = "作业许可及销号", menu = "作业许可及销号->骨干成绩", businessType = BusinessType.QUERY, details = "骨干成绩导入模板下载", grade = OperationType.DOWNLOAD_BUSINESS) + @SysLog(title = "骨干成绩", model = "值班任务->作业许可及销号->骨干成绩", operaType = OperaType.DOWNLOAD, details = "下载骨干成绩模板",logType = 1) public void downLoadExcelModel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; @@ -240,7 +243,7 @@ public class WorkPermitController extends BaseController { * @date 2023-05-08 16:33 */ @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) ImportExcelHelper.readExcel(file, BackboneScoreEntity.class); @@ -324,7 +327,7 @@ public class WorkPermitController extends BaseController { * @date 2023-05-08 17:49 */ @PostMapping(value = "editPeopleStatus") - @Log(title = "编辑状态", menu = "作业许可及销号->骨干成绩", businessType = BusinessType.UPDATE, details = "编辑状态") + @SysLog(title = "骨干成绩", model = "值班任务->作业许可及销号->骨干成绩", operaType = OperaType.UPDATE, details = "编辑骨干人员",logType = 1) public AjaxResult editPeopleStatus(BackboneScoreEntity entity) { try { entity.setUpdateTime(DateTimeHelper.getNowTime()); @@ -344,7 +347,7 @@ public class WorkPermitController extends BaseController { * @date 2023-05-09 9:44 */ @PostMapping(value = "delPeople") - @Log(title = "删除骨干人员", menu = "作业许可及销号->骨干成绩", businessType = BusinessType.UPDATE, details = "删除骨干人员") + @SysLog(title = "骨干成绩", model = "值班任务->作业许可及销号->骨干成绩", operaType = OperaType.DELETE, details = "删除骨干人员",logType = 1) public AjaxResult delPeople(String idNumbers) { try { if (StringUtils.isNotBlank(idNumbers)) { @@ -360,7 +363,7 @@ public class WorkPermitController extends BaseController { } @PostMapping("addOrEditPeople") - @Log(title = "新增/修改骨干人员", menu = "作业许可及销号->骨干成绩", businessType = BusinessType.UPDATE, details = "新增/修改骨干人员") + @SysLog(title = "骨干成绩", model = "值班任务->作业许可及销号->骨干成绩", operaType = OperaType.UPDATE, details = "修改骨干人员",logType = 1) public AjaxResult addOrEditPeople(BackboneScoreEntity entity) { String regex = "^[1-9][0-9]{5}(19|20)[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|31)|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{3}([0-9]|x|X)$"; Pattern p = Pattern.compile(regex); @@ -410,7 +413,6 @@ public class WorkPermitController extends BaseController { * @date 2023-05-09 10:47 */ @PostMapping("getPeopleById") - @Log(title = "骨干成绩详情查看", menu = "作业许可及销号->骨干成绩", businessType = BusinessType.QUERY, details = "骨干成绩详情查看") public AjaxResult getPeopleById(String idNumber) { try { BackboneScoreEntity entity = service.getPeopleById(idNumber); @@ -429,7 +431,7 @@ public class WorkPermitController extends BaseController { * @date 2023-05-10 16:04 */ @PostMapping(value = "updateTicketEssenCondition") - @Log(title = "更新作业许可及销号", menu = "作业许可及销号", businessType = BusinessType.UPDATE, details = "更新作业许可及销号") + @SysLog(title = "作业许可及销号", model = "值班任务->作业许可及销号", operaType = OperaType.UPDATE, details = "更新作业许可及销号",logType = 1) public AjaxResult updateTicketEssenCondition(TicketEssenCondition o) { try { if (Objects.equals("1", o.getType())) { @@ -458,7 +460,6 @@ public class WorkPermitController extends BaseController { * @date 2023-05-10 16:15 */ @PostMapping(value = "queryTicketEssenCondition") - @Log(title = "作业许可及销号必备条件详情", menu = "作业许可及销号", businessType = BusinessType.QUERY, details = "作业许可及销号必备条件详情") public AjaxResult queryTicketEssenCondition(TicketEssenCondition o) { try { TicketEssenCondition entity = service.queryTicketEssenCondition(o); @@ -504,7 +505,7 @@ public class WorkPermitController extends BaseController { * @date 2023-06-20 16:22 */ @PostMapping(value = "getTicketList") - @Log(title = "作业票", menu = "作业票->作业票列表", businessType = BusinessType.QUERY, details = "作业票列表") + @SysLog(title = "作业票管理", model = "值班任务->作业票管理", operaType = OperaType.QUERY, details = "查询作业票",logType = 1) public Map getTicketList(TicketDto dto) { PageHelper.startPage(Integer.parseInt(dto.getPage()), Integer.parseInt(dto.getLimit())); Map map = new HashMap(16); @@ -548,7 +549,7 @@ public class WorkPermitController extends BaseController { } @PostMapping(value = "getTicketEssenConditionList") - @Log(title = "作业许可及销号-许可及销号作业票列表", menu = "作业许可及销号->许可及销号作业票列表", businessType = BusinessType.QUERY, details = "许可及销号作业票列表") + @SysLog(title = "作业许可及销号", model = "值班任务->作业许可及销号->作业许可及销号", operaType = OperaType.QUERY, details = "查询作业许可及销号",logType = 1) public Map getTicketEssenConditionList(TicketEssenConVo entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(6); From f86a77f5643e9131427d49e35bc996cf27254c33 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 19 Dec 2024 10:38:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proteam/controller/ManageController.java | 15 +++++++----- .../TRiskPressDropRateController.java | 15 ++++++------ .../controller/UavPatrolController.java | 10 ++++---- .../proteam/controller/VideoController.java | 23 +++++++++---------- .../controller/WeekRiskController.java | 6 +++-- .../controller/BidTowerMainController.java | 11 ++++++--- .../controller/ProInfoMgeController.java | 14 ++++++++--- 7 files changed, 55 insertions(+), 39 deletions(-) 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);