添加接口权限

laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java

@@ -29,6 +29,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -65,6 +67,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
     /**
      * 分页列表查询
      */
+    @RequiresPermissions("documentComparison:search")
     @AutoLog(value = "文档对比信息表-分页列表查询")
     @ApiOperation(value = "文档对比信息表-分页列表查询", notes = "文档对比信息表-分页列表查询")
     @GetMapping(value = "/page")
@@ -164,6 +167,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
      *
      * @return
      */
+    @RequiresPermissions("documentComparison:search")
     @AutoLog(value = "文档对比信息表-列表查询")
     @ApiOperation(value = "文档对比信息表-列表查询", notes = "文档对比信息表-列表查询")
     @GetMapping(value = "/list")
@@ -203,6 +207,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
     /**
      * 通过id删除
      */
+    @RequiresPermissions("documentComparison:delete")
     @AutoLog(value = "文档对比信息表-通过id删除")
     @ApiOperation(value = "文档对比信息表-通过id删除", notes = "文档对比信息表-通过id删除")
     @PostMapping(value = "/delete")
@@ -214,6 +219,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
     /**
      * 批量删除
      */
+    @RequiresPermissions("documentComparison:deleteBatch")
     @AutoLog(value = "文档对比信息表-批量删除")
     @ApiOperation(value = "文档对比信息表-批量删除", notes = "文档对比信息表-批量删除")
     @PostMapping(value = "/deleteBatch")
@@ -269,6 +275,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
      * @param json
      * @return 对比详情ID
      */
+    @RequiresPermissions("docComparsion:initiate:initiateComparison")
     @AutoLog(value = "文档对比信息表-发起文档对比")
     @ApiOperation(value = "文档对比信息表-发起文档对比", notes = "文档对比信息表-发起文档对比")
     @RequestMapping(value = "/fullTextComparison", method = RequestMethod.POST)
@@ -298,6 +305,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
      * @param sarFileCompareInfo
      * @return
      */
+    @RequiresPermissions("documentComparison:publishWithdraw")
     @AutoLog(value = "文档对比信息表-更改发布状态")
     @ApiOperation(value = "文档对比信息表-更改发布状态", notes = "文档对比信息表-更改发布状态")
     @RequestMapping(value = "/changeState", method = RequestMethod.POST)
@@ -325,6 +333,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
         return Result.OK(sarFileCompareDetailVO);
     }
 
+    @RequiresPermissions(value = {"docComparison:dataComparison:addFullTextComment", "docComparison:result:editFullTextComments"}, logical = Logical.OR)
     @AutoLog(value = "文档对比信息表-编辑全文评论")
     @ApiOperation(value = "文档对比信息表-编辑全文评论", notes = "文档对比信息表-编辑全文评论")
     @PostMapping(value = "/editComments")

laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java

@@ -14,6 +14,8 @@ import com.jero.modules.compare.service.ISarFileCompareItemCommentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +33,6 @@ import java.util.List;
  * @Version: V1.0
  */
 @Api(tags = "文档对比信息条款评论表")
-@RestController
 @RequestMapping("/compare/sarFileCompareItemComment")
 @Slf4j
 public class SarFileCompareItemCommentController extends JeroController<SarFileCompareItemComment, ISarFileCompareItemCommentService> {
@@ -79,6 +80,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
      * @param sarFileCompareItemComment
      * @return
      */
+    @RequiresPermissions(value = {"docComparison:dataComparison:consistentAssessment", "docComparison:dataComparison:save"}, logical = Logical.OR)
     @AutoLog(value = "文档对比信息条款评论表-添加")
     @ApiOperation(value = "文档对比信息条款评论表-添加", notes = "文档对比信息条款评论表-添加")
     @PostMapping(value = "/add")
@@ -106,6 +108,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
      * @param sarFileCompareItemComment
      * @return
      */
+    @RequiresPermissions("docComparison:result:edit")
     @AutoLog(value = "文档对比信息条款评论表-编辑")
     @ApiOperation(value = "文档对比信息条款评论表-编辑", notes = "文档对比信息条款评论表-编辑")
     @PostMapping(value = "/edit")
@@ -117,6 +120,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
     /**
      * 通过id删除
      */
+    @RequiresPermissions("docComparison:result:delete")
     @AutoLog(value = "文档对比信息条款评论表-通过id删除")
     @ApiOperation(value = "文档对比信息条款评论表-通过id删除", notes = "文档对比信息条款评论表-通过id删除")
     @PostMapping(value = "/delete")
@@ -158,6 +162,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
      *
      * @return
      */
+    @RequiresPermissions(value = {"docComparison:dataComparison:viewTheComparisonResults", "docComparison:result:viewVarianceAssessment", "docComparison:result:viewConsistentAssessment", "docComparison:result:viewAll"}, logical = Logical.OR)
     @AutoLog(value = "文档对比信息条款评论表-查询对比结果")
     @ApiOperation(value = "文档对比信息条款评论表-查询对比结果", notes = "文档对比信息条款评论表-查询对比结果")
     @GetMapping(value = "/queryCompareResult")
@@ -167,6 +172,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
         return Result.OK(res);
     }
 
+    @RequiresPermissions("docComparison:result:exportComparisonReport")
     @AutoLog(value = "文档对比信息条款评论表-导出结果")
     @ApiOperation(value = "文档对比信息条款评论表-导出结果", notes = "文档对比信息条款评论表-导出结果")
     @GetMapping(value = "/exportResXls")

laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java

@@ -13,6 +13,7 @@ import com.jero.modules.compare.service.ISarFileCompareResCommentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -174,6 +175,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
      *
      * @return
      */
+    @RequiresPermissions("docComparison:result:comment")
     @AutoLog(value = "文档对比信息结果评论表-根据infoId查询列表")
     @ApiOperation(value = "文档对比信息结果评论表-根据infoId查询列表", notes = "文档对比信息结果评论表-根据infoId查询列表")
     @GetMapping(value = "/queryListByInfoId")

laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java

@@ -132,7 +132,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
 	  *   添加
 	  */
 	 @AutoLog(value = "标准分享-海外分享")
-	 @ApiOperation(value="标准分享-分享", notes="标准分享-分享")
+	 @ApiOperation(value="标准分享-海外分享", notes="标准分享-海外分享")
 	 @PostMapping(value = "/overseas/add")
 	 public Result<T> overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java

@@ -1,10 +1,6 @@
 package com.jero.modules.projectLibrary.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.MessageUtils;
@@ -14,7 +10,6 @@ import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
-import org.apache.ibatis.annotations.Results;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +17,6 @@ import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 
 
@@ -42,12 +36,6 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 
 	/**
 	 * 分页列表查询
-	 *
-	 * @param lawsEvaluationNotMet
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
 	 */
 	@AutoLog(value = "评估未符合项条款-分页列表查询")
 	@ApiOperation(value="评估未符合项条款-分页列表查询", notes="评估未符合项条款-分页列表查询")
@@ -60,26 +48,8 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 		return Result.OK(pageList);
 	}
 
-    /**
-	 * 列表查询
-	 *
-	 * @param lawsEvaluationNotMet
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "评估未符合项条款-列表查询")
-    @ApiOperation(value="评估未符合项条款-列表查询", notes="评估未符合项条款-列表查询")
-	@GetMapping(value = "/list")
-	public Result<List<LawsEvaluationNotMet>> queryList(LawsEvaluationNotMet lawsEvaluationNotMet, HttpServletRequest req) {
-        List<LawsEvaluationNotMet> list = lawsEvaluationNotMetService.queryList(lawsEvaluationNotMet, req);
-        return Result.OK(list);
-	}
-
 	/**
 	 *   添加
-	 *
-	 * @param lawsEvaluationNotMet
-	 * @return
 	 */
 	@AutoLog(value = "评估未符合项条款-添加")
 	@ApiOperation(value="评估未符合项条款-添加", notes="评估未符合项条款-添加")
@@ -91,9 +61,6 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 
 	/**
 	 *  编辑
-	 *
-	 * @param lawsEvaluationNotMet
-	 * @return
 	 */
 	@AutoLog(value = "评估未符合项条款-编辑")
 	@ApiOperation(value="评估未符合项条款-编辑", notes="评估未符合项条款-编辑")
@@ -103,45 +70,10 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 		return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
 	}
 
-	/**
-	 *   通过id删除
-	 *
-	 * @param map
-	 * @return
-	 */
-	@AutoLog(value = "评估未符合项条款-通过id删除")
-	@ApiOperation(value="评估未符合项条款-通过id删除", notes="评估未符合项条款-通过id删除")
-	@PostMapping(value = "/delete")
-	public Result<T> delete(@RequestBody Map<String, String> map) {
-	    if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
-			throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
-        }
-		lawsEvaluationNotMetService.deleteById(map.get("id"));
-		return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
-	}
 
-	/**
-	 *  批量删除
-	 *
-	 * @param map
-	 * @return
-	 */
-	@AutoLog(value = "评估未符合项条款-批量删除")
-	@ApiOperation(value="评估未符合项条款-批量删除", notes="评估未符合项条款-批量删除")
-	@PostMapping(value = "/deleteBatch")
-	public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
-        if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
-			throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
-		}
-		this.lawsEvaluationNotMetService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
-		return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
-	}
 
 	/**
 	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
 	 */
 	@AutoLog(value = "评估未符合项条款-通过id查询")
 	@ApiOperation(value="评估未符合项条款-通过id查询", notes="评估未符合项条款-通过id查询")
@@ -156,25 +88,10 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 
     /**
     * 导出excel
-    *
-    * @param request
-    * @param lawsEvaluationNotMet
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, LawsEvaluationNotMet lawsEvaluationNotMet) {
         return super.exportXls(request, lawsEvaluationNotMet, LawsEvaluationNotMet.class, "评估未符合项条款");
     }
 
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<LawsEvaluationNotMet> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, LawsEvaluationNotMet.class);
-    }
-
 }

laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java

@@ -1,9 +1,8 @@
 package com.jero.modules.projectLibrary.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,7 +15,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 
 /**
@@ -36,82 +34,105 @@ public class LawsEvaluationNotMet implements Serializable {
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.String id;
+    private String id;
-	/**创建人*/
+
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**所属部门*/
-	@Excel(name = "所属部门", width = 15)
-    @ApiModelProperty(value = "所属部门")
-    private java.lang.String orgCode;
 	/**标准ID*/
 	@Excel(name = "标准ID", width = 15)
     @ApiModelProperty(value = "标准ID")
-    private java.lang.String standardId;
+    private String standardId;
+
 	/**标准编号*/
 	@Excel(name = "标准编号", width = 15)
     @ApiModelProperty(value = "标准编号")
-    private java.lang.String standardNumber;
+    private String standardNumber;
+
 	/**项目ID*/
 	@Excel(name = "项目ID", width = 15)
     @ApiModelProperty(value = "项目ID")
-    private java.lang.String projectId;
+    private String projectId;
+
 	/**项目名称*/
 	@Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
-    private java.lang.String projectName;
+    private String projectName;
+
 	/**条款ID*/
 	@Excel(name = "条款ID", width = 15)
     @ApiModelProperty(value = "条款ID")
-    private java.lang.String termId;
+    private String termId;
+
 	/**条款号*/
 	@Excel(name = "条款号", width = 15)
     @ApiModelProperty(value = "条款号")
-    private java.lang.String termNum;
+    private String termNum;
+
 	/**条款名称*/
 	@Excel(name = "条款名称", width = 15)
     @ApiModelProperty(value = "条款名称")
-    private java.lang.String termName;
+    private String termName;
+
 	/**责任部门ID*/
 	@Excel(name = "责任部门ID", width = 15)
     @ApiModelProperty(value = "责任部门ID")
-    private java.lang.String departmentId;
+    private String departmentId;
+
 	/**设计工程师ID*/
 	@Excel(name = "设计工程师ID", width = 15)
     @ApiModelProperty(value = "设计工程师ID")
-    private java.lang.String engineerId;
+    private String engineerId;
+
 	/**设计工程师名字*/
 	@Excel(name = "设计工程师名字", width = 15)
     @ApiModelProperty(value = "设计工程师名字")
-    private java.lang.String engineerName;
+    private String engineerName;
+
 	/**预计整改完成日期*/
 	@Excel(name = "预计整改完成日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "预计整改完成日期")
-    private java.util.Date expectedTime;
+    private Date expectedTime;
+
 	/**实际整改完成日期*/
 	@Excel(name = "实际整改完成日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "实际整改完成日期")
-    private java.util.Date realityTime;
+    private Date realityTime;
+
 	/**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/
     @Dict(dicCode = "assess_rectification")
 	@Excel(name = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)", width = 15)
     @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)")
-    private java.lang.String state;
+    private String state;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+    /**所属部门*/
+    @Excel(name = "所属部门", width = 15)
+    @ApiModelProperty(value = "所属部门")
+    private String orgCode;
+
+
+    /**预计整改完成日期范围*/
+    @ApiModelProperty(value = "预计整改完成日期范围")
+    private String expectedTimeRange;
 }

laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java

@@ -55,6 +55,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	  * @param sarFileSplitInfoEOPage
 	  * @return
 	  */
+	@RequiresPermissions("docComparsion:initiate:search")
 	@AutoLog(value = "文档拆分表-分页列表查询Y")
 	@ApiOperation(value="文档拆分表-分页列表查询", notes="文档拆分表-分页列表查询")
 	@GetMapping(value = "/page")