diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java index 2c2fda68..915b287c 100644 --- a/src/main/java/com/zcloud/aspect/DockingAspect.java +++ b/src/main/java/com/zcloud/aspect/DockingAspect.java @@ -6,10 +6,7 @@ import com.zcloud.entity.PageData; import com.zcloud.entity.system.User; import com.zcloud.service.docking.DockingRelationService; import com.zcloud.service.mq.DockSendMessageService; -import com.zcloud.util.Const; -import com.zcloud.util.Jurisdiction; -import com.zcloud.util.Tools; -import com.zcloud.util.UuidUtil; +import com.zcloud.util.*; import org.apache.shiro.session.Session; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -25,6 +22,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.PostConstruct; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -188,9 +186,11 @@ public class DockingAspect { TenCorpDto tenCorpDto = new TenCorpDto(); tenCorpDto.setMessage("沧州矿石数据同步消息"); tenCorpDto.setData(sendData); - tenCorpDto.setId(UuidUtil.get32UUID()); + tenCorpDto.setMessageLogId(UuidUtil.get32UUID()); tenCorpDto.setTopic("docking"); + tenCorpDto.setMark(servletPath); tenCorpDto.setProducer_name("qa-prevention-czks"); + tenCorpDto.setCREATE_TIME(DateUtil.date2Str(new Date())); // 有dockData String dockData = JSON.toJSONString(proceed.get("dockData")); if (Tools.notEmpty(dockData)) { diff --git a/src/main/java/com/zcloud/controller/app/AppCheckRecordController.java b/src/main/java/com/zcloud/controller/app/AppCheckRecordController.java index 6df8911f..19a5a977 100644 --- a/src/main/java/com/zcloud/controller/app/AppCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/app/AppCheckRecordController.java @@ -438,7 +438,7 @@ public class AppCheckRecordController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppCorpFuncController.java b/src/main/java/com/zcloud/controller/app/AppCorpFuncController.java index 89633020..a3e60da8 100644 --- a/src/main/java/com/zcloud/controller/app/AppCorpFuncController.java +++ b/src/main/java/com/zcloud/controller/app/AppCorpFuncController.java @@ -255,7 +255,7 @@ public class AppCorpFuncController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppCourseStudyController.java b/src/main/java/com/zcloud/controller/app/AppCourseStudyController.java index fdf00c71..de7bff4f 100644 --- a/src/main/java/com/zcloud/controller/app/AppCourseStudyController.java +++ b/src/main/java/com/zcloud/controller/app/AppCourseStudyController.java @@ -233,7 +233,7 @@ public class AppCourseStudyController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppCourseStudyVideoRecordController.java b/src/main/java/com/zcloud/controller/app/AppCourseStudyVideoRecordController.java index 146eb1b4..2d1abd4e 100644 --- a/src/main/java/com/zcloud/controller/app/AppCourseStudyVideoRecordController.java +++ b/src/main/java/com/zcloud/controller/app/AppCourseStudyVideoRecordController.java @@ -258,7 +258,7 @@ public class AppCourseStudyVideoRecordController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppCoursewareController.java b/src/main/java/com/zcloud/controller/app/AppCoursewareController.java index 5a1e4a50..189625e4 100644 --- a/src/main/java/com/zcloud/controller/app/AppCoursewareController.java +++ b/src/main/java/com/zcloud/controller/app/AppCoursewareController.java @@ -274,7 +274,7 @@ public class AppCoursewareController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppFeedbackController.java b/src/main/java/com/zcloud/controller/app/AppFeedbackController.java index 2ce9b8e8..2f7eb4c4 100644 --- a/src/main/java/com/zcloud/controller/app/AppFeedbackController.java +++ b/src/main/java/com/zcloud/controller/app/AppFeedbackController.java @@ -249,7 +249,7 @@ public class AppFeedbackController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppGasDetectionController.java b/src/main/java/com/zcloud/controller/app/AppGasDetectionController.java index 1c14f830..a6af8943 100644 --- a/src/main/java/com/zcloud/controller/app/AppGasDetectionController.java +++ b/src/main/java/com/zcloud/controller/app/AppGasDetectionController.java @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.GasDetectionService; -/** +/** * 说明：气体检测 * 作者：luoxiaobao * 时间：2021-04-15 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.GasDetectionService; @Controller @RequestMapping("/app/gasdetection") public class AppGasDetectionController extends BaseController { - + @Autowired private GasDetectionService gasdetectionService; - + /**新增 * @param * @throws Exception @@ -56,7 +56,7 @@ public class AppGasDetectionController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -72,7 +72,7 @@ public class AppGasDetectionController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -88,7 +88,7 @@ public class AppGasDetectionController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -109,7 +109,7 @@ public class AppGasDetectionController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -125,9 +125,9 @@ public class AppGasDetectionController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - - + } + + /** 查询审批单内气体检测单 * @param * @throws Exception @@ -144,8 +144,8 @@ public class AppGasDetectionController extends BaseController { map.put("varList", varList); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -155,7 +155,7 @@ public class AppGasDetectionController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -168,13 +168,13 @@ public class AppGasDetectionController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -227,5 +227,5 @@ public class AppGasDetectionController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java b/src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java index dccfe293..896bae8c 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java @@ -175,7 +175,7 @@ public class AppHiddenExamineController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - // @RequiresPermissions("toExcel") + // // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppIdentificationPartsController.java b/src/main/java/com/zcloud/controller/app/AppIdentificationPartsController.java index fdb808f6..f18916bf 100644 --- a/src/main/java/com/zcloud/controller/app/AppIdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/app/AppIdentificationPartsController.java @@ -284,7 +284,7 @@ public class AppIdentificationPartsController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -316,7 +316,7 @@ public class AppIdentificationPartsController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "identificationpartsExcelTemplate.xls", "identificationpartsExcelTemplate.xls"); diff --git a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java index 0cdf4309..177a74c1 100644 --- a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java +++ b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java @@ -346,7 +346,7 @@ public class AppImgFilesController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppLimitSpaceApproveController.java b/src/main/java/com/zcloud/controller/app/AppLimitSpaceApproveController.java index 057464e2..49ac76bc 100644 --- a/src/main/java/com/zcloud/controller/app/AppLimitSpaceApproveController.java +++ b/src/main/java/com/zcloud/controller/app/AppLimitSpaceApproveController.java @@ -609,7 +609,7 @@ public class AppLimitSpaceApproveController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppLimitSpaceController.java b/src/main/java/com/zcloud/controller/app/AppLimitSpaceController.java index 00850fb2..f5c5499c 100644 --- a/src/main/java/com/zcloud/controller/app/AppLimitSpaceController.java +++ b/src/main/java/com/zcloud/controller/app/AppLimitSpaceController.java @@ -21,7 +21,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.bus.LimitSpaceService; -/** +/** * 说明：有限空间台账 * 作者：luoxiaobao * 时间：2021-04-02 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.LimitSpaceService; @Controller @RequestMapping("/app/limitspace") public class AppLimitSpaceController extends BaseController { - + @Autowired private LimitSpaceService limitspaceService; - + /**新增 * @param * @throws Exception @@ -68,7 +68,7 @@ public class AppLimitSpaceController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -87,7 +87,7 @@ public class AppLimitSpaceController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -118,7 +118,7 @@ public class AppLimitSpaceController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -139,7 +139,7 @@ public class AppLimitSpaceController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -155,8 +155,8 @@ public class AppLimitSpaceController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**查询本公司所有有限空间 * @param * @throws Exception @@ -172,8 +172,8 @@ public class AppLimitSpaceController extends BaseController { map.put("varList", varList); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -184,7 +184,7 @@ public class AppLimitSpaceController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -200,13 +200,13 @@ public class AppLimitSpaceController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -261,5 +261,5 @@ public class AppLimitSpaceController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/app/AppMajordangersourceDisposalController.java b/src/main/java/com/zcloud/controller/app/AppMajordangersourceDisposalController.java index 72ae2393..d1729666 100644 --- a/src/main/java/com/zcloud/controller/app/AppMajordangersourceDisposalController.java +++ b/src/main/java/com/zcloud/controller/app/AppMajordangersourceDisposalController.java @@ -236,7 +236,7 @@ public class AppMajordangersourceDisposalController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppMyCurriculumController.java b/src/main/java/com/zcloud/controller/app/AppMyCurriculumController.java index 01fa3add..d0f41476 100644 --- a/src/main/java/com/zcloud/controller/app/AppMyCurriculumController.java +++ b/src/main/java/com/zcloud/controller/app/AppMyCurriculumController.java @@ -252,7 +252,7 @@ public class AppMyCurriculumController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppOffDutyController.java b/src/main/java/com/zcloud/controller/app/AppOffDutyController.java index a860f821..fdd277e5 100644 --- a/src/main/java/com/zcloud/controller/app/AppOffDutyController.java +++ b/src/main/java/com/zcloud/controller/app/AppOffDutyController.java @@ -197,7 +197,7 @@ public class AppOffDutyController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppSerialNumberController.java b/src/main/java/com/zcloud/controller/app/AppSerialNumberController.java index 49565315..59025e70 100644 --- a/src/main/java/com/zcloud/controller/app/AppSerialNumberController.java +++ b/src/main/java/com/zcloud/controller/app/AppSerialNumberController.java @@ -171,7 +171,7 @@ public class AppSerialNumberController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppStageExamController.java b/src/main/java/com/zcloud/controller/app/AppStageExamController.java index fd7c52e7..6c57b508 100644 --- a/src/main/java/com/zcloud/controller/app/AppStageExamController.java +++ b/src/main/java/com/zcloud/controller/app/AppStageExamController.java @@ -237,7 +237,7 @@ public class AppStageExamController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppStageStudentRelationController.java b/src/main/java/com/zcloud/controller/app/AppStageStudentRelationController.java index c94e3c7c..3296488d 100644 --- a/src/main/java/com/zcloud/controller/app/AppStageStudentRelationController.java +++ b/src/main/java/com/zcloud/controller/app/AppStageStudentRelationController.java @@ -298,7 +298,7 @@ public class AppStageStudentRelationController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppStageexampaperController.java b/src/main/java/com/zcloud/controller/app/AppStageexampaperController.java index c9907813..334d0917 100644 --- a/src/main/java/com/zcloud/controller/app/AppStageexampaperController.java +++ b/src/main/java/com/zcloud/controller/app/AppStageexampaperController.java @@ -244,7 +244,7 @@ public class AppStageexampaperController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppStudyTaskController.java b/src/main/java/com/zcloud/controller/app/AppStudyTaskController.java index 2532723a..3f619391 100644 --- a/src/main/java/com/zcloud/controller/app/AppStudyTaskController.java +++ b/src/main/java/com/zcloud/controller/app/AppStudyTaskController.java @@ -176,7 +176,7 @@ public class AppStudyTaskController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppSysPathController.java b/src/main/java/com/zcloud/controller/app/AppSysPathController.java index 289d00f7..3bd92ded 100644 --- a/src/main/java/com/zcloud/controller/app/AppSysPathController.java +++ b/src/main/java/com/zcloud/controller/app/AppSysPathController.java @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.SysPathService; -/** +/** * 说明：系统访问路径 * 作者：luoxiaobao * 时间：2021-05-28 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.SysPathService; @Controller @RequestMapping("/app/syspath") public class AppSysPathController extends BaseController { - + @Autowired private SysPathService syspathService; - + /**新增 * @param * @throws Exception @@ -56,7 +56,7 @@ public class AppSysPathController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -73,7 +73,7 @@ public class AppSysPathController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -90,7 +90,7 @@ public class AppSysPathController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -112,7 +112,7 @@ public class AppSysPathController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -129,8 +129,8 @@ public class AppSysPathController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**去修改页面获取数据 * @param * @throws Exception @@ -152,8 +152,8 @@ public class AppSysPathController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -164,7 +164,7 @@ public class AppSysPathController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -177,13 +177,13 @@ public class AppSysPathController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -220,5 +220,5 @@ public class AppSysPathController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/app/AppVersionManagerController.java b/src/main/java/com/zcloud/controller/app/AppVersionManagerController.java index 647c65f3..e0067801 100644 --- a/src/main/java/com/zcloud/controller/app/AppVersionManagerController.java +++ b/src/main/java/com/zcloud/controller/app/AppVersionManagerController.java @@ -264,7 +264,7 @@ public class AppVersionManagerController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/AppVersionManagerFirstController.java b/src/main/java/com/zcloud/controller/app/AppVersionManagerFirstController.java index 0b5b6273..95a6b302 100644 --- a/src/main/java/com/zcloud/controller/app/AppVersionManagerFirstController.java +++ b/src/main/java/com/zcloud/controller/app/AppVersionManagerFirstController.java @@ -230,7 +230,7 @@ public class AppVersionManagerFirstController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index 9b43b4a2..49535cad 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -685,7 +685,7 @@ public class AppHotWorkApplicationController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java index db7bfbdf..0fadaf7a 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java @@ -238,7 +238,7 @@ public class AppHotWorkApplicationDelayedController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppRelevantUnitController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppRelevantUnitController.java index d3c46124..54e32366 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppRelevantUnitController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppRelevantUnitController.java @@ -196,7 +196,7 @@ public class AppRelevantUnitController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppSpecialUserController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppSpecialUserController.java index 8ab438e1..a0b7f904 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppSpecialUserController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppSpecialUserController.java @@ -212,7 +212,7 @@ public class AppSpecialUserController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java index 313b6661..32a4eb56 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java @@ -290,7 +290,7 @@ public class AppSafetyEnvironmentalController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java index 65abbd5d..2135e85d 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java @@ -219,7 +219,7 @@ public class AppSafetyEnvironmentalExplainController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java index 68fd9d36..61ad28b5 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java @@ -231,7 +231,7 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalLogController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalLogController.java index 4d2875c9..a5446957 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalLogController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalLogController.java @@ -163,7 +163,7 @@ public class AppSafetyEnvironmentalLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalSituationController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalSituationController.java index 7619ecfe..55b2b2e4 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalSituationController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalSituationController.java @@ -167,7 +167,7 @@ public class AppSafetyEnvironmentalSituationController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesCapitalController.java b/src/main/java/com/zcloud/controller/bus/ArchivesCapitalController.java index 80565eeb..3505aeb5 100644 --- a/src/main/java/com/zcloud/controller/bus/ArchivesCapitalController.java +++ b/src/main/java/com/zcloud/controller/bus/ArchivesCapitalController.java @@ -151,7 +151,7 @@ public class ArchivesCapitalController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesEduManagerController.java b/src/main/java/com/zcloud/controller/bus/ArchivesEduManagerController.java index 2cace8d1..cbf41e93 100644 --- a/src/main/java/com/zcloud/controller/bus/ArchivesEduManagerController.java +++ b/src/main/java/com/zcloud/controller/bus/ArchivesEduManagerController.java @@ -151,7 +151,7 @@ public class ArchivesEduManagerController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesEduPlanController.java b/src/main/java/com/zcloud/controller/bus/ArchivesEduPlanController.java index 7ee6c559..c8713c18 100644 --- a/src/main/java/com/zcloud/controller/bus/ArchivesEduPlanController.java +++ b/src/main/java/com/zcloud/controller/bus/ArchivesEduPlanController.java @@ -151,7 +151,7 @@ public class ArchivesEduPlanController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java b/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java index 668429ec..ad340dec 100644 --- a/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java +++ b/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java @@ -186,7 +186,7 @@ public class ArchivesFilesController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesPostManController.java b/src/main/java/com/zcloud/controller/bus/ArchivesPostManController.java index ab2a0e90..50a004eb 100644 --- a/src/main/java/com/zcloud/controller/bus/ArchivesPostManController.java +++ b/src/main/java/com/zcloud/controller/bus/ArchivesPostManController.java @@ -150,7 +150,7 @@ public class ArchivesPostManController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesTeacherController.java b/src/main/java/com/zcloud/controller/bus/ArchivesTeacherController.java index a3333abd..3c6cd999 100644 --- a/src/main/java/com/zcloud/controller/bus/ArchivesTeacherController.java +++ b/src/main/java/com/zcloud/controller/bus/ArchivesTeacherController.java @@ -150,7 +150,7 @@ public class ArchivesTeacherController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/BillingManageController.java b/src/main/java/com/zcloud/controller/bus/BillingManageController.java index 816dd380..08fb23e5 100644 --- a/src/main/java/com/zcloud/controller/bus/BillingManageController.java +++ b/src/main/java/com/zcloud/controller/bus/BillingManageController.java @@ -23,7 +23,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.bus.BillingManageService; import com.zcloud.service.bus.CorpInfoService; -/** +/** * 说明：开票管理 * 作者：luoxiaobao * 时间：2021-03-23 @@ -32,10 +32,10 @@ import com.zcloud.service.bus.CorpInfoService; @Controller @RequestMapping("/billingmanage") public class BillingManageController extends BaseController { - + @Autowired private BillingManageService billingmanageService; - + @Autowired private CorpInfoService corpinfoService; /**新增 @@ -59,7 +59,7 @@ public class BillingManageController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -76,7 +76,7 @@ public class BillingManageController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -108,7 +108,7 @@ public class BillingManageController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -132,13 +132,13 @@ public class BillingManageController extends BaseController { if(cpd!=null) { map.put("cpd", cpd); } - + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -155,8 +155,8 @@ public class BillingManageController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -167,7 +167,7 @@ public class BillingManageController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -180,13 +180,13 @@ public class BillingManageController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -213,5 +213,5 @@ public class BillingManageController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/BreakGroundController.java b/src/main/java/com/zcloud/controller/bus/BreakGroundController.java index 20952c4e..d0baca83 100644 --- a/src/main/java/com/zcloud/controller/bus/BreakGroundController.java +++ b/src/main/java/com/zcloud/controller/bus/BreakGroundController.java @@ -164,7 +164,7 @@ public class BreakGroundController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/CheckRecordController.java b/src/main/java/com/zcloud/controller/bus/CheckRecordController.java index 49f3e403..64a089eb 100644 --- a/src/main/java/com/zcloud/controller/bus/CheckRecordController.java +++ b/src/main/java/com/zcloud/controller/bus/CheckRecordController.java @@ -566,7 +566,7 @@ public class CheckRecordController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/CheckUserController.java b/src/main/java/com/zcloud/controller/bus/CheckUserController.java index 33e32f53..35f12e09 100644 --- a/src/main/java/com/zcloud/controller/bus/CheckUserController.java +++ b/src/main/java/com/zcloud/controller/bus/CheckUserController.java @@ -155,7 +155,7 @@ public class CheckUserController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/CorpFuncController.java b/src/main/java/com/zcloud/controller/bus/CorpFuncController.java index 51ab0ca9..9257b291 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpFuncController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpFuncController.java @@ -237,7 +237,7 @@ public class CorpFuncController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index faa62455..b731e4b2 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -403,7 +403,7 @@ public class CorpInfoController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/CutRoadController.java b/src/main/java/com/zcloud/controller/bus/CutRoadController.java index 2ba9a0db..c6ba41b1 100644 --- a/src/main/java/com/zcloud/controller/bus/CutRoadController.java +++ b/src/main/java/com/zcloud/controller/bus/CutRoadController.java @@ -165,7 +165,7 @@ public class CutRoadController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") // @LogAnno(menuType= "高危作业管理",menuServer= "断路安全作业",instructionsOperate = "断路作业数据",instructionsType = "导出到excel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); diff --git a/src/main/java/com/zcloud/controller/bus/FuncController.java b/src/main/java/com/zcloud/controller/bus/FuncController.java index 7344e129..57a089c0 100644 --- a/src/main/java/com/zcloud/controller/bus/FuncController.java +++ b/src/main/java/com/zcloud/controller/bus/FuncController.java @@ -166,7 +166,7 @@ public class FuncController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/GasDetectionController.java b/src/main/java/com/zcloud/controller/bus/GasDetectionController.java index fb1a074a..0306c685 100644 --- a/src/main/java/com/zcloud/controller/bus/GasDetectionController.java +++ b/src/main/java/com/zcloud/controller/bus/GasDetectionController.java @@ -197,7 +197,7 @@ public class GasDetectionController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenCheckController.java b/src/main/java/com/zcloud/controller/bus/HiddenCheckController.java index ba25a5fb..f1951e16 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenCheckController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenCheckController.java @@ -155,7 +155,7 @@ public class HiddenCheckController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenController.java b/src/main/java/com/zcloud/controller/bus/HiddenController.java index fa2d6570..c81ef82e 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java @@ -1304,7 +1304,7 @@ public class HiddenController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel2") -// @RequiresPermissions("toExcel") +// // @RequiresPermissions("toExcel") public ModelAndView exportExcel2() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -1403,7 +1403,7 @@ public class HiddenController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") -// @RequiresPermissions("toExcel") +// // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java index 94b73add..5ddfe881 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java @@ -246,7 +246,7 @@ public class HiddenExamineController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - // @RequiresPermissions("toExcel") + // // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java index dc99cabb..f2844e7f 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java @@ -59,7 +59,7 @@ public class HiddenExcelController extends BaseController { private HiddenCheckService hiddenCheckService; @RequestMapping(value = "/exportExcelToSession") -// @RequiresPermissions("toExcel") +// // @RequiresPermissions("toExcel") @ResponseBody public Map exportExcelToSession() throws Exception { PageData pd = new PageData(); @@ -99,7 +99,7 @@ public class HiddenExcelController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel2") -// @RequiresPermissions("toExcel") +// // @RequiresPermissions("toExcel") public ModelAndView exportExcel2() throws Exception { ModelAndView mv = new ModelAndView(); PageData pdx = this.getPageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenSchemeController.java b/src/main/java/com/zcloud/controller/bus/HiddenSchemeController.java index 94cc1570..c713c6c6 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenSchemeController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenSchemeController.java @@ -160,7 +160,7 @@ public class HiddenSchemeController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java index 598e6913..5d8d03e7 100644 --- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java @@ -600,7 +600,7 @@ public class HotWorkApplicationController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationDelayedController.java index 325b86b6..a5709e00 100644 --- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationDelayedController.java +++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationDelayedController.java @@ -167,7 +167,7 @@ public class HotWorkApplicationDelayedController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java index e33b68f2..687e4f86 100644 --- a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java @@ -422,7 +422,7 @@ public class IdentificationPartsController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -455,7 +455,7 @@ public class IdentificationPartsController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelAll") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView excelAll() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -489,7 +489,7 @@ public class IdentificationPartsController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "identificationpartsExcelTemplate.xls", "identificationpartsExcelTemplate.xls"); diff --git a/src/main/java/com/zcloud/controller/bus/ImgFilesController.java b/src/main/java/com/zcloud/controller/bus/ImgFilesController.java index d4e3d6d5..ddd3eaec 100644 --- a/src/main/java/com/zcloud/controller/bus/ImgFilesController.java +++ b/src/main/java/com/zcloud/controller/bus/ImgFilesController.java @@ -346,7 +346,7 @@ public class ImgFilesController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/InvoiceManagerController.java b/src/main/java/com/zcloud/controller/bus/InvoiceManagerController.java index db1f400e..504f5e1c 100644 --- a/src/main/java/com/zcloud/controller/bus/InvoiceManagerController.java +++ b/src/main/java/com/zcloud/controller/bus/InvoiceManagerController.java @@ -22,7 +22,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.InvoiceManagerService; -/** +/** * 说明：发票管理 * 作者：luoxiaobao * 时间：2021-03-23 @@ -31,10 +31,10 @@ import com.zcloud.service.bus.InvoiceManagerService; @Controller @RequestMapping("/invoicemanager") public class InvoiceManagerController extends BaseController { - + @Autowired private InvoiceManagerService invoicemanagerService; - + /**新增 * @param * @throws Exception @@ -56,7 +56,7 @@ public class InvoiceManagerController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -73,7 +73,7 @@ public class InvoiceManagerController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -90,7 +90,7 @@ public class InvoiceManagerController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -113,7 +113,7 @@ public class InvoiceManagerController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -130,7 +130,7 @@ public class InvoiceManagerController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } + } /**去修改页面获取数据 * @param * @throws Exception @@ -149,7 +149,7 @@ public class InvoiceManagerController extends BaseController { map.put("varList", varList); map.put("result", errInfo); return map; - } + } /**批量删除 * @param * @throws Exception @@ -160,7 +160,7 @@ public class InvoiceManagerController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -173,13 +173,13 @@ public class InvoiceManagerController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -218,5 +218,5 @@ public class InvoiceManagerController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/LimitSpaceApproveController.java b/src/main/java/com/zcloud/controller/bus/LimitSpaceApproveController.java index df335ed0..e1ef6a8d 100644 --- a/src/main/java/com/zcloud/controller/bus/LimitSpaceApproveController.java +++ b/src/main/java/com/zcloud/controller/bus/LimitSpaceApproveController.java @@ -24,7 +24,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.bus.LimitSpaceApproveService; -/** +/** * 说明：有限空间作业审批单 * 作者：luoxiaobao * 时间：2021-04-13 @@ -33,12 +33,12 @@ import com.zcloud.service.bus.LimitSpaceApproveService; @Controller @RequestMapping("/limitspaceapprove") public class LimitSpaceApproveController extends BaseController { - + @Autowired private LimitSpaceApproveService limitspaceapproveService; @Autowired private ImgFilesService imgFilesService; - + /**新增 * @param * @throws Exception @@ -62,7 +62,7 @@ public class LimitSpaceApproveController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -79,7 +79,7 @@ public class LimitSpaceApproveController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -96,7 +96,7 @@ public class LimitSpaceApproveController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -119,7 +119,7 @@ public class LimitSpaceApproveController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -132,7 +132,7 @@ public class LimitSpaceApproveController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd = limitspaceapproveService.findById(pd); //根据ID读取 + pd = limitspaceapproveService.findById(pd); //根据ID读取 PageData pd2 = new PageData(); pd2.put("FOREIGN_KEY", pd.getString("LIMITSPACEAPPROVE_ID")); pd2.put("TYPE",9); @@ -147,8 +147,8 @@ public class LimitSpaceApproveController extends BaseController { map.put("jcImgs", jcImgs); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -159,7 +159,7 @@ public class LimitSpaceApproveController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -172,13 +172,13 @@ public class LimitSpaceApproveController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -247,5 +247,5 @@ public class LimitSpaceApproveController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/LimitSpaceController.java b/src/main/java/com/zcloud/controller/bus/LimitSpaceController.java index b30bf006..06bc9740 100644 --- a/src/main/java/com/zcloud/controller/bus/LimitSpaceController.java +++ b/src/main/java/com/zcloud/controller/bus/LimitSpaceController.java @@ -423,7 +423,7 @@ public class LimitSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -484,7 +484,7 @@ public class LimitSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "limitSpace.xls", "有限空间导入模板.xls"); } diff --git a/src/main/java/com/zcloud/controller/bus/ListCheckItemController.java b/src/main/java/com/zcloud/controller/bus/ListCheckItemController.java index 6ccb4efa..9f799b80 100644 --- a/src/main/java/com/zcloud/controller/bus/ListCheckItemController.java +++ b/src/main/java/com/zcloud/controller/bus/ListCheckItemController.java @@ -250,7 +250,7 @@ public class ListCheckItemController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ListDisableTimeController.java b/src/main/java/com/zcloud/controller/bus/ListDisableTimeController.java index 82a480cd..ec145cf9 100644 --- a/src/main/java/com/zcloud/controller/bus/ListDisableTimeController.java +++ b/src/main/java/com/zcloud/controller/bus/ListDisableTimeController.java @@ -160,7 +160,7 @@ public class ListDisableTimeController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ListManagerController.java b/src/main/java/com/zcloud/controller/bus/ListManagerController.java index 360b5f7a..93063dd9 100644 --- a/src/main/java/com/zcloud/controller/bus/ListManagerController.java +++ b/src/main/java/com/zcloud/controller/bus/ListManagerController.java @@ -1092,7 +1092,7 @@ public class ListManagerController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ListStatisticsController.java b/src/main/java/com/zcloud/controller/bus/ListStatisticsController.java index d3a8daad..1d91592b 100644 --- a/src/main/java/com/zcloud/controller/bus/ListStatisticsController.java +++ b/src/main/java/com/zcloud/controller/bus/ListStatisticsController.java @@ -158,7 +158,7 @@ public class ListStatisticsController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/MSMLoginController.java b/src/main/java/com/zcloud/controller/bus/MSMLoginController.java index 2ed3c029..c3f5baa1 100644 --- a/src/main/java/com/zcloud/controller/bus/MSMLoginController.java +++ b/src/main/java/com/zcloud/controller/bus/MSMLoginController.java @@ -24,7 +24,7 @@ import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.bus.MSMLoginService; import com.zcloud.service.system.DictionariesService; -/** +/** * 说明：短信记录 * 作者：luoxiaobao * 时间：2021-02-26 @@ -33,7 +33,7 @@ import com.zcloud.service.system.DictionariesService; @Controller @RequestMapping("/msmlogin") public class MSMLoginController extends BaseController { - + @Autowired private MSMLoginService msmloginService; @@ -57,7 +57,7 @@ public class MSMLoginController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -74,7 +74,7 @@ public class MSMLoginController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -91,7 +91,7 @@ public class MSMLoginController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -117,8 +117,8 @@ public class MSMLoginController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = msmloginService.list(page); //列出MSMLogin列表 - - + + PageData cpd = new PageData(); cpd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); cpd=corpinfoService.findById(cpd); @@ -127,7 +127,7 @@ public class MSMLoginController extends BaseController { lpd.put("STATE", "OK"); lpd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List lList =msmloginService.listAll(lpd); - + map.put("varList", varList); map.put("zts", Integer.parseInt(cpd.getString("SMS_COUNT"))); map.put("fsts", lList.size()); @@ -136,7 +136,7 @@ public class MSMLoginController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -153,8 +153,8 @@ public class MSMLoginController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -165,7 +165,7 @@ public class MSMLoginController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -178,13 +178,13 @@ public class MSMLoginController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -213,5 +213,5 @@ public class MSMLoginController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/NoticeCorpController.java b/src/main/java/com/zcloud/controller/bus/NoticeCorpController.java index 9bca3da1..9c0bbb17 100644 --- a/src/main/java/com/zcloud/controller/bus/NoticeCorpController.java +++ b/src/main/java/com/zcloud/controller/bus/NoticeCorpController.java @@ -280,7 +280,7 @@ public class NoticeCorpController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/NoticeCorpUserController.java b/src/main/java/com/zcloud/controller/bus/NoticeCorpUserController.java index b2ce6157..7d39dc28 100644 --- a/src/main/java/com/zcloud/controller/bus/NoticeCorpUserController.java +++ b/src/main/java/com/zcloud/controller/bus/NoticeCorpUserController.java @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.NoticeCorpUserService; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.NoticeCorpUserService; @Controller @RequestMapping("/noticecorpuserid") public class NoticeCorpUserController extends BaseController { - + @Autowired private NoticeCorpUserService noticecorpuseridService; - + /**新增 * @param * @throws Exception @@ -54,7 +54,7 @@ public class NoticeCorpUserController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -71,7 +71,7 @@ public class NoticeCorpUserController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -88,7 +88,7 @@ public class NoticeCorpUserController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -110,7 +110,7 @@ public class NoticeCorpUserController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -127,8 +127,8 @@ public class NoticeCorpUserController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -139,7 +139,7 @@ public class NoticeCorpUserController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -152,13 +152,13 @@ public class NoticeCorpUserController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -183,5 +183,5 @@ public class NoticeCorpUserController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/NoticeLogController.java b/src/main/java/com/zcloud/controller/bus/NoticeLogController.java index 1092a8aa..7ef09daa 100644 --- a/src/main/java/com/zcloud/controller/bus/NoticeLogController.java +++ b/src/main/java/com/zcloud/controller/bus/NoticeLogController.java @@ -157,7 +157,7 @@ public class NoticeLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/OffDutyController.java b/src/main/java/com/zcloud/controller/bus/OffDutyController.java index 5a85befd..2535e5c8 100644 --- a/src/main/java/com/zcloud/controller/bus/OffDutyController.java +++ b/src/main/java/com/zcloud/controller/bus/OffDutyController.java @@ -22,7 +22,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.OffDutyService; -/** +/** * 说明：休假 * 作者：luoxiaobao * 时间：2021-06-11 @@ -31,10 +31,10 @@ import com.zcloud.service.bus.OffDutyService; @Controller @RequestMapping("/offduty") public class OffDutyController extends BaseController { - + @Autowired private OffDutyService offdutyService; - + /**新增 * @param * @throws Exception @@ -57,7 +57,7 @@ public class OffDutyController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -74,7 +74,7 @@ public class OffDutyController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -91,7 +91,7 @@ public class OffDutyController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -113,7 +113,7 @@ public class OffDutyController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -130,8 +130,8 @@ public class OffDutyController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -142,7 +142,7 @@ public class OffDutyController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -155,13 +155,13 @@ public class OffDutyController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -200,5 +200,5 @@ public class OffDutyController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/PayManagerController.java b/src/main/java/com/zcloud/controller/bus/PayManagerController.java index 3c9ef439..97f3dd81 100644 --- a/src/main/java/com/zcloud/controller/bus/PayManagerController.java +++ b/src/main/java/com/zcloud/controller/bus/PayManagerController.java @@ -161,7 +161,7 @@ public class PayManagerController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java b/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java index dc7da92d..316ea467 100644 --- a/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java +++ b/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java @@ -313,7 +313,7 @@ public class PersonObtainEvidenceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/QualificationsController.java b/src/main/java/com/zcloud/controller/bus/QualificationsController.java index d0c3060c..ce58671a 100644 --- a/src/main/java/com/zcloud/controller/bus/QualificationsController.java +++ b/src/main/java/com/zcloud/controller/bus/QualificationsController.java @@ -211,7 +211,7 @@ public class QualificationsController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/RelevantUnitController.java b/src/main/java/com/zcloud/controller/bus/RelevantUnitController.java index 5312b559..e330832d 100644 --- a/src/main/java/com/zcloud/controller/bus/RelevantUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RelevantUnitController.java @@ -176,7 +176,7 @@ public class RelevantUnitController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ResourceCorpController.java b/src/main/java/com/zcloud/controller/bus/ResourceCorpController.java index 4231d25a..affbd852 100644 --- a/src/main/java/com/zcloud/controller/bus/ResourceCorpController.java +++ b/src/main/java/com/zcloud/controller/bus/ResourceCorpController.java @@ -202,7 +202,7 @@ public class ResourceCorpController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/RestrictedSpaceController.java b/src/main/java/com/zcloud/controller/bus/RestrictedSpaceController.java index 88ab09d4..39853aa0 100644 --- a/src/main/java/com/zcloud/controller/bus/RestrictedSpaceController.java +++ b/src/main/java/com/zcloud/controller/bus/RestrictedSpaceController.java @@ -38,7 +38,7 @@ import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.bus.RestrictedSpaceService; import com.zcloud.service.system.DictionariesService; -/** +/** * 说明：有（受）限空间 * 作者：luoxiaobao * 时间：2021-01-07 @@ -47,7 +47,7 @@ import com.zcloud.service.system.DictionariesService; @Controller @RequestMapping("/restrictedspace") public class RestrictedSpaceController extends BaseController { - + @Autowired private RestrictedSpaceService restrictedspaceService; @Autowired @@ -78,7 +78,7 @@ public class RestrictedSpaceController extends BaseController { map.put("pd", pd); return map; } - + /**删除 * @param out * @throws Exception @@ -108,7 +108,7 @@ public class RestrictedSpaceController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -128,7 +128,7 @@ public class RestrictedSpaceController extends BaseController { map.put("pd", pd); return map; } - + /**列表 * @param page * @throws Exception @@ -146,7 +146,7 @@ public class RestrictedSpaceController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = restrictedspaceService.list(page); //列出RestrictedSpace列表 - + if(varList.size()>0) {//如果有数据就去查询图片 String varIds[] = new String[varList.size()]; //需要查询的图片ids for (int i = 0; i < varList.size(); i++) { @@ -168,13 +168,13 @@ public class RestrictedSpaceController extends BaseController { } } } - + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -187,7 +187,7 @@ public class RestrictedSpaceController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd = restrictedspaceService.findById(pd); //根据ID读取 + pd = restrictedspaceService.findById(pd); //根据ID读取 PageData pd2 = new PageData(); pd2.put("FOREIGN_KEY", pd.getString("RESTRICTEDSPACE_ID")); pd2.put("TYPE",7); @@ -196,8 +196,8 @@ public class RestrictedSpaceController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -208,7 +208,7 @@ public class RestrictedSpaceController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -221,15 +221,15 @@ public class RestrictedSpaceController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ - + String DICTIONARIES_ID = "723d3cc7b2c8497c83fd6b4b6cc9a45d"; DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID)?"0":DICTIONARIES_ID; List dicListVal = dictionariesService.listSubDictByParentId(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据 @@ -237,7 +237,7 @@ public class RestrictedSpaceController extends BaseController { for (Dictionaries dictionaries : dicListVal) { dicMap.put(dictionaries.getBIANMA(), dictionaries.getNAME()); } - + ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -291,15 +291,15 @@ public class RestrictedSpaceController extends BaseController { return mv; } /**导出到excel - * @param + * @param * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "restrictedspaceTemplate.xls", "restrictedspaceTemplate.xls"); } - + /**从EXCEL导入到数据库 * @param file * @return @@ -316,7 +316,7 @@ public class RestrictedSpaceController extends BaseController { PageData pdPublic = new PageData(); pdPublic = this.getPageData(); StringBuffer errorStr = new StringBuffer(); - + if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"xls".equals(suffixName)) { @@ -344,7 +344,7 @@ public class RestrictedSpaceController extends BaseController { for (Dictionaries dictionaries : dicListVal) { dicMap.put(dictionaries.getNAME(),dictionaries.getBIANMA()); } - + int line= 12; int row =0; List> addList = new ArrayList<>(); @@ -373,7 +373,7 @@ public class RestrictedSpaceController extends BaseController { map.put("resultStr", errorStr.toString()); return map; } - + } Map valPd = new HashMap<>(); String NAME= Tools.excelHandle(lpd.get("var1").toString()); diff --git a/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java b/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java index 533b8de2..dd0a8ba4 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java @@ -229,7 +229,7 @@ public class RiskCheckItemController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/RiskPointController.java b/src/main/java/com/zcloud/controller/bus/RiskPointController.java index 51f5ddf1..7b2aeae8 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskPointController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskPointController.java @@ -437,7 +437,7 @@ public class RiskPointController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -495,7 +495,7 @@ public class RiskPointController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelAll") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView excelAll() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -575,7 +575,7 @@ public class RiskPointController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ // Exclupload ss=new Exclupload(); diff --git a/src/main/java/com/zcloud/controller/bus/RiskPointPositionController.java b/src/main/java/com/zcloud/controller/bus/RiskPointPositionController.java index 451c5403..d15943aa 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskPointPositionController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskPointPositionController.java @@ -167,7 +167,7 @@ public class RiskPointPositionController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/RiskPointTemporaryController.java b/src/main/java/com/zcloud/controller/bus/RiskPointTemporaryController.java index c36f91af..b30153eb 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskPointTemporaryController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskPointTemporaryController.java @@ -402,7 +402,7 @@ public class RiskPointTemporaryController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -484,7 +484,7 @@ public class RiskPointTemporaryController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ // Exclupload ss=new Exclupload(); diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java index a261a718..aa687966 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java @@ -303,7 +303,7 @@ public class RiskUnitController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -334,7 +334,7 @@ public class RiskUnitController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelAll") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView excelAll() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -390,7 +390,7 @@ public class RiskUnitController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "riskunitExcelTemplate.xls", "riskunitExcelTemplate.xls"); diff --git a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java index 274a176a..cc666094 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java @@ -217,7 +217,7 @@ public class RiskWarningController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/SMSManagementController.java b/src/main/java/com/zcloud/controller/bus/SMSManagementController.java index 130bc125..89f21ad5 100644 --- a/src/main/java/com/zcloud/controller/bus/SMSManagementController.java +++ b/src/main/java/com/zcloud/controller/bus/SMSManagementController.java @@ -297,7 +297,7 @@ public class SMSManagementController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/SMSOpenLogController.java b/src/main/java/com/zcloud/controller/bus/SMSOpenLogController.java index 19081b65..65213a39 100644 --- a/src/main/java/com/zcloud/controller/bus/SMSOpenLogController.java +++ b/src/main/java/com/zcloud/controller/bus/SMSOpenLogController.java @@ -22,7 +22,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.SMSOpenLogService; -/** +/** * 说明：短信开通日志 * 作者：luoxiaobao * 时间：2021-03-23 @@ -31,10 +31,10 @@ import com.zcloud.service.bus.SMSOpenLogService; @Controller @RequestMapping("/smsopenlog") public class SMSOpenLogController extends BaseController { - + @Autowired private SMSOpenLogService smsopenlogService; - + /**新增 * @param * @throws Exception @@ -57,7 +57,7 @@ public class SMSOpenLogController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -74,7 +74,7 @@ public class SMSOpenLogController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -91,7 +91,7 @@ public class SMSOpenLogController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -113,7 +113,7 @@ public class SMSOpenLogController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -130,8 +130,8 @@ public class SMSOpenLogController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -142,7 +142,7 @@ public class SMSOpenLogController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -155,13 +155,13 @@ public class SMSOpenLogController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -190,5 +190,5 @@ public class SMSOpenLogController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/SerialNumberController.java b/src/main/java/com/zcloud/controller/bus/SerialNumberController.java index fb6a670e..cafa7ad2 100644 --- a/src/main/java/com/zcloud/controller/bus/SerialNumberController.java +++ b/src/main/java/com/zcloud/controller/bus/SerialNumberController.java @@ -170,7 +170,7 @@ public class SerialNumberController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ServiceNoticeController.java b/src/main/java/com/zcloud/controller/bus/ServiceNoticeController.java index a167a7c1..148bcb79 100644 --- a/src/main/java/com/zcloud/controller/bus/ServiceNoticeController.java +++ b/src/main/java/com/zcloud/controller/bus/ServiceNoticeController.java @@ -402,7 +402,7 @@ public class ServiceNoticeController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ShiftWorkPeriodController.java b/src/main/java/com/zcloud/controller/bus/ShiftWorkPeriodController.java index 454e6fa2..f1dec6b1 100644 --- a/src/main/java/com/zcloud/controller/bus/ShiftWorkPeriodController.java +++ b/src/main/java/com/zcloud/controller/bus/ShiftWorkPeriodController.java @@ -355,7 +355,7 @@ public class ShiftWorkPeriodController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/ShiftWorkRulesController.java b/src/main/java/com/zcloud/controller/bus/ShiftWorkRulesController.java index 54e27340..47b73f4c 100644 --- a/src/main/java/com/zcloud/controller/bus/ShiftWorkRulesController.java +++ b/src/main/java/com/zcloud/controller/bus/ShiftWorkRulesController.java @@ -301,7 +301,7 @@ public class ShiftWorkRulesController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/SpaceAuditController.java b/src/main/java/com/zcloud/controller/bus/SpaceAuditController.java index 695cfad5..290b790a 100644 --- a/src/main/java/com/zcloud/controller/bus/SpaceAuditController.java +++ b/src/main/java/com/zcloud/controller/bus/SpaceAuditController.java @@ -155,7 +155,7 @@ public class SpaceAuditController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/SpecialUserController.java b/src/main/java/com/zcloud/controller/bus/SpecialUserController.java index afc98df2..7199fc23 100644 --- a/src/main/java/com/zcloud/controller/bus/SpecialUserController.java +++ b/src/main/java/com/zcloud/controller/bus/SpecialUserController.java @@ -220,7 +220,7 @@ public class SpecialUserController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/StudySectionController.java b/src/main/java/com/zcloud/controller/bus/StudySectionController.java index 48be77b3..1bf5b409 100644 --- a/src/main/java/com/zcloud/controller/bus/StudySectionController.java +++ b/src/main/java/com/zcloud/controller/bus/StudySectionController.java @@ -233,7 +233,7 @@ public class StudySectionController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/StudyVideoController.java b/src/main/java/com/zcloud/controller/bus/StudyVideoController.java index cd2f202d..5cf31098 100644 --- a/src/main/java/com/zcloud/controller/bus/StudyVideoController.java +++ b/src/main/java/com/zcloud/controller/bus/StudyVideoController.java @@ -231,7 +231,7 @@ public class StudyVideoController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/SysDateController.java b/src/main/java/com/zcloud/controller/bus/SysDateController.java index 04d1b76a..bb96fd42 100644 --- a/src/main/java/com/zcloud/controller/bus/SysDateController.java +++ b/src/main/java/com/zcloud/controller/bus/SysDateController.java @@ -195,7 +195,7 @@ public class SysDateController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/SysPathController.java b/src/main/java/com/zcloud/controller/bus/SysPathController.java index de23fd31..8252db47 100644 --- a/src/main/java/com/zcloud/controller/bus/SysPathController.java +++ b/src/main/java/com/zcloud/controller/bus/SysPathController.java @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.SysPathService; -/** +/** * 说明：系统访问路径 * 作者：luoxiaobao * 时间：2021-05-28 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.SysPathService; @Controller @RequestMapping("/syspath") public class SysPathController extends BaseController { - + @Autowired private SysPathService syspathService; - + /**新增 * @param * @throws Exception @@ -56,7 +56,7 @@ public class SysPathController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -73,7 +73,7 @@ public class SysPathController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -90,7 +90,7 @@ public class SysPathController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -112,7 +112,7 @@ public class SysPathController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -129,8 +129,8 @@ public class SysPathController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**去修改页面获取数据 * @param * @throws Exception @@ -147,8 +147,8 @@ public class SysPathController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -159,7 +159,7 @@ public class SysPathController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -172,13 +172,13 @@ public class SysPathController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -215,5 +215,5 @@ public class SysPathController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/TokenController.java b/src/main/java/com/zcloud/controller/bus/TokenController.java index 712de144..478eb1a2 100644 --- a/src/main/java/com/zcloud/controller/bus/TokenController.java +++ b/src/main/java/com/zcloud/controller/bus/TokenController.java @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.TokenService; -/** +/** * 说明：token * 作者：luoxiaobao * 时间：2021-05-10 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.TokenService; @Controller @RequestMapping("/token") public class TokenController extends BaseController { - + @Autowired private TokenService tokenService; - + /**新增 * @param * @throws Exception @@ -51,7 +51,7 @@ public class TokenController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -68,7 +68,7 @@ public class TokenController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -85,7 +85,7 @@ public class TokenController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -107,7 +107,7 @@ public class TokenController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -124,8 +124,8 @@ public class TokenController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -136,7 +136,7 @@ public class TokenController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -149,13 +149,13 @@ public class TokenController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -176,5 +176,5 @@ public class TokenController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java b/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java index 88a1c57f..d5670318 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java @@ -224,7 +224,7 @@ public class TrainingInfoController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java b/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java index d2557f4e..cc03bc1b 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java @@ -228,7 +228,7 @@ public class TrainingPlanController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java b/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java index 5bdd559a..c80f4da3 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java @@ -164,7 +164,7 @@ public class TrainingScheduleController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/VideoController.java b/src/main/java/com/zcloud/controller/bus/VideoController.java index ecf2ed5b..8bc7d65b 100644 --- a/src/main/java/com/zcloud/controller/bus/VideoController.java +++ b/src/main/java/com/zcloud/controller/bus/VideoController.java @@ -234,7 +234,7 @@ public class VideoController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/VidoManagerController.java b/src/main/java/com/zcloud/controller/bus/VidoManagerController.java index 51a099da..2f4bfc26 100644 --- a/src/main/java/com/zcloud/controller/bus/VidoManagerController.java +++ b/src/main/java/com/zcloud/controller/bus/VidoManagerController.java @@ -315,7 +315,7 @@ public class VidoManagerController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java index 62170e20..2066dbad 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java @@ -223,7 +223,7 @@ public class EmergencyDrillAttachmentController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillBasicController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillBasicController.java index 6aa35a8e..fa450bef 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillBasicController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillBasicController.java @@ -177,7 +177,7 @@ public class EmergencyDrillBasicController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java index 46f9ba02..7ec75fe4 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java @@ -175,7 +175,7 @@ public class EmergencyDrillContentController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java index b0a56ce2..d0798c01 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java @@ -175,7 +175,7 @@ public class EmergencyDrillOrgController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java index 7c2ff9e8..f0695392 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java @@ -175,7 +175,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java index 7c4c2064..7ff70ce3 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java @@ -223,7 +223,7 @@ public class EmergencyDrillReportController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java index 3dfeedfa..505ea3f4 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java @@ -175,7 +175,7 @@ public class EmergencyDrillSceneController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyEquipmentController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyEquipmentController.java index e8942dd0..17ccc9ee 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyEquipmentController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyEquipmentController.java @@ -175,7 +175,7 @@ public class EmergencyEquipmentController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java index d61b5417..cb5cc780 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java @@ -222,7 +222,7 @@ public class EmergencyPlanController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyTeamController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyTeamController.java index b098ffa5..690595d6 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyTeamController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyTeamController.java @@ -175,7 +175,7 @@ public class EmergencyTeamController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/fhdb/SQLeditController.java b/src/main/java/com/zcloud/controller/fhdb/SQLeditController.java index 500746d7..c2d8a059 100644 --- a/src/main/java/com/zcloud/controller/fhdb/SQLeditController.java +++ b/src/main/java/com/zcloud/controller/fhdb/SQLeditController.java @@ -107,7 +107,7 @@ public class SQLeditController extends BaseController { */ @SuppressWarnings("unchecked") @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel(){ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFGasDetectionController.java b/src/main/java/com/zcloud/controller/gf/AppGFGasDetectionController.java index be5d692e..a51d4b43 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFGasDetectionController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFGasDetectionController.java @@ -169,7 +169,7 @@ public class AppGFGasDetectionController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java index b0576b09..f6f087da 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java @@ -617,7 +617,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.java index acee4d3c..0af50a42 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.java @@ -188,7 +188,7 @@ public class AppGFLimitSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java index 6a15271b..2830a09d 100644 --- a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java @@ -171,7 +171,7 @@ public class GFBlindBoardController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java index 285fd878..2feedaee 100644 --- a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java @@ -167,7 +167,7 @@ public class GFBreakGroundController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java index 270916f2..e522fb8c 100644 --- a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java @@ -187,7 +187,7 @@ public class GFConfinedSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java index e38c5973..8da9ce89 100644 --- a/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java @@ -181,7 +181,7 @@ public class GFCutRoadController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java index 0dd02f1a..f72adb57 100644 --- a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java @@ -170,7 +170,7 @@ public class GFElectricityController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFEquipmentOverhaulController.java b/src/main/java/com/zcloud/controller/gf/GFEquipmentOverhaulController.java index 48f83267..b5149d35 100644 --- a/src/main/java/com/zcloud/controller/gf/GFEquipmentOverhaulController.java +++ b/src/main/java/com/zcloud/controller/gf/GFEquipmentOverhaulController.java @@ -164,7 +164,7 @@ public class GFEquipmentOverhaulController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java index ea6f0a68..d1a3cc5f 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java @@ -167,7 +167,7 @@ public class GFHighWorkController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java index 3d13a354..8ac0d335 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java @@ -167,7 +167,7 @@ public class GFHoistingController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFHotworkController.java b/src/main/java/com/zcloud/controller/gf/GFHotworkController.java index d5b7a85f..30cb739c 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHotworkController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHotworkController.java @@ -168,7 +168,7 @@ public class GFHotworkController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java index 51622f7f..c4a240ed 100644 --- a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java +++ b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java @@ -180,7 +180,7 @@ public class GFLimitSpaceApproveController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java index e1a01150..453242b8 100644 --- a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java @@ -399,7 +399,7 @@ public class GFLimitSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -460,7 +460,7 @@ public class GFLimitSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception{ FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "limitSpace.xls", "有限空间导入模板.xls"); } diff --git a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java index 6d52de84..75e0805a 100644 --- a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java +++ b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java @@ -916,7 +916,7 @@ public class HiddenApiController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") -// @RequiresPermissions("toExcel") +// // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/BlindBoardController.java b/src/main/java/com/zcloud/controller/highriskwork/BlindBoardController.java index db4848c1..bcf1d8be 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/BlindBoardController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/BlindBoardController.java @@ -399,7 +399,7 @@ public class BlindBoardController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/ConfinedSpaceController.java b/src/main/java/com/zcloud/controller/highriskwork/ConfinedSpaceController.java index 0974721b..d1a28b07 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/ConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/ConfinedSpaceController.java @@ -282,7 +282,7 @@ public class ConfinedSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/ElectricityController.java b/src/main/java/com/zcloud/controller/highriskwork/ElectricityController.java index aacd8eb1..be67920f 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/ElectricityController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/ElectricityController.java @@ -561,7 +561,7 @@ public class ElectricityController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/GasAnalysisController.java b/src/main/java/com/zcloud/controller/highriskwork/GasAnalysisController.java index e9c03bd5..0aa47b8b 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/GasAnalysisController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/GasAnalysisController.java @@ -155,7 +155,7 @@ public class GasAnalysisController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/HighWorkController.java b/src/main/java/com/zcloud/controller/highriskwork/HighWorkController.java index bde9e7ff..e60fe1d2 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/HighWorkController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/HighWorkController.java @@ -566,7 +566,7 @@ public class HighWorkController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/HoistingController.java b/src/main/java/com/zcloud/controller/highriskwork/HoistingController.java index 96b80b6b..52ffa5fe 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/HoistingController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/HoistingController.java @@ -621,7 +621,7 @@ public class HoistingController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java b/src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java index 5d8a61c5..09cf18fe 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java @@ -173,7 +173,7 @@ public class HotworkCfdController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/highriskwork/HotworkController.java b/src/main/java/com/zcloud/controller/highriskwork/HotworkController.java index 789f531c..f0e0180e 100644 --- a/src/main/java/com/zcloud/controller/highriskwork/HotworkController.java +++ b/src/main/java/com/zcloud/controller/highriskwork/HotworkController.java @@ -165,7 +165,7 @@ public class HotworkController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalAssessController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalAssessController.java index d2590953..bf791520 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalAssessController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalAssessController.java @@ -176,7 +176,7 @@ public class SafetyEnvironmentalAssessController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java index 8b8d06cd..f3bb3a37 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java @@ -519,7 +519,7 @@ public class SafetyEnvironmentalController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java index d7790f65..ef159e1f 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java @@ -248,7 +248,7 @@ public class SafetyEnvironmentalExplainController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java index ee6e68c7..47a0ac25 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java @@ -247,7 +247,7 @@ public class SafetyEnvironmentalInspectorController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalLogController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalLogController.java index 779fbd38..051f7869 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalLogController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalLogController.java @@ -163,7 +163,7 @@ public class SafetyEnvironmentalLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalSituationController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalSituationController.java index eaccf485..a7473edb 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalSituationController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalSituationController.java @@ -167,7 +167,7 @@ public class SafetyEnvironmentalSituationController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java index e9de8b4a..e5e3276f 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java @@ -150,7 +150,7 @@ public class KeyprojectPunishController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index 5b9ac6a7..1043de4a 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -628,7 +628,7 @@ public class OutSourcedController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java index f3b59599..896fea9f 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java @@ -234,7 +234,7 @@ public class PersonnelManagementController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java b/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java index cad7e303..79409ccc 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java @@ -270,7 +270,7 @@ public class UnitsController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java index 08f0b7a1..094a7524 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java @@ -279,7 +279,7 @@ public class MajorDangerSourceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java index b0a73ea4..f10e1749 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java @@ -194,7 +194,7 @@ public class MajorDangerSourceLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceDisposalController.java b/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceDisposalController.java index ba19c1b0..bce02038 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceDisposalController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceDisposalController.java @@ -260,7 +260,7 @@ public class MajordangersourceDisposalController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankController.java b/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankController.java index a8521a62..4194f671 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankController.java @@ -160,7 +160,7 @@ public class MajordangersourceStoragetankController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankLogController.java b/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankLogController.java index 280e09e0..403851b1 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankLogController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MajordangersourceStoragetankLogController.java @@ -161,7 +161,7 @@ public class MajordangersourceStoragetankLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceController.java b/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceController.java index 829940c7..88d126b0 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceController.java @@ -220,7 +220,7 @@ public class MonitoringDeviceController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceDisableController.java b/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceDisableController.java index 336728a1..44a9c08e 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceDisableController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceDisableController.java @@ -201,7 +201,7 @@ public class MonitoringDeviceDisableController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceSensorController.java b/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceSensorController.java index 2a5d9ec7..2faddaf4 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceSensorController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MonitoringDeviceSensorController.java @@ -174,7 +174,7 @@ public class MonitoringDeviceSensorController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 6ef58645..01f6d9cc 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -1,5 +1,6 @@ package com.zcloud.controller.map; +import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -334,8 +335,44 @@ public class MapController extends BaseController { public Object getAlarmData() { return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm",""); } + /** + * @Description: 定位基础信息 + * @Author: dearLin + * @Date: 2024/1/6/006 11:15 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getCzksBasicLocationInfoData") + @ResponseBody + public Object getCzksBasicLocationInfoData() { + return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson",""); + } - + /** + * @Description: 标签卡状态 + * @Author: dearLin + * @Date: 2024/1/6/006 11:15 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/czks/person/staff/listPage") + @ResponseBody + public Object getCzksPersonStaffListPage() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", pageData.getString("pageNum")); + request.put("pageSize", pageData.getString("pageSize")); + // 普通员工 + if ("0".equals(pageData.getString("type"))) { + return HttpRequestUtil.getPeopleApi("/person/staff/listPage",request.toString()); + } else { + // 相关方 员工 + return HttpRequestUtil.getPeopleApi("/person/allPerson/listPage",request.toString()); + } + } + /** + * 沧州矿石人员定位结束 定位基础信息 + */ /** * 获取人员、车辆进出记录 * diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CourseExamController.java b/src/main/java/com/zcloud/controller/onlinexxks/CourseExamController.java index 0adf48c2..26df7a2e 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CourseExamController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CourseExamController.java @@ -173,7 +173,7 @@ public class CourseExamController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CourseExamRecordController.java b/src/main/java/com/zcloud/controller/onlinexxks/CourseExamRecordController.java index 0934e8f2..dcc72e0d 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CourseExamRecordController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CourseExamRecordController.java @@ -168,7 +168,7 @@ public class CourseExamRecordController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudentRelationController.java b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudentRelationController.java index ea382921..7b4361b8 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudentRelationController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudentRelationController.java @@ -167,7 +167,7 @@ public class CourseStudentRelationController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") -// @RequiresPermissions("toExcel") +// // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyController.java b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyController.java index 25689af0..56aad6d3 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyController.java @@ -173,7 +173,7 @@ public class CourseStudyController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyRecordController.java b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyRecordController.java index 77e313e3..02fac41f 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyRecordController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyRecordController.java @@ -167,7 +167,7 @@ public class CourseStudyRecordController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyVideoRecordController.java b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyVideoRecordController.java index 1aaae21c..d3f92e90 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyVideoRecordController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CourseStudyVideoRecordController.java @@ -256,7 +256,7 @@ public class CourseStudyVideoRecordController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CoursectkController.java b/src/main/java/com/zcloud/controller/onlinexxks/CoursectkController.java index b19f0ce3..c85e25fa 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CoursectkController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CoursectkController.java @@ -156,7 +156,7 @@ public class CoursectkController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CoursemiddleController.java b/src/main/java/com/zcloud/controller/onlinexxks/CoursemiddleController.java index 453253cc..62e684b3 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CoursemiddleController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CoursemiddleController.java @@ -167,7 +167,7 @@ public class CoursemiddleController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CoursepapersController.java b/src/main/java/com/zcloud/controller/onlinexxks/CoursepapersController.java index 597183ec..176cfac4 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CoursepapersController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CoursepapersController.java @@ -187,7 +187,7 @@ public class CoursepapersController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CourserecordController.java b/src/main/java/com/zcloud/controller/onlinexxks/CourserecordController.java index ea3f860b..ac9077e6 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CourserecordController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CourserecordController.java @@ -156,7 +156,7 @@ public class CourserecordController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java b/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java index ead97cf0..d3a846b4 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java @@ -244,7 +244,7 @@ public class CurriculumController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java b/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java index 7c0e8817..bb0d3b46 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java @@ -283,7 +283,7 @@ public class DataCoursewareController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/KcmiddlekjController.java b/src/main/java/com/zcloud/controller/onlinexxks/KcmiddlekjController.java index 0e41e17c..419452b0 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/KcmiddlekjController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/KcmiddlekjController.java @@ -167,7 +167,7 @@ public class KcmiddlekjController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java b/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java index 24681e21..7140cb9e 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java @@ -189,7 +189,7 @@ public class QuestionController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageExamController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageExamController.java index a99df082..09dbf5b9 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageExamController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageExamController.java @@ -176,7 +176,7 @@ public class StageExamController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperCoursewareController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperCoursewareController.java index 6e336771..91d9a225 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperCoursewareController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperCoursewareController.java @@ -167,7 +167,7 @@ public class StageExamPaperCoursewareController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperInputQuestionController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperInputQuestionController.java index 394df2cc..157f426d 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperInputQuestionController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperInputQuestionController.java @@ -152,7 +152,7 @@ public class StageExamPaperInputQuestionController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperQuestionController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperQuestionController.java index 8a3bebfc..310e3168 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperQuestionController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageExamPaperQuestionController.java @@ -167,7 +167,7 @@ public class StageExamPaperQuestionController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageExamRecordController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageExamRecordController.java index 94295b31..caac6fa8 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageExamRecordController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageExamRecordController.java @@ -168,7 +168,7 @@ public class StageExamRecordController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageStudentRelationController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageStudentRelationController.java index 297485fc..2fbc8727 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageStudentRelationController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageStudentRelationController.java @@ -164,7 +164,7 @@ public class StageStudentRelationController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageexamctkController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageexamctkController.java index 927fc0c7..05d5372f 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageexamctkController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageexamctkController.java @@ -154,7 +154,7 @@ public class StageexamctkController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageexammiddleController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageexammiddleController.java index ef3650b8..76b6df6c 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageexammiddleController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageexammiddleController.java @@ -167,7 +167,7 @@ public class StageexammiddleController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperController.java index db653d40..0ac1ecbe 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperController.java @@ -193,7 +193,7 @@ public class StageexampaperController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java index 8fd540e8..ffbdd635 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java @@ -182,7 +182,7 @@ public class StageexampaperInputController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java b/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java index a64f5441..dddcc2fa 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java @@ -185,7 +185,7 @@ public class StudyTaskController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java b/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java index 53509911..5433bf09 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java @@ -317,7 +317,7 @@ public class VideoCoursewareController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementCfdController.java b/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementCfdController.java index 1fb14166..7b3e076d 100644 --- a/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementCfdController.java +++ b/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementCfdController.java @@ -182,7 +182,7 @@ public class PersonnelManagementCfdController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") @LogAnno(menuType= "综合管理",menuServer= "特种作业",instructionsOperate = "特种作业人员管理",instructionsType = "导出到excel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); diff --git a/src/main/java/com/zcloud/controller/system/DepartmentController.java b/src/main/java/com/zcloud/controller/system/DepartmentController.java index 7326851a..ea759e27 100644 --- a/src/main/java/com/zcloud/controller/system/DepartmentController.java +++ b/src/main/java/com/zcloud/controller/system/DepartmentController.java @@ -664,7 +664,7 @@ public class DepartmentController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excels") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcels() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/system/PostController.java b/src/main/java/com/zcloud/controller/system/PostController.java index 1f109c7f..9cb720fa 100644 --- a/src/main/java/com/zcloud/controller/system/PostController.java +++ b/src/main/java/com/zcloud/controller/system/PostController.java @@ -197,7 +197,7 @@ public class PostController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 6e6ea83c..377cfcc4 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -1173,7 +1173,7 @@ public class UsersController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -1439,7 +1439,7 @@ public class UsersController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excelModel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public void exportExcelModel(HttpServletResponse response) throws Exception { FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "userExcelTemplate2.xls", "用户导入模板.xls"); } @@ -2313,7 +2313,7 @@ public class UsersController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excels") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcels() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java index eb588fd9..622272ec 100644 --- a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java +++ b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java @@ -235,7 +235,7 @@ public class SpecialEquipmentAqxjController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentChangeController.java b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentChangeController.java index 8d382456..380f09f4 100644 --- a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentChangeController.java +++ b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentChangeController.java @@ -167,7 +167,7 @@ public class SpecialEquipmentChangeController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java index 7ee4a0dd..fdbe5977 100644 --- a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java +++ b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java @@ -444,7 +444,7 @@ public class SpecialEquipmentController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java index 443a6470..ec6e8677 100644 --- a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java +++ b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java @@ -109,7 +109,7 @@ public class RelevantUnitsController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excelAll") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/xgf/TrainUsersController.java b/src/main/java/com/zcloud/controller/xgf/TrainUsersController.java index 450e6f57..61804d43 100644 --- a/src/main/java/com/zcloud/controller/xgf/TrainUsersController.java +++ b/src/main/java/com/zcloud/controller/xgf/TrainUsersController.java @@ -153,7 +153,7 @@ public class TrainUsersController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index d3e7835d..ef50b3ae 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -107,7 +107,7 @@ public class XgfCorpController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excelAll") -// @RequiresPermissions("toExcel") +// // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); diff --git a/src/main/java/com/zcloud/dto/TenCorpDto.java b/src/main/java/com/zcloud/dto/TenCorpDto.java index 011721d9..ef952d62 100644 --- a/src/main/java/com/zcloud/dto/TenCorpDto.java +++ b/src/main/java/com/zcloud/dto/TenCorpDto.java @@ -8,6 +8,16 @@ import lombok.Data; public class TenCorpDto { // 请秋id private String id; + + public String getMessageLogId() { + return messageLogId; + } + + public void setMessageLogId(String MESSAGE_LOG_ID) { + this.messageLogId = MESSAGE_LOG_ID; + } + + private String messageLogId; // 消息来源名称 private String producer_name = "qa-prevention-cfd"; private String topic; @@ -22,7 +32,15 @@ public class TenCorpDto { private String message; // 消息体 private PageData data; + public String getCREATE_TIME() { + return CREATE_TIME; + } + public void setCREATE_TIME(String CREATE_TIME) { + this.CREATE_TIME = CREATE_TIME; + } + + private String CREATE_TIME; public TenCorpDto() { this.id = Warden.get32UUID(); } @@ -39,7 +57,10 @@ public class TenCorpDto { info.put("MARK", this.mark); info.put("MARK_NAME", this.mark_name); info.put("MESSAGE", this.message); - info.put("TOPIC",this.topic); + info.put("TOPIC", this.topic); + info.put("DATA", JSON.toJSONString(this.data)); + info.put("CREATE_TIME", this.CREATE_TIME); + info.put("MESSAGE_LOG_ID", this.messageLogId); return info; } } diff --git a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java index 97d7b5ca..5e40df48 100644 --- a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java +++ b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; @Service public class DockSendMessageServiceImpl implements DockSendMessageService { @@ -42,10 +43,7 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { public void sendMessage(TenCorpDto tenCorpDto) throws Exception { try { PageData log = tenCorpDto.getPd(); - log.put("MESSAGE_LOG_ID", Warden.get32UUID()); - log.put("CREATE_TIME", DateUtil.getTime()); mqMessageLogMapper.save(log); - System.out.println("生产者:" + tenCorpDto.toString()); SendResult sendResult = rocketMQTemplate.syncSend(this.docking, tenCorpDto.toString()); if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { throw new RuntimeException("产品入栈失败"); @@ -54,9 +52,10 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { e.printStackTrace(); PageData log = tenCorpDto.getPd(); log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID()); + log.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId()); log.put("ERROR_MESSAGE", e.getMessage()); log.put("TYPE", "0"); - log.put("TIME", DateUtil.getTime()); + log.put("TIME", tenCorpDto.getCREATE_TIME()); mqErrorMessageLogMapper.save(log); } } diff --git a/src/main/java/com/zcloud/util/HttpRequestUtil.java b/src/main/java/com/zcloud/util/HttpRequestUtil.java index f0032a6b..571711cf 100644 --- a/src/main/java/com/zcloud/util/HttpRequestUtil.java +++ b/src/main/java/com/zcloud/util/HttpRequestUtil.java @@ -453,9 +453,11 @@ public class HttpRequestUtil { //关闭连接 connection.disconnect(); } - HashMap o = JSON.parseObject(result.toString(), HashMap.class); ReturnMap returnMap = new ReturnMap(); - returnMap.putAll(o); + if (Tools.notEmpty(result.toString())) { + HashMap o = JSON.parseObject(result.toString(), HashMap.class); + returnMap.putAll(o); + } return returnMap; } } diff --git a/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml b/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml index 98685a2b..65bf7e78 100644 --- a/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml +++ b/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml @@ -34,6 +34,7 @@ MARK_NAME, MESSAGE, CREATE_TIME, + DATA, MESSAGE_LOG_ID, TYPE, DIGESTION_FLAG, @@ -48,6 +49,7 @@ #{MARK_NAME}, #{MESSAGE}, #{CREATE_TIME}, + #{DATA}, #{MESSAGE_LOG_ID}, #{TYPE}, #{DIGESTION_FLAG}, diff --git a/src/main/webapp/admin/createcode/code/controller/bus/SMSManagementController.java b/src/main/webapp/admin/createcode/code/controller/bus/SMSManagementController.java index eece8b01..678aa83f 100644 --- a/src/main/webapp/admin/createcode/code/controller/bus/SMSManagementController.java +++ b/src/main/webapp/admin/createcode/code/controller/bus/SMSManagementController.java @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.SMSManagementService; -/** +/** * 说明：短信管理 * 作者：luoxiaobao * 时间：2021-01-21 @@ -30,10 +30,10 @@ import com.zcloud.service.bus.SMSManagementService; @Controller @RequestMapping("/smsmanagement") public class SMSManagementController extends BaseController { - + @Autowired private SMSManagementService smsmanagementService; - + /**新增 * @param * @throws Exception @@ -56,7 +56,7 @@ public class SMSManagementController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -73,7 +73,7 @@ public class SMSManagementController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -90,7 +90,7 @@ public class SMSManagementController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -112,7 +112,7 @@ public class SMSManagementController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -129,8 +129,8 @@ public class SMSManagementController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -141,7 +141,7 @@ public class SMSManagementController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -154,13 +154,13 @@ public class SMSManagementController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -201,5 +201,5 @@ public class SMSManagementController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/webapp/admin/createcode/code/controller/bus/VideoController.java b/src/main/webapp/admin/createcode/code/controller/bus/VideoController.java index 25651de4..dbd92239 100644 --- a/src/main/webapp/admin/createcode/code/controller/bus/VideoController.java +++ b/src/main/webapp/admin/createcode/code/controller/bus/VideoController.java @@ -158,7 +158,7 @@ public class VideoController extends BaseController { * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/webapp/admin/template/ftl/createFaCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl/createFaCode/controllerTemplate.ftl index ad440e9d..bf065023 100644 --- a/src/main/webapp/admin/template/ftl/createFaCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl/createFaCode/controllerTemplate.ftl @@ -22,7 +22,7 @@ import com.bdh.entity.PageData; import com.bdh.service.${packageName}.${objectName}Service; import com.bdh.service.${packageName}.${objectName}MxService; -/** +/** * 说明：${TITLE} * 作者：luoxiaobao * 时间：${nowDate?string("yyyy-MM-dd")} @@ -31,13 +31,13 @@ import com.bdh.service.${packageName}.${objectName}MxService; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + @Autowired private ${objectName}MxService ${objectNameLower}mxService; - + /**保存 * @param * @throws Exception @@ -69,7 +69,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**删除 * @param out * @throws Exception @@ -94,7 +94,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -111,7 +111,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**列表 * @param page * @throws Exception @@ -133,7 +133,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**去修改页面 * @param * @throws Exception @@ -150,14 +150,14 @@ public class ${objectName}Controller extends BaseController { map.put("pd", pd); map.put("result", errInfo); //返回结果 return map; - } - + } + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -188,5 +188,5 @@ public class ${objectName}Controller extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/webapp/admin/template/ftl/createOneCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl/createOneCode/controllerTemplate.ftl index f7a06046..82748cc4 100644 --- a/src/main/webapp/admin/template/ftl/createOneCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl/createOneCode/controllerTemplate.ftl @@ -21,7 +21,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.${packageName}.${objectName}Service; -/** +/** * 说明：${TITLE} * 作者：luoxiaobao * 时间：${nowDate?string("yyyy-MM-dd")} @@ -30,10 +30,10 @@ import com.zcloud.service.${packageName}.${objectName}Service; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + /**新增 * @param * @throws Exception @@ -64,7 +64,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -81,7 +81,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -98,7 +98,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -120,7 +120,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -137,8 +137,8 @@ public class ${objectName}Controller extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -149,7 +149,7 @@ public class ${objectName}Controller extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -162,13 +162,13 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -199,5 +199,5 @@ public class ${objectName}Controller extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/webapp/admin/template/ftl/createSoCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl/createSoCode/controllerTemplate.ftl index 18c32350..d19d8aef 100644 --- a/src/main/webapp/admin/template/ftl/createSoCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl/createSoCode/controllerTemplate.ftl @@ -21,7 +21,7 @@ import org.fh.util.Tools; import org.fh.entity.PageData; import org.fh.service.${packageName}.${objectName}Service; -/** +/** * 说明：${TITLE} * 作者：FH Admin QQ313596790 * 时间：${nowDate?string("yyyy-MM-dd")} @@ -30,10 +30,10 @@ import org.fh.service.${packageName}.${objectName}Service; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + /**保存 * @param * @throws Exception @@ -63,7 +63,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**删除 * @param out * @throws Exception @@ -79,7 +79,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -95,7 +95,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**列表 * @param page * @throws Exception @@ -116,7 +116,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**去修改页面 * @param * @throws Exception @@ -132,8 +132,8 @@ public class ${objectName}Controller extends BaseController { map.put("pd", pd); map.put("result", errInfo); //返回结果 return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -156,13 +156,13 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/webapp/admin/template/ftl/createTreeCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl/createTreeCode/controllerTemplate.ftl index 2758828a..78c04980 100644 --- a/src/main/webapp/admin/template/ftl/createTreeCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl/createTreeCode/controllerTemplate.ftl @@ -24,7 +24,7 @@ import org.fh.util.DateUtil; import org.fh.entity.PageData; import org.fh.service.${packageName}.${objectName}Service; -/** +/** * 说明：${TITLE} * 作者：FH Admin QQ313596790 * 时间：${nowDate?string("yyyy-MM-dd")} @@ -33,10 +33,10 @@ import org.fh.service.${packageName}.${objectName}Service; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + /**保存 * @param * @throws Exception @@ -67,7 +67,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -88,7 +88,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -105,7 +105,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -152,7 +152,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**去新增页面 * @param * @throws Exception @@ -170,8 +170,8 @@ public class ${objectName}Controller extends BaseController { map.put("pds",${objectNameLower}Service.findById(pd)); //传入上级所有信息 map.put("result", errInfo); return map; - } - + } + /**去修改页面 * @param * @throws Exception @@ -184,20 +184,20 @@ public class ${objectName}Controller extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd = ${objectNameLower}Service.findById(pd); //根据ID读取 + pd = ${objectNameLower}Service.findById(pd); //根据ID读取 map.put("pd", pd); //放入视图容器 pd.put("${objectNameUpper}_ID",pd.get("PARENT_ID").toString()); //用作上级信息 map.put("pds",${objectNameLower}Service.findById(pd)); //传入上级所有信息 map.put("result", errInfo); return map; - } - + } + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -228,5 +228,5 @@ public class ${objectName}Controller extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/webapp/admin/template/ftl_backups/createFaCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl_backups/createFaCode/controllerTemplate.ftl index 4fb2b440..40477221 100644 --- a/src/main/webapp/admin/template/ftl_backups/createFaCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl_backups/createFaCode/controllerTemplate.ftl @@ -22,7 +22,7 @@ import org.fh.entity.PageData; import org.fh.service.${packageName}.${objectName}Service; import org.fh.service.${packageName}.${objectName}MxService; -/** +/** * 说明：${TITLE} * 作者：FH Admin QQ313596790 * 时间：${nowDate?string("yyyy-MM-dd")} @@ -31,13 +31,13 @@ import org.fh.service.${packageName}.${objectName}MxService; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + @Autowired private ${objectName}MxService ${objectNameLower}mxService; - + /**保存 * @param * @throws Exception @@ -69,7 +69,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**删除 * @param out * @throws Exception @@ -94,7 +94,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -111,7 +111,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**列表 * @param page * @throws Exception @@ -133,7 +133,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**去修改页面 * @param * @throws Exception @@ -150,14 +150,14 @@ public class ${objectName}Controller extends BaseController { map.put("pd", pd); map.put("result", errInfo); //返回结果 return map; - } - + } + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -188,5 +188,5 @@ public class ${objectName}Controller extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/webapp/admin/template/ftl_backups/createOneCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl_backups/createOneCode/controllerTemplate.ftl index 5fa5a543..a719c6ef 100644 --- a/src/main/webapp/admin/template/ftl_backups/createOneCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl_backups/createOneCode/controllerTemplate.ftl @@ -21,7 +21,7 @@ import org.fh.util.Tools; import org.fh.entity.PageData; import org.fh.service.${packageName}.${objectName}Service; -/** +/** * 说明：${TITLE} * 作者：FH Admin QQ313596790 * 时间：${nowDate?string("yyyy-MM-dd")} @@ -30,10 +30,10 @@ import org.fh.service.${packageName}.${objectName}Service; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + /**新增 * @param * @throws Exception @@ -64,7 +64,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -81,7 +81,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -98,7 +98,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -120,7 +120,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -137,8 +137,8 @@ public class ${objectName}Controller extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -149,7 +149,7 @@ public class ${objectName}Controller extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -162,13 +162,13 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -199,5 +199,5 @@ public class ${objectName}Controller extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/webapp/admin/template/ftl_backups/createSoCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl_backups/createSoCode/controllerTemplate.ftl index 18c32350..d19d8aef 100644 --- a/src/main/webapp/admin/template/ftl_backups/createSoCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl_backups/createSoCode/controllerTemplate.ftl @@ -21,7 +21,7 @@ import org.fh.util.Tools; import org.fh.entity.PageData; import org.fh.service.${packageName}.${objectName}Service; -/** +/** * 说明：${TITLE} * 作者：FH Admin QQ313596790 * 时间：${nowDate?string("yyyy-MM-dd")} @@ -30,10 +30,10 @@ import org.fh.service.${packageName}.${objectName}Service; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + /**保存 * @param * @throws Exception @@ -63,7 +63,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**删除 * @param out * @throws Exception @@ -79,7 +79,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -95,7 +95,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**列表 * @param page * @throws Exception @@ -116,7 +116,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**去修改页面 * @param * @throws Exception @@ -132,8 +132,8 @@ public class ${objectName}Controller extends BaseController { map.put("pd", pd); map.put("result", errInfo); //返回结果 return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -156,13 +156,13 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/webapp/admin/template/ftl_backups/createTreeCode/controllerTemplate.ftl b/src/main/webapp/admin/template/ftl_backups/createTreeCode/controllerTemplate.ftl index 2758828a..78c04980 100644 --- a/src/main/webapp/admin/template/ftl_backups/createTreeCode/controllerTemplate.ftl +++ b/src/main/webapp/admin/template/ftl_backups/createTreeCode/controllerTemplate.ftl @@ -24,7 +24,7 @@ import org.fh.util.DateUtil; import org.fh.entity.PageData; import org.fh.service.${packageName}.${objectName}Service; -/** +/** * 说明：${TITLE} * 作者：FH Admin QQ313596790 * 时间：${nowDate?string("yyyy-MM-dd")} @@ -33,10 +33,10 @@ import org.fh.service.${packageName}.${objectName}Service; @Controller @RequestMapping("/${objectNameLower}") public class ${objectName}Controller extends BaseController { - + @Autowired private ${objectName}Service ${objectNameLower}Service; - + /**保存 * @param * @throws Exception @@ -67,7 +67,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -88,7 +88,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -105,7 +105,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -152,7 +152,7 @@ public class ${objectName}Controller extends BaseController { map.put("result", errInfo); return map; } - + /**去新增页面 * @param * @throws Exception @@ -170,8 +170,8 @@ public class ${objectName}Controller extends BaseController { map.put("pds",${objectNameLower}Service.findById(pd)); //传入上级所有信息 map.put("result", errInfo); return map; - } - + } + /**去修改页面 * @param * @throws Exception @@ -184,20 +184,20 @@ public class ${objectName}Controller extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd = ${objectNameLower}Service.findById(pd); //根据ID读取 + pd = ${objectNameLower}Service.findById(pd); //根据ID读取 map.put("pd", pd); //放入视图容器 pd.put("${objectNameUpper}_ID",pd.get("PARENT_ID").toString()); //用作上级信息 map.put("pds",${objectNameLower}Service.findById(pd)); //传入上级所有信息 map.put("result", errInfo); return map; - } - + } + /**导出到excel * @param * @throws Exception */ @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") + // @RequiresPermissions("toExcel") public ModelAndView exportExcel() throws Exception{ ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); @@ -228,5 +228,5 @@ public class ${objectName}Controller extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + }