add 功能安全中心，权限

jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java

@@ -9,12 +9,14 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.drafting.entity.PayDraftingGroupSubItem;
 import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem;
 import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -44,6 +46,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
     /**
      * 分页列表查询
      */
+    @RequiresPermissions("safetyCenterMember:search")
     @ApiOperation(value = "功能安全中心成员-分页列表查询", notes = "功能安全中心成员-分页列表查询")
     @GetMapping(value = "/page")
     public Result<IPage<SafetyCenterSubitem>> queryPageList(SafetyCenterSubitem safetyCenterSubitem,
@@ -58,6 +61,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
     /**
      * 列表查询
      */
+    @RequiresPermissions("safetyCenterMember:")
     @ApiOperation(value = "功能安全中心成员-列表查询", notes = "功能安全中心成员-列表查询")
     @GetMapping(value = "/list")
     public Result<List<SafetyCenterSubitem>> queryList(SafetyCenterSubitem safetyCenterSubitem,
@@ -71,6 +75,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
      * 添加
      */
     @AutoLog(value = "功能安全中心成员-添加")
+    @RequiresPermissions("safetyCenterMember:add")
     @ApiOperation(value = "功能安全中心成员-添加", notes = "功能安全中心成员-添加")
     @PostMapping(value = "/add")
     public Result<String> add(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) {
@@ -82,6 +87,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
      * 编辑
      */
     @AutoLog(value = "功能安全中心成员-编辑")
+    @RequiresPermissions("safetyCenterMember:edit")
     @ApiOperation(value = "功能安全中心成员-编辑", notes = "功能安全中心成员-编辑")
     @PostMapping(value = "/edit")
     public Result<String> edit(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) {
@@ -93,6 +99,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
      * 通过id删除
      */
     @AutoLog(value = "功能安全中心成员-通过id删除")
+    @RequiresPermissions("safetyCenterMember:delete")
     @ApiOperation(value = "功能安全中心成员-通过id删除", notes = "功能安全中心成员-通过id删除")
     @PostMapping(value = "/delete")
     public Result<Object> delete(@RequestBody IdsMapBody map) {
@@ -108,6 +115,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
      * 批量删除
      */
     @AutoLog(value = "功能安全中心成员-批量删除")
+    @RequiresPermissions("safetyCenterMember:batchDel")
     @ApiOperation(value = "功能安全中心成员-批量删除", notes = "功能安全中心成员-批量删除")
     @PostMapping(value = "/deleteBatch")
     public Result<Object> deleteBatch(@RequestBody IdsMapBody map) {
@@ -124,6 +132,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
      * 通过id查询
      */
     @AutoLog(value = "功能安全中心成员-通过id查询")
+    @RequiresPermissions("safetyCenterMember:search")
     @ApiOperation(value = "功能安全中心成员-通过id查询", notes = "功能安全中心成员-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<SafetyCenterSubitem> queryById(@RequestParam(name = "id") String id) {
@@ -137,18 +146,34 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
     /**
      * 导出excel
      */
+    @RequiresPermissions("safetyCenterMember:import")
     @ApiOperation(value = "功能安全中心成员-导出excel")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, SafetyCenterSubitem safetyCenterSubitem) {
         return super.exportXls(request, safetyCenterSubitem, SafetyCenterSubitem.class, "功能安全中心成员");
     }
 
+    /**
+     * 模板下载
+     *
+     * @return
+     */
+    @RequiresPermissions("safetyCenterMember:downTemplate")
+    @ApiOperation(value = "功能安全中心成员-模板下载")
+    @GetMapping(value = "/downloadExcelModel")
+    public ModelAndView downloadExcelModel() {
+        return super.exportTemplate(SafetyCenterSubitem.class, "功能安全中心成员导入模板");
+    }
+
     /**
      * 通过excel导入数据
      */
+    @RequiresPermissions("safetyCenterMember:import")
     @ApiOperation(value = "功能安全中心成员-通过excel导入数据")
     @PostMapping(value = "/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        List<Object> excelData = super.getExcelData(request, SafetyCenterSubitem.class);
+
         return super.importExcel(request, response, SafetyCenterSubitem.class);
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java

@@ -70,7 +70,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
     /**
      * 分页列表查询
      */
-    @RequiresPermissions("otherMeeting:search")
+    @RequiresPermissions("safetyCenterMeeting:search")
     @ApiOperation(value = "会议管理-分页列表查询", notes = "会议管理-分页列表查询")
     @GetMapping(value = "/page")
     public Result<?> queryPageList(PayMeeting payMeeting,
@@ -86,7 +86,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
     /**
      * 添加
      */
-    @RequiresPermissions("otherMeeting:add")
+    @RequiresPermissions("safetyCenterMeeting:add")
     @AutoLog(value = "会议管理-添加")
     @ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
     @PostMapping(value = "/add")
@@ -111,7 +111,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
     /**
      * 编辑
      */
-    @RequiresPermissions("otherMeeting:edit")
+    @RequiresPermissions("safetyCenterMeeting:edit")
     @AutoLog(value = "会议管理-编辑")
     @ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
     @PostMapping(value = "/edit")
@@ -126,7 +126,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
     /**
      * 通过id删除
      */
-    @RequiresPermissions("otherMeeting:delete")
+    @RequiresPermissions("safetyCenterMeeting:delete")
     @AutoLog(value = "会议管理-通过id删除")
     @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
     @GetMapping(value = "/delete")
@@ -139,7 +139,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
     /**
      * 批量删除
      */
-    @RequiresPermissions("otherMeeting:batchDel")
+    @RequiresPermissions("safetyCenterMeeting:batchDel")
     @AutoLog(value = "会议管理-批量删除")
     @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -185,7 +185,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
     /**
      * 导出excel
      */
-    @RequiresPermissions("otherMeeting:export")
+    @RequiresPermissions("safetyCenterMeeting:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
         payMeeting.setMeetingType(MEETING_TYPE);
@@ -200,7 +200,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
      * 上传资料
      */
     @AutoLog(value = "上传资料")
-    @RequiresPermissions("otherMeeting:upload")
+    @RequiresPermissions("safetyCenterMeeting:upload")
     @ApiOperation(value = "上传资料", notes = "上传资料")
     @PostMapping(value = "/uploadFile")
     public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
@@ -212,7 +212,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
      * 上传会议纪要
      */
     @AutoLog(value = "上传会议纪要")
-    @RequiresPermissions("otherMeeting:uploadCouncil")
+    @RequiresPermissions("safetyCenterMeeting:uploadCouncil")
     @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
     @PostMapping(value = "/uploadCouncilFile")
     public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
@@ -224,7 +224,7 @@ public class SafetyCenterMeetingController extends JeroController<PayMeeting, IP
      * 发布
      */
     @AutoLog("发布")
-    @RequiresPermissions("otherMeeting:release")
+    @RequiresPermissions("safetyCenterMeeting:release")
     @ApiOperation(value = "发布")
     @PostMapping(value = "/release")
     public Result<?> release(@RequestBody PublishReminderVO publishReminderVO) {

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java

@@ -62,7 +62,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
      * 分页列表查询
      */
     @CompanyNameTranslate
-    @RequiresPermissions("otherMeetingSituation:search")
+    @RequiresPermissions("safetyCenterMeetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
     public Result<?> queryPageList(PayMeetingSituation payMeetingSituation,
@@ -96,7 +96,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
     /**
      * 添加参会人
      */
-    @RequiresPermissions("otherMeetingSituation:add")
+    @RequiresPermissions("safetyCenterMeetingSituation:add")
     @AutoLog(value = "参会人员信息-添加参会人")
     @ApiOperation(value = "参会人员信息-添加参会人", notes = "参会人员信息-添加参会人")
     @PostMapping(value = "/add")
@@ -109,7 +109,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
      * 编辑
      */
     @AutoLog(value = "参会人员信息-编辑")
-    @RequiresPermissions("otherMeetingSituation:edit")
+    @RequiresPermissions("safetyCenterMeetingSituation:edit")
     @ApiOperation(value = "参会人员信息-编辑", notes = "参会人员信息-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
@@ -120,7 +120,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
     /**
      * 通过id删除
      */
-    @RequiresPermissions("otherMeetingSituation:delete")
+    @RequiresPermissions("safetyCenterMeetingSituation:delete")
     @AutoLog(value = "参会人员信息-通过id删除")
     @ApiOperation(value = "参会人员信息-通过id删除", notes = "参会人员信息-通过id删除")
     @GetMapping(value = "/delete")
@@ -132,7 +132,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
     /**
      * 批量删除
      */
-    @RequiresPermissions("otherMeetingSituation:batchDel")
+    @RequiresPermissions("safetyCenterMeetingSituation:batchDel")
     @AutoLog(value = "参会人员信息-批量删除")
     @ApiOperation(value = "参会人员信息-批量删除", notes = "参会人员信息-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -174,7 +174,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
     /**
      * 导出excel
      */
-    @RequiresPermissions("otherMeetingSituation:export")
+    @RequiresPermissions("safetyCenterMeetingSituation:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
         List<Object> objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE);
@@ -185,7 +185,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
     /**
      * 审核缴费凭证
      */
-    @RequiresPermissions("otherMeetingSituation:auditCredentials")
+    @RequiresPermissions("safetyCenterMeetingSituation:auditCredentials")
     @AutoLog(value = "审核缴费凭证")
     @ApiOperation(value = "审核缴费凭证")
     @PostMapping(value = "/check")
@@ -198,7 +198,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
      * 审核报名信息
      */
     @AutoLog(value = "审核报名信息")
-    @RequiresPermissions("otherMeetingSituation:auditSignUp")
+    @RequiresPermissions("safetyCenterMeetingSituation:auditSignUp")
     @ApiOperation(value = "审核报名信息")
     @PostMapping(value = "/checkRegister")
     public Result<?> checkRegister(@RequestBody CheckVO checkVO) {
@@ -220,7 +220,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
     /**
      * 设置嘉宾上传文件
      */
-    @RequiresPermissions("otherMeetingSituation:guestsUploadFileFlag")
+    @RequiresPermissions("safetyCenterMeetingSituation:guestsUploadFileFlag")
     @AutoLog(value = "设置嘉宾上传文件")
     @ApiOperation(value = "设置嘉宾上传文件", notes = "设置嘉宾上传文件")
     @PostMapping(value = "/setGuestsUploadFile")