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);