From 518bedfceff8fe4a9d1ede229ff3bf697d1b319a Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 16 Dec 2024 17:04:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proteam/controller/HomeController.java | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/HomeController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/HomeController.java index 00c67d3..996522b 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/HomeController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/HomeController.java @@ -60,7 +60,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getDayPlan") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "日计划") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "查询日计划") public AjaxResult getDayPlan(DayPlanNum dayPlanNum) { DayPlanNum res = homeDataService.getDayPlan(dayPlanNum); if (res != null) { @@ -76,7 +76,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getWeekRiskNum") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "周风险") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "周风险统计查询") public AjaxResult getWeekRiskNum(WeekRiskData weekRiskData) { Map map = homeDataService.getWeekRiskNum(weekRiskData); if (map != null) { @@ -92,7 +92,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getWeekPlanList") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "周计划列表") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "周计划列表查询") public Map getWeekPlanList(WeekRiskData weekRiskData) { PageHelper.startPage(Integer.parseInt(weekRiskData.getPage()), Integer.parseInt(weekRiskData.getLimit())); Map map = new HashMap(16); @@ -112,7 +112,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getRiskMap") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "电子地图-风险分布图") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "电子地图-风险分布图查询") public AjaxResult getRiskMap(RiskMapData riskMapData) { List res = homeDataService.getRiskMap(riskMapData); if (res != null && res.size() > 0) { @@ -128,7 +128,6 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getWeatherMap") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "电子地图-天气分布情况") public AjaxResult getWeatherMap() { List res = homeDataService.getWeatherMap(); if (res != null && res.size() > 0) { @@ -144,7 +143,6 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getWeatherAlert") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "电子地图-天气预警") public AjaxResult getWeatherAlert(String orgId, String currentDay) { List res = homeDataService.getWeatherAlert(currentDay, orgId); @@ -174,6 +172,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getTicketNumByType") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "电子地图-作业票统计查询") public AjaxResult getTicketNumByType(TicketTypeNum ticketTypeNum) { Map res = homeDataService.getTicketNumByType(ticketTypeNum); if (res != null) { @@ -189,7 +188,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getTicketNumByCicty") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "作业票-作业票地市对比图") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "电子地图-作业票地市对比图统计查询") public AjaxResult getTicketNumByCicty(TicketCityNum ticketTypeNum) { List> listMap = new ArrayList<>(); Map res = Maps.newHashMap(); @@ -214,7 +213,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getTicketList") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "作业票-作业票信息列表") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "作业票信息列表统计查询") public Map getTicketList(TicketData ticketData) { PageHelper.startPage(Integer.parseInt(ticketData.getPage()), Integer.parseInt(ticketData.getLimit())); Map map = new HashMap(16); @@ -230,6 +229,7 @@ public class HomeController extends BaseController { @Autowired private HomeDataMapper mapper; @GetMapping("exportTicket") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "导出作业票数据") public void exportTicket(HttpServletResponse response, TicketData ticketData) { // 地市多选切割 if (StringUtils.isNotBlank(ticketData.getBuildCode())) { @@ -243,7 +243,6 @@ public class HomeController extends BaseController { List riskTypeList = Arrays.asList(riskTypeArr); ticketData.setRiskTypeList(riskTypeList); } - List list = mapper.getTicketList(ticketData); ExcelUtil util = new ExcelUtil(TicketData.class); util.exportExcel(response, list, "作业票"); @@ -256,7 +255,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getDayAttendanceNum") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "人员统计-今日考勤统计") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "今日考勤统计查询") public AjaxResult getDayAttendanceNum() { String currentDay = DateTimeHelper.getNowDate(); List> list = new ArrayList<>(); @@ -282,7 +281,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getRealTimeNum") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "人员统计-实时在场人员统计") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "实时在场人员统计查询") public AjaxResult getRealTimeNum() { String currentDay = DateTimeHelper.getNowDate(); @@ -301,7 +300,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getClassPeopleNum") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "人员统计-站班会人员统计") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "站班会人员统计查询") public AjaxResult getClassPeopleNum(PersonNum personNum) { if(StringHelper.isEmpty(personNum.getCurrentDay())){ personNum.setCurrentDay(DateTimeHelper.getNowDate()); @@ -315,7 +314,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getPersonList") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "人员统计-人员列表") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "人员列表查询") public Map getPersonList(PersonData personData) { PageHelper.startPage(Integer.parseInt(personData.getPage()), Integer.parseInt(personData.getLimit())); Map map = new HashMap(16); @@ -347,7 +346,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getRiskByDate") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "根据日期获取各地市风险等级数量") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "根据日期获取各地市风险等级数量查询") public AjaxResult getRiskByDate(String orgId, String dateType) { Map list = homeDataService.getRiskByDate(orgId, dateType); if (list != null && list.size() > 0) { @@ -367,7 +366,7 @@ public class HomeController extends BaseController { * @date 2023-01-10 14:06 */ @PostMapping(value = "getDayPlanNum") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "获取日计划数量") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "获取日计划数量统计查询") public AjaxResult getDayPlanNum(String proType, String dayType) { try { // Map map = homeDataService.getDayPlanNum(proType, dayType); @@ -387,7 +386,7 @@ public class HomeController extends BaseController { * @date 2023-01-10 14:06 */ @PostMapping(value = "getAttendanceNum") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "人员统计") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "人员统计查询") public AjaxResult getAttendanceNum(String orgId) { try { Map map = homeDataService.getAttendanceNum(orgId); @@ -406,7 +405,7 @@ public class HomeController extends BaseController { * @date 2023-01-30 11:26 */ @PostMapping(value = "getOrgNumAndRateByPro") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "地市工程数量和占比") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "地市工程数量和占比查询") public AjaxResult getOrgNumAndRateByPro(ProData proData) { try { List> list = homeDataService.getOrgNumAndRateByPro(proData); @@ -460,7 +459,7 @@ public class HomeController extends BaseController { * @date 2023-01-31 15:11 */ @PostMapping(value = "getOrgNumAndRateByWeekChild") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "地市周风险数量和占比二级页面") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "地市周风险数量和占比二级页面查询") public AjaxResult getOrgNumAndRateByWeekChild(WeekRiskData weekRiskData) { try { List> list = homeDataService.getOrgNumAndRateByWeekChild(weekRiskData); @@ -480,7 +479,7 @@ public class HomeController extends BaseController { * @date 2023-02-01 9:21 */ @PostMapping(value = "getOrgNumAndRateByTicket") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "地市作业票数量和占比二级页面") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "地市作业票数量和占比二级页面列表查询") public AjaxResult getOrgNumAndRateByTicket(TicketData ticketData) { try { List> list = homeDataService.getOrgNumAndRateByTicket(ticketData); @@ -522,7 +521,7 @@ public class HomeController extends BaseController { * @date 2023-03-02 16:58 */ @PostMapping(value = "getProListByType") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "工程列表") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "工程列表查询") public Map getProListByType(ProData proData) { Map map = new HashMap(16); try { @@ -552,7 +551,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getClassMettingData") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "站班会统计") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "站班会统计查询") public AjaxResult getClassMettingData(ClassMettingStaVo vo) { return success(homeDataService.getClassMettingData(vo)); } @@ -563,7 +562,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping(value = "getClassMettingList") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "站班会详情") + @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.QUERY, details = "站班会列表详情查询") public Map getClassMettingList(ClassMettingStaVo vo) { Map map = new HashMap(16); try { @@ -620,7 +619,7 @@ public class HomeController extends BaseController { } @PostMapping(value = "getDailPlanList") - @Log(title = "综合展示", menu = "综合展示", businessType = BusinessType.QUERY, details = "日计划-日计划详情") + @SysLog(title = "综合展示", model = "综合展示->日计划", operaType = OperaType.QUERY, details = "日计划详情列表查询") public Map getDailPlanList(DailyPlanHome dailyPlanVo) { PageHelper.startPage(dailyPlanVo.getPage(), dailyPlanVo.getLimit()); Map map = new HashMap(16); @@ -691,6 +690,7 @@ public class HomeController extends BaseController { * @return */ @PostMapping("getGtList") + @SysLog(title = "综合展示", model = "综合展示->日计划", operaType = OperaType.QUERY, details = "杆塔数据集合列表查询") public AjaxResult getGtList(TowerVo params ){ try{ List list= homeDataService.getGtList(params); @@ -729,6 +729,7 @@ public class HomeController extends BaseController { */ @GetMapping("/exportWeekExcel") + @SysLog(title = "综合展示", model = "综合展示->日计划", operaType = OperaType.EXPORT, details = "导出日计划数据信息") public void exportWeekExcel(HttpServletResponse response, WeekRiskData data) { List list = homeDataService.exportWeekList(data); ExcelUtil util = new ExcelUtil(WeekRiskData.class); @@ -739,6 +740,7 @@ public class HomeController extends BaseController { * 导出周风险 */ @GetMapping("downWeekPlan") + @SysLog(title = "综合展示", model = "综合展示->日计划", operaType = OperaType.EXPORT, details = "导出周计划数据信息") public void downWeekPlan(HttpServletRequest request, HttpServletResponse response, String time) { try{ if(StringHelper.isEmpty(time)){ @@ -801,6 +803,7 @@ public class HomeController extends BaseController { * @param time */ @GetMapping("downDayPlan") + @SysLog(title = "综合展示", model = "综合展示->日计划", operaType = OperaType.EXPORT, details = "导出日计划数据信息") public void exportDayPlan(HttpServletRequest request, HttpServletResponse response, String time){ try{ Map maps = new HashMap<>(16); @@ -934,7 +937,6 @@ public String getWeekDate(int i){ return maps; } } - mapsValueVo.setName(key); mapsValueVo.setNum("0"); }catch (Exception e){