From 6f68e2c4a966aae7c05a2fe6934d1550ade59c41 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Thu, 19 Dec 2024 10:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceLedgerController.java | 7 +++-- .../controller/DeviceMachineController.java | 20 +++++++------ .../controller/DeviceTypeController.java | 11 ++++---- .../controller/DutyChildController.java | 6 ++++ .../proteam/controller/ManageController.java | 15 ++++++---- .../proteam/controller/NewDutyController.java | 6 ++-- .../controller/PreservationController.java | 21 ++++++++------ .../proteam/controller/ProDataController.java | 15 +++++----- .../proteam/controller/StagingController.java | 10 +++++++ .../controller/SupervisorController.java | 9 ++++++ .../controller/SysProblemController.java | 10 +++++++ .../TRiskPressDropRateController.java | 16 ++++++----- .../proteam/controller/TeamController.java | 28 ++++++++++--------- .../controller/UavPatrolController.java | 12 ++++---- .../controller/WeekRiskController.java | 6 ++-- 15 files changed, 123 insertions(+), 69 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java index aa3a967..8825721 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java @@ -7,7 +7,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.vo.DeviceLedGer; import com.sercurityControl.proteam.domain.vo.DeviceVo; @@ -33,7 +35,7 @@ public class DeviceLedgerController extends BaseController { private DeviceLedgerService service; @PostMapping("/getDeviceLedgerList") - @Log(title = "设备流转台帐", menu = "设备管理->设备流转台帐", businessType = BusinessType.QUERY, details = "设备流转台帐", grade = OperationType.QUERY_BUSINESS) + @SysLog(title = "设备流转台帐", model = "设备管理->设备流转台帐", operaType = OperaType.QUERY, details = "设备流转台帐列表查询") public Map getDeviceLedgerList(DeviceLedGer deviceLedGer) { PageHelper.startPage(deviceLedGer.getPage(), deviceLedGer.getLimit()); List deviceList = service.getDeviceLedgerList(deviceLedGer); @@ -49,7 +51,7 @@ public class DeviceLedgerController extends BaseController { } @GetMapping("/exportDeviceLedger") - @Log(title = "设备流转台帐", menu = "设备管理->设备流转台帐", businessType = BusinessType.EXPORT, details = "设备流转台帐导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备流转台帐", model = "设备管理->设备流转台帐", operaType = OperaType.EXPORT, details = "设备流转台帐导出") public void exportDeviceLedger(HttpServletResponse response, DeviceLedGer deviceLedGer) { List LedgerList = service.getDeviceLedgerList(deviceLedGer); for (DeviceLedGer entity : LedgerList) { @@ -60,7 +62,6 @@ public class DeviceLedgerController extends BaseController { } @PostMapping("/getDeviceNum") - @Log(title = "设备流转台帐", menu = "设备管理->设备流转台帐", businessType = BusinessType.QUERY, details = "设备流转台帐设备信息查看", grade = OperationType.QUERY_BUSINESS) public AjaxResult getDeviceNum(DeviceLedGer deviceLedGer) { return service.getDeviceNum(deviceLedGer); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceMachineController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceMachineController.java index 5321362..5ab4137 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceMachineController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceMachineController.java @@ -12,7 +12,9 @@ import com.securityControl.common.core.utils.aes.StringHelper; 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.securityControl.common.log.enums.OperationType; import com.securityControl.common.redis.service.RedisService; import com.sercurityControl.proteam.domain.DeviceMachineEntity; @@ -57,7 +59,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "获取设备分配数据") @PostMapping("/getDeviceMachineList") - @Log(title = "获取设备分配数据", menu = "获取设备分配数据", businessType = BusinessType.QUERY, details = "获取设备分配数据") + @SysLog(title = "设备流转台帐", model = "设备管理->获取设备分配数据", operaType = OperaType.QUERY, details = "获取设备分配数据") public Map getDeviceMachineList(DeviceMachineEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(6); @@ -88,7 +90,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "获取分组节点") @PostMapping("getGroupNode") - @Log(title = "获取分组节点", menu = "获取分组节点", businessType = BusinessType.EXPORT, details = "获取分组节点", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->获取分组节点", operaType = OperaType.QUERY, details = "获取分组节点") public AjaxResult getGroupNode(String type) { try { String groupNode = (String) redisUtil.get("dev:groupNode"); @@ -138,7 +140,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "查询设备") @PostMapping("getPu") - @Log(title = "查询设备", menu = "查询设备", businessType = BusinessType.EXPORT, details = "查询设备", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->查询设备", operaType = OperaType.QUERY, details = "查询设备") public AjaxResult getPu(String puId, String all) { try { String pu = QxWebUtil.getPu(puId); @@ -165,7 +167,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "分组节点添加设备") @PostMapping("getPuSet") - @Log(title = "分组节点添加设备", menu = "分组节点添加设备", businessType = BusinessType.EXPORT, details = "分组节点添加设备", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.INSERT, details = "分组节点添加设备") public AjaxResult getPuSet(String puIds, String node, String oldNode) { try { List nodeList = JSON.parseArray(node, NodeVo.class); @@ -211,7 +213,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "分组节点添加设备") @PostMapping("refreshRedisUtil") - @Log(title = "分组节点添加设备", menu = "分组节点添加设备", businessType = BusinessType.EXPORT, details = "分组节点添加设备", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.QUERY, details = "刷新设备分配") public AjaxResult refreshRedisUtil() { try { String groupNode = QxWebUtil.getGroupNode(); @@ -232,7 +234,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "节点添加") @PostMapping("nodeAdd") - @Log(title = "节点添加", menu = "节点添加", businessType = BusinessType.EXPORT, details = "节点添加", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.INSERT, details = "节点添加") public AjaxResult nodeAdd(NodeEntity entity) { try { if (entity.getContext().length() > 255) { @@ -268,7 +270,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "节点修改") @PostMapping("nodeSet") - @Log(title = "节点修改", menu = "节点修改", businessType = BusinessType.EXPORT, details = "节点修改", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.UPDATE, details = "修改节点数据") public AjaxResult nodeSet(NodeEntity entity) { try { if (entity.getContext().length() > 255) { @@ -305,7 +307,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "节点删除") @PostMapping("nodeRemove") - @Log(title = "节点删除", menu = "节点删除", businessType = BusinessType.EXPORT, details = "节点删除", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.DELETE, details = "删除数据节点") public AjaxResult nodeRemove(NodeEntity entity) { try { String nodeRemove = QxWebUtil.nodeRemove(entity.getNodeId()); @@ -336,7 +338,7 @@ public class DeviceMachineController extends BaseController { */ @ApiOperation(value = "获取分组节点") @PostMapping("groupNode") - @Log(title = "获取分组节点", menu = "获取分组节点", businessType = BusinessType.EXPORT, details = "获取分组节点", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.QUERY, details = "获取分组节点") public AjaxResult groupNode(String type) { try { String groupNode = QxWebUtil.getGroupNode(); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceTypeController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceTypeController.java index bf3fed1..645a3c0 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceTypeController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceTypeController.java @@ -8,7 +8,9 @@ import com.securityControl.common.core.utils.aes.Aes; import com.securityControl.common.core.utils.aes.StringHelper; 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.sercurityControl.proteam.domain.vo.DeviceTypeVo; import com.sercurityControl.proteam.domain.vo.DeviceVo; @@ -43,7 +45,7 @@ public class DeviceTypeController { * @return */ @PostMapping("getTypeList") - @Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.QUERY, details = "设备类型列表", grade = OperationType.QUERY_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.QUERY, details = "查询设备类型列表") public List getTypeList(DeviceTypeVo deviceTypeVo) { List list = service.getTypeList(deviceTypeVo); Map map = new HashMap(16); @@ -81,7 +83,7 @@ public class DeviceTypeController { * @return */ @PostMapping("addDeviceType") - @Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.INSERT, details = "新增设备类型", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.INSERT, details = "新增设备类型") public ReturnCodeEntity addDeviceType(DeviceTypeVo typeVo) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -96,7 +98,7 @@ public class DeviceTypeController { } @PostMapping("updateDeviceType") - @Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.UPDATE, details = "修改设备类型", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.UPDATE, details = "修改设备类型") public ReturnCodeEntity updateDeviceType(DeviceTypeVo typeVo) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -117,7 +119,6 @@ public class DeviceTypeController { * @return */ @PostMapping("getDeviceTypeDetail") - @Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.QUERY, details = "查看设备类型", grade = OperationType.QUERY_BUSINESS) public DeviceTypeVo getDeviceDetail(String params) { DeviceTypeVo deviceTypeVo = null; try { @@ -137,7 +138,7 @@ public class DeviceTypeController { * @return */ @PostMapping("deleteType") - @Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.DELETE, details = "删除设备类型", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.DELETE, details = "删除设备类型") public ReturnCodeEntity deleteType(String params) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java index c7f53d6..6f903ca 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java @@ -6,7 +6,9 @@ import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.core.utils.aes.StringHelper; 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.sercurityControl.proteam.domain.WeekRiskData; import com.sercurityControl.proteam.domain.vo.DutyChildVo; import com.sercurityControl.proteam.domain.vo.NewDutyVo; @@ -46,6 +48,7 @@ public class DutyChildController { * @return */ @PostMapping(value = "getProList") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "工程数据统计查询") public Map getProList(DutyChildVo vo) { if(StringHelper.isNotEmpty(vo.getBuildCode())){ List list= Arrays.asList(vo.getBuildCode().split(",")) ; @@ -69,6 +72,7 @@ public class DutyChildController { * @return */ @PostMapping(value = "getWeekList") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "主计划统计数据查询") public Map getWeekList(DutyChildVo vo) { String time= DateTimeHelper.getNowDay(); //本周开始时间 @@ -121,6 +125,7 @@ public class DutyChildController { */ @GetMapping("/exportWeekExcel") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.EXPORT, details = "导出周计划数据") public void exportWeekExcel(HttpServletResponse response, DutyChildVo data) { List list = service.exportWeekList(data); ExcelUtil util = new ExcelUtil(DutyChildVo.class); @@ -141,6 +146,7 @@ public class DutyChildController { * @return */ @PostMapping(value = "getDayList") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "日计划数据统计查询") public Map getDayList(DutyChildVo vo) { if(StringHelper.isNotEmpty(vo.getBuildCode())){ List list= Arrays.asList(vo.getBuildCode().split(",")) ; 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..2899e41 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 = "日计划数据统计查询") 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 = "新增单位信息") 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 = "修改单位信息") 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 = "删除单位信息") 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 = "导出单位信息数据") 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 = "下载导入模板") 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 = "单位信息数据导入") 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/NewDutyController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java index 572225e..618533c 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 = "今日任务列表查询") public Map getPageList(NewDutyVo vo) { PageHelper.startPage(vo.getPage(), vo.getLimit()); List deviceList = service.getPageList(vo); @@ -66,6 +64,7 @@ public class NewDutyController { * @return */ @PostMapping(value = "getAllTask") + @SysLog(title = "值班员", model = "值班任务->值班员", operaType = OperaType.QUERY, details = "任务统计查询") public Map getAllTask(NewDutyVo vo) { Map map = new HashMap(16); map = service.getAllTask(vo); @@ -78,6 +77,7 @@ public class NewDutyController { * @return */ @PostMapping(value = "getDutyWz") + @SysLog(title = "值班员", model = "值班任务->值班员", operaType = OperaType.QUERY, details = "违章统计查询") public Map getDutyWz(NewDutyVo vo) { Map map = new HashMap(16); map = service.getDutyWz(vo); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java index bd0e518..35205bf 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java @@ -10,7 +10,9 @@ import com.securityControl.common.core.utils.poi.ExcelUtil; 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.ProClassMettingVo; @@ -65,7 +67,7 @@ public class PreservationController extends BaseController { private ThreadPoolTaskExecutor testTaskExecutor; @PostMapping("getProjectPreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.QUERY, grade = OperationType.QUERY_BUSINESS, details = "工程维护列表") + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.QUERY, details = "工程列表数据查询") public Map getProjectPreservation(PreservationVo preservationVo) { PageHelper.startPage(preservationVo.getPage(), preservationVo.getLimit()); List preservationList = service.getProjectPreservation(preservationVo); @@ -81,7 +83,7 @@ public class PreservationController extends BaseController { } @PostMapping("getPreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.QUERY, details = "工程维护查看详情", grade = OperationType.QUERY_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.QUERY, details = "工程维护查看详情") public PreservationVo getDeviceDetail(String keyId) { PreservationVo preservatioVo = null; try { @@ -95,7 +97,7 @@ public class PreservationController extends BaseController { } @PostMapping("deletePreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.DELETE, details = "删除工程维护", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.DELETE, details = "删除工程维护数据") public ReturnCodeEntity deletePreservation(String keyId) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -109,7 +111,7 @@ public class PreservationController extends BaseController { } @PostMapping("batchDeletePreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.DELETE, details = "批量删除工程维护", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.DELETE, details = "批量删除工程维护") public ReturnCodeEntity batchDeletePreservation(String keyId) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -128,7 +130,7 @@ public class PreservationController extends BaseController { } @PostMapping("deleteAllPreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.DELETE, details = "全部删除工程维护", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.DELETE, details = "全部删除工程维护") public ReturnCodeEntity deleteAllPreservation(PreservationVo preservationVo) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -142,7 +144,7 @@ public class PreservationController extends BaseController { } @PostMapping("insertPreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.INSERT, details = "新增工程维护", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.INSERT, details = "新增工程维护") public ReturnCodeEntity insertPreservation(PreservationVo preservationVo) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -155,7 +157,7 @@ public class PreservationController extends BaseController { } @PostMapping("updatePreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.UPDATE, details = "修改工程维护", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.UPDATE, details = "修改工程维护") public ReturnCodeEntity updatePreservation(PreservationVo preservationVo) { ReturnCodeEntity entity = new ReturnCodeEntity(); try { @@ -168,6 +170,7 @@ public class PreservationController extends BaseController { } @PostMapping("/importExcel") + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.IMPORT, details = "导入工程数据") public void importExcel(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException { try { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); @@ -328,7 +331,7 @@ public class PreservationController extends BaseController { // } @GetMapping("exportPreservation") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.EXPORT, details = "导出工程维护", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.EXPORT, details = "导出工程维护数据") public void exportPreservation(HttpServletResponse response, PreservationVo preservationVo) { List studentsList = service.getProjectPreservation(preservationVo); ExcelUtil util = new ExcelUtil(PreservationVo.class); @@ -337,7 +340,7 @@ public class PreservationController extends BaseController { @ApiOperation("模板下载") @GetMapping("/downloadExcel") - @Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.QUERY, details = "模板下载", grade = OperationType.DOWNLOAD_BUSINESS) + @SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.DOWNLOAD, details = "工程维护模板下载") public void downloadExcel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ProDataController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ProDataController.java index 38827e3..dbc493a 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ProDataController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ProDataController.java @@ -8,7 +8,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.ProClassMettingVo; @@ -45,7 +47,7 @@ public class ProDataController extends BaseController { * @return 集合 */ @PostMapping("/getTicketLists") - @Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.QUERY, details = "作业票列表") + @SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.QUERY, details = "作业票列表查询") public TableDataInfo getTicketLists(TicketData ticketData) { startPage(); return getDataTable(service.getTicketLists(ticketData)); @@ -58,7 +60,7 @@ public class ProDataController extends BaseController { * @return 集合 */ @PostMapping("/getClassLists") - @Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.QUERY, details = "站班会列表") + @SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.QUERY, details = "站班会列表信息查询") public TableDataInfo getClassLists(ClassData classData) { startPage(); return getDataTable(service.getClassLists(classData)); @@ -71,14 +73,13 @@ public class ProDataController extends BaseController { * @return 集合 */ @PostMapping("/getProList") - @Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.QUERY, details = "工程列表") + @SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.QUERY, details = "工程列表分页查询") public TableDataInfo getProList(ProData proData) { startPage(); return getDataTable(service.getProList(proData)); } @PostMapping("/getProdDetail") - @Log(title = "工程明细", menu = "工程信息->工程详情", businessType = BusinessType.QUERY, details = "工程详情") public ProData getProdDetail(ProData proData) { return service.getProdDetail(proData); } @@ -90,7 +91,7 @@ public class ProDataController extends BaseController { * @return 集合 */ @GetMapping("/exportProData") - @Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.EXPORT, details = "工程列表导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.EXPORT, details = "工程列表导出") public void exportProData(HttpServletResponse response, ProData proData) { List list = service.getProList(proData); ExcelUtil util = new ExcelUtil(ProData.class); @@ -144,7 +145,7 @@ public class ProDataController extends BaseController { * @return */ @PostMapping(value = "getProWorkTeam") - @Log(title = "工程管理", menu = "班组记录", businessType = BusinessType.QUERY, details = "班组记录") + @SysLog(title = "工程明细", model = "工程信息->班组记录", operaType = OperaType.QUERY, details = "班组记录列表查询") public Map getProWorkTeam(ProData proData) { Map map = new HashMap(16); try { @@ -173,7 +174,7 @@ public class ProDataController extends BaseController { * @return */ @PostMapping(value = "getClassMettingList") - @Log(title = "工程管理", menu = "站班会记录", businessType = BusinessType.QUERY, details = "站班会记录") + @SysLog(title = "工程管理", model = "工程信息->工程管理", operaType = OperaType.QUERY, details = "站班会记录列表查询") public Map getClassMettingList(ProClassMettingVo proClassMettingVo) { Map map = new HashMap(16); try { 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..fb002f0 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 = "施工计划统计查询") public Map getWorkPlan(LoginDto loginDto) { return service.getWorkPlan(loginDto); } @@ -42,6 +45,7 @@ public class StagingController { * @return map */ @PostMapping("getWorkPlanList") + @SysLog(title = "工作台", model = "值班管理->工作台", operaType = OperaType.QUERY, details = "今日施工计划查询") public Map getWorkPlanList(LoginDto loginDto) { return service.getWorkPlanList(loginDto); } @@ -54,6 +58,7 @@ public class StagingController { * @return map */ @PostMapping("getWorkTeamList") + @SysLog(title = "工作台", model = "值班管理->工作台", operaType = OperaType.QUERY, details = "今日施工队伍信息查询") public Map getWorkTeamList(LoginDto loginDto) { return service.getWorkTeamList(loginDto); } @@ -66,6 +71,7 @@ public class StagingController { * @date 2024/1/11 9:28 */ @PostMapping("getTodayTask") + @SysLog(title = "工作台", model = "值班管理->工作台", operaType = OperaType.QUERY, details = "当日站班会列表信息查询") public AjaxResult getTodayTask(LoginDto loginDto) { return service.getTodayTask(loginDto); } @@ -78,6 +84,7 @@ public class StagingController { * @date 2024/1/11 10:38 */ @PostMapping("getVoiList") + @SysLog(title = "工作台", model = "值班管理->工作台", operaType = OperaType.QUERY, details = "维信息统计查询") public AjaxResult getVoiList(LoginDto loginDto) { return service.getVoiList(loginDto); } @@ -90,6 +97,7 @@ public class StagingController { * @date 2024/1/11 10:38 */ @PostMapping("getVoiDataById") + @SysLog(title = "工作台", model = "值班管理->工作台", operaType = OperaType.QUERY, details = "查看违章信息详情") public AjaxResult getVoiDataById(LoginDto loginDto) { return service.getVoiDataById(loginDto); } @@ -101,6 +109,7 @@ public class StagingController { * @date 2024/1/11 10:59 */ @PostMapping("getVoiNum") + @SysLog(title = "工作台", model = "值班管理->工作台", operaType = OperaType.QUERY, details = "违章信息数量查询") public AjaxResult getVoiNum(LoginDto loginDto) { return service.getVoiNum(loginDto); } @@ -112,6 +121,7 @@ public class StagingController { * @date 2024/1/11 14:08 */ @PostMapping("isJobApplication") + @SysLog(title = "工作台", model = "值班管理->工作台", operaType = OperaType.QUERY, details = "报岗统计查询") public AjaxResult isJobApplication(LoginDto loginDto) { return service.isJobApplication(loginDto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SupervisorController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SupervisorController.java index e1fba5c..768bc8f 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SupervisorController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SupervisorController.java @@ -1,6 +1,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.SupervisorService; import lombok.extern.slf4j.Slf4j; @@ -33,6 +35,7 @@ public class SupervisorController { * @return map */ @PostMapping("getProMaps") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "工程统计查询") public Map getProMaps(LoginDto loginDto) { return service.getProMaps(loginDto); } @@ -45,6 +48,7 @@ public class SupervisorController { * @return map */ @PostMapping("getWeekMaps") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "周计划统计查询") public Map getWeekMaps(LoginDto loginDto) { return service.getWeekMaps(loginDto); } @@ -56,6 +60,7 @@ public class SupervisorController { * @return map */ @PostMapping("getDayPlanMaps") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "日计划统计查询") public Map getDayPlanMaps(LoginDto loginDto) { return service.getDayPlanMaps(loginDto); } @@ -69,6 +74,7 @@ public class SupervisorController { * @return map */ @PostMapping("getDutyTaskMaps") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "值班任务统计查询") public Map getDutyTaskMaps(LoginDto loginDto) { return service.getDutyTaskMaps(loginDto); } @@ -78,6 +84,7 @@ public class SupervisorController { * 值班进度 统计 */ @PostMapping("getDutySchedule") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "值班任务统计查询") public Map getDutySchedule(LoginDto loginDto) { return service.getDutySchedule(loginDto); } @@ -87,6 +94,7 @@ public class SupervisorController { * @return */ @PostMapping("getViolationAudit") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "待审核数据查询") public Map getViolationAudit(LoginDto loginDto) { return service.getViolationAudit(loginDto); } @@ -98,6 +106,7 @@ public class SupervisorController { * @return */ @PostMapping("getPeopleMaps") + @SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "人员统计查询") public AjaxResult getPeopleMaps(LoginDto loginDto) { return service.getPeopleMaps(loginDto); } 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..cea9b1b 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 = "问题反馈列表查询") 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 = "报岗列表数据查询") 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 = "新增问题反馈数据") 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 = "修改问题反馈数据") 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 = "修改问题回复") public ReturnCodeEntity updateProblemHf(SysProblemVo problemVo) { return service.updateProblemHf(problemVo); } @@ -113,17 +120,20 @@ public class SysProblemController { * @return 集合 */ @PostMapping("/delete") + @SysLog(title = "问题反馈", model = "值班任务->问题反馈", operaType = OperaType.DELETE, details = "删除问题数据") public ReturnCodeEntity delete(SysProblemVo problemVo) { return service.delete(problemVo); } @PostMapping("/addBgData") + @SysLog(title = "报岗", model = "报岗->报岗", operaType = OperaType.INSERT, details = "新增报岗数据") public ReturnCodeEntity addBgData(JobApplication problemVo) { return service.addBgData(problemVo); } @GetMapping("exportData") + @SysLog(title = "报岗", model = "报岗->报岗", operaType = OperaType.EXPORT, details = "导出报岗台账") 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/controller/TRiskPressDropRateController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TRiskPressDropRateController.java index 2c8c897..be25c85 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,6 +63,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "数据导入") @PostMapping("/importExcel") + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.EXPORT, details = "压降率数据导入") //@Log(title = "压降率计算", businessType = BusinessType.IMPORT, details = "数据导入") public AjaxResult importExcel(MultipartFile file, HttpServletRequest request) throws Exception { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); @@ -82,14 +85,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 = "压降率导入模板下载") public void downloadExcel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; @@ -129,7 +131,7 @@ public class TRiskPressDropRateController extends BaseController { * @return 删除是否成功 */ @DeleteMapping("/id") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.DELETE, details = "删除数据", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.DELETE, details = "删除压降率数据") public AjaxResult deleteById(String id) { tRiskPressDropRateService.deleteById(id); return success(); @@ -144,7 +146,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "获取风险压降率的工程") @GetMapping("/getProNameList") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "获取风险压降率的工程") + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.QUERY, details = "获取风险压降率的工程") public AjaxResult getProNameList(@RequestParam("cityName") String cityName) { return AjaxResult.success(tRiskPressDropRateService.getProNameList(cityName)); } @@ -158,7 +160,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 = "根据地市、或者工程来删除数据") public AjaxResult delProList(RiskDelParamDto paramDto) { tRiskPressDropRateService.delProList(paramDto); return success(); @@ -173,7 +175,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "获取风险压降率数据") @PostMapping("/getRiskBloodList") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "获取风险压降率数据") + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.QUERY, details = "获取风险压降率数据分页哈希数据") public TableDataInfo getRiskBloodList(TRiskPressDropRate tRiskPressDropRate) { startPage(); return getDataTable(tRiskPressDropRateService.getRiskBloodList(tRiskPressDropRate)); @@ -188,7 +190,7 @@ public class TRiskPressDropRateController extends BaseController { */ @ApiOperation(value = "风险压降率计算") @PostMapping("/getRiskDropRate") - @Log(title = "压降率计算", menu = "压降率计算", businessType = BusinessType.QUERY, details = "风险压降率计算") + @SysLog(title = "压降率计算", model = "工程信息->压降率计算", operaType = OperaType.QUERY, details = "风险压降率计算") 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/TeamController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TeamController.java index ac1cb20..63aebf8 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 @@ -6,7 +6,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.*; import com.sercurityControl.proteam.domain.vo.TeamLabelVo; @@ -46,7 +48,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "获取班组详细信息") @PostMapping("/getTeamList") - @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.QUERY, details = "获取班组详细信息") + @SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "获取班组详细信息") public TableDataInfo getTeamList(TeamData teamData) { try { startPage(); @@ -65,7 +67,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "获取班组详细信息导出") @PostMapping("/exportData") - @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "获取班组详细信息导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "导出班组详情信息") public TableDataInfo exportData(TeamData teamData) { startPage(); try { @@ -83,7 +85,7 @@ public class TeamController extends BaseController { * @return 班组评价集合 */ @ApiOperation(value = "获取班组详细信息") - @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.QUERY, details = "班组评价信息") + @SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "获取班组详细信息") @PostMapping("/getTeamEvaList") public TableDataInfo getTeamEvaList(TeamEvaData teamEvaData) { startPage(); @@ -102,7 +104,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "获取班组黑名单信息") @PostMapping("/getTeamBlackList") - @Log(title = "班组明细", menu = "班组信息->班组黑名单", businessType = BusinessType.QUERY, details = "班组黑名单") + @SysLog(title = "班组明细", model = "班组信息->班组黑名单", operaType = OperaType.QUERY, details = "班组黑名单列表信息查询") public TableDataInfo getTeamBlackList(TeamBlackData teamBlackData) { startPage(); try { @@ -121,7 +123,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "获取班组人员信息") @PostMapping("/getTeamPeople") - @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.QUERY, details = "班组人员信息") + @SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "获取班组人员信息") public TableDataInfo getTeamPeople(PeopleEntity entity) { startPage(); try { @@ -140,7 +142,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "获取站班会信息") @PostMapping("/getClassList") - @Log(title = "班组明细", menu = "班组信息->站班会记录", businessType = BusinessType.QUERY, details = "站班会信息") + @SysLog(title = "班组明细", model = "班组信息->站班会记录", operaType = OperaType.QUERY, details = "站班会信息列表查询") public TableDataInfo getClassList(ClassData classData) { startPage(); try { @@ -160,7 +162,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "新增班组评价信息") @PostMapping("/insertTeamEva") - @Log(title = "班组明细", menu = "班组信息->站班会记录", businessType = BusinessType.QUERY, details = "站班会信息") + @SysLog(title = "班组评价", model = "班组评价->班组评价", operaType = OperaType.INSERT, details = "新增班组评价信息") public AjaxResult insertTeamEva(TeamEvaData teamEvaData) { return service.insertTeamEva(teamEvaData); } @@ -173,7 +175,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "新增班组拉黑信息") @PostMapping("/insertTeamBlack") - @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.INSERT, details = "新增班组拉黑信息", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "班组明细", model = "班组信息->班组信息", operaType = OperaType.INSERT, details = "新增班组拉黑信息") public AjaxResult insertTeamBlack(TeamEvaData teamEvaData) { return service.insertTeamBlack(teamEvaData); } @@ -187,7 +189,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "移出班组拉黑") @PostMapping("/deleteTeamBlack") - @Log(title = "班组明细", menu = "班组信息->班组黑名单", businessType = BusinessType.UPDATE, details = "移出班组拉黑", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "班组评价", model = "班组评价->班组黑名单", operaType = OperaType.DELETE, details = "移出班组拉黑") public AjaxResult deleteTeamBlack(TeamEvaData teamEvaData) { return service.deleteTeamBlack(teamEvaData); } @@ -221,7 +223,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "班组明细信息导出") @GetMapping("exportTeamData") - @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "获取班组详细信息导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.EXPORT, details = "获取班组详细信息导出") public void exportTeamData(HttpServletResponse response, TeamData teamData) { List list = service.getTeamList2(teamData); ExcelUtil util = new ExcelUtil(TeamData.class); @@ -235,7 +237,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "班组评价信息导出") @GetMapping("exportTeamEvaData") - @Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "班组评价信息导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.EXPORT, details = "班组评价信息导出") public void exportTeamEvaData(HttpServletResponse response, TeamEvaData teamEvaData) { List list = service.getTeamEvaList(teamEvaData); ExcelUtil util = new ExcelUtil(TeamEvaData.class); @@ -249,7 +251,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "班组拉黑信息导出") @GetMapping("exportTeamBlackData") - @Log(title = "班组明细", menu = "班组信息->班组黑名单", businessType = BusinessType.EXPORT, details = "班组拉黑信息导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "班组明细", model = "班组信息->班组黑名单", operaType = OperaType.EXPORT, details = "班组拉黑信息导出") public void exportTeamBlackData(HttpServletResponse response, TeamBlackData teamBlackData) { List list = service.getTeamBlackList(teamBlackData); ExcelUtil util = new ExcelUtil(TeamBlackData.class); @@ -263,7 +265,7 @@ public class TeamController extends BaseController { */ @ApiOperation(value = "班组拉黑信息导出") @GetMapping("exportClassData") - @Log(title = "班组明细", menu = "班组信息->站班会记录", businessType = BusinessType.EXPORT, details = "站班会记录信息导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "班组明细", model = "班组信息->站班会记录", operaType = OperaType.EXPORT, details = "站班会记录信息导出") public void exportClassData(HttpServletResponse response, ClassData classData) { List list = service.getClassList(classData); ExcelUtil util = new ExcelUtil(ClassData.class); 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..6ee232d 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 = "无人机树列表查询") 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 = "获取无人机绑定信息") public TableDataInfo getUavBandProList() { startPage(); return getDataTable(service.getUavBandProList()); @@ -62,7 +64,7 @@ public class UavPatrolController extends BaseController { **/ @ApiOperation(value = "获取工程集合") @PostMapping("/getProList") - @Log(title = "无人机巡视", menu = "无人机巡视", businessType = BusinessType.QUERY, details = "获取工程集合") + @SysLog(title = "无人机巡视", model = "工程信息->无人机巡视", operaType = OperaType.QUERY, details = "获取工程集合") public AjaxResult getProList() { return service.getProList(); } @@ -74,7 +76,7 @@ public class UavPatrolController extends BaseController { **/ @ApiOperation(value = "获取工程集合") @PostMapping("/getClass") - @Log(title = "无人机巡视", menu = "无人机巡视", businessType = BusinessType.QUERY, details = "获取工程集合") + @SysLog(title = "无人机巡视", model = "工程信息->无人机巡视", operaType = OperaType.QUERY, details = "查询施工作业数据集合") public TableDataInfo getClass(ClassData entity) { startPage(); return getDataTable(service.getClass(entity)); @@ -88,7 +90,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 = "修改设备绑定工程") public AjaxResult updateBand(UAVBandProEntity entity) { return service.updateBand(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..3a60e25 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.UPDATE, details = "周风险详情列表") 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.UPDATE, details = "周风险详情导出") public void exportProData(HttpServletResponse response, WeekRiskEntity weekRiskEntity) { List list = service.getWeekRiskList(weekRiskEntity); ExcelUtil util = new ExcelUtil(WeekRiskEntity.class);