From 33a4410e82c11033a157495ad93010fcde18f322 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Sun, 29 Jan 2023 09:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=20report=202023=E5=B9=B41=E6=9C=8829?= =?UTF-8?q?=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/controller/ReportController.java | 38 ++++++++++--------- .../service/impl/ReportServiceImpl.java | 11 ++++-- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/gaotao/modules/report/controller/ReportController.java b/src/main/java/com/gaotao/modules/report/controller/ReportController.java index b107436..5a7d917 100644 --- a/src/main/java/com/gaotao/modules/report/controller/ReportController.java +++ b/src/main/java/com/gaotao/modules/report/controller/ReportController.java @@ -1,11 +1,13 @@ package com.gaotao.modules.report.controller; +import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.utils.R; import com.gaotao.modules.report.data.CustomerReportData; import com.gaotao.modules.report.data.CustomerReportRoleData; import com.gaotao.modules.report.data.CustomerSearchColumnData; import com.gaotao.modules.report.data.SearchReportData; import com.gaotao.modules.report.service.ReportService; +import com.gaotao.modules.sys.controller.AbstractController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,7 +22,7 @@ import java.util.Map; */ @RestController @RequestMapping("/report") -public class ReportController { +public class ReportController extends AbstractController { @Autowired private ReportService reportService; @@ -37,7 +39,7 @@ public class ReportController { List> resultList = reportService.getReportTypeList(inMap); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("rows", resultList) .put("total", resultList.size()); } @@ -54,7 +56,7 @@ public class ReportController { List resultList = reportService.getCustomerReportList(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("rows", resultList) .put("total", resultList.size()); } @@ -71,7 +73,7 @@ public class ReportController { SearchReportData resultRow = reportService.addCustomerReport(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("row", resultRow); } @@ -87,7 +89,7 @@ public class ReportController { CustomerReportData resultRow = reportService.getCustomerReportByReportId(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("row", resultRow); } @@ -103,7 +105,7 @@ public class ReportController { reportService.saveCustomerReport(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -118,7 +120,7 @@ public class ReportController { List resultList = reportService.getSearchColumnsByReportId(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("rows", resultList) .put("total", resultList.size()); } @@ -135,7 +137,7 @@ public class ReportController { reportService.autoProcessSearchColumn(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } @@ -151,7 +153,7 @@ public class ReportController { reportService.saveCustomerSearchColumns(inMap); return R.ok() .put("code", 200) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -166,7 +168,7 @@ public class ReportController { Map resultMap = reportService.runCustomerReport(inMap); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("resultMap", resultMap); } @@ -182,7 +184,7 @@ public class ReportController { reportService.deleteCustomerReport(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -197,7 +199,7 @@ public class ReportController { reportService.deleteCustomerReportSearchColumn(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -212,7 +214,7 @@ public class ReportController { List resultList = reportService.getAuthRoles(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("rows", resultList) .put("total", resultList.size()); } @@ -230,7 +232,7 @@ public class ReportController { reportService.saveAuthSingleCustomerReport(inMap); return R.ok() .put("code", 200) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -245,7 +247,7 @@ public class ReportController { List resultList = reportService.getUserCustomerReportList(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("rows", resultList) .put("total", resultList.size()); } @@ -262,7 +264,7 @@ public class ReportController { List resultList = reportService.getCustomerReportAuths(inData); return R.ok() .put("code", 200) - .put("msg", "操作成功!") + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) .put("rows", resultList) .put("total", resultList.size()); } @@ -279,7 +281,7 @@ public class ReportController { reportService.saveCustomerReportAuths(inMap); return R.ok() .put("code", 200) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -295,7 +297,7 @@ public class ReportController { return R.ok() .put("code", 200) .put("resultMap", resultMap) - .put("msg", "操作成功!"); + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } diff --git a/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java b/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java index 63081c9..72c7e8d 100644 --- a/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java +++ b/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java @@ -10,12 +10,14 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisito import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.fastjson.JSON; +import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.exception.XJException; import com.gaotao.common.utils.DateUtil; import com.gaotao.modules.report.dao.ProcedureDao; import com.gaotao.modules.report.dao.ReportDao; import com.gaotao.modules.report.data.*; import com.gaotao.modules.report.service.ReportService; +import com.gaotao.modules.sys.service.SysMsgService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +38,9 @@ public class ReportServiceImpl implements ReportService { @Autowired private ProcedureDao procedureDao; + @Autowired + private SysMsgService sysMsgService; + @Override public List> getReportTypeList(Map inMap) { //公共参数 @@ -137,7 +142,7 @@ public class ReportServiceImpl implements ReportService { //判断是否存在sql String reportSql = customerReportData.getReportSql(); if(reportSql == null || "".equals(reportSql.trim())){ - throw new XJException("请先为当前报表添加SQL语句"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200151)); }else{ reportSql = reportSql.trim(); } @@ -305,7 +310,7 @@ public class ReportServiceImpl implements ReportService { //判断sql是否合法 int checkIndex = reportSql.indexOf("${"); if(checkIndex <= 0){ - throw new XJException("自定义报表的SQL语句非法!"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200152)); } //拆分字符串 int lastIndex = reportSql.lastIndexOf("}"); @@ -368,7 +373,7 @@ public class ReportServiceImpl implements ReportService { int countNums = reportDao.countUsedCustomerReportByReportId(reportId); //如果大于零 if(countNums > 0){ - throw new XJException("已经使用的报表无法删除"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200153)); } //继续 1. 先删除条件表 reportDao.deleteCustomerReportSearchColumn(reportId, null);