diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java index e96ccdf2..0b52220a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java @@ -12,22 +12,15 @@ import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport; import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; -import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ModelExcelVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; -import java.util.ArrayList; /** * 流程-新法规导入流程 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java index 83e806d7..aec728cc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java @@ -76,7 +76,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-新增", notes = "外部标准库-市场法规清单-新增") @ApiOperationSupport(order = 5) @PostMapping(value = "/add") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public Result add(@RequestBody LawsMarketStandardDetail marketStandardDetail) { return lawsMarketStandardDetailService.add(marketStandardDetail); } @@ -92,7 +92,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-批量新增", notes = "外部标准库-市场法规清单-批量新增") @ApiOperationSupport(order = 5) @PostMapping(value = "/batchAdd") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public Result batchAdd(@RequestBody List list) { return lawsMarketStandardDetailService.batchAdd(list); } @@ -108,7 +108,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-新增", notes = "外部标准库-市场法规清单-新增") @ApiOperationSupport(order = 5) @PostMapping(value = "/copy") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public Result copy(@RequestBody Map map) { if (!map.containsKey("newId") || StringUtils.isEmpty(map.get("newId"))) { return Result.error("请选择数据!"); @@ -129,7 +129,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-编辑", notes = "外部标准库-市场法规清单-编辑") @ApiOperationSupport(order = 6) @PostMapping(value = "/edit") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public Result edit(@RequestBody LawsMarketStandardDetail marketStandardDetail) { return lawsMarketStandardDetailService.edit(marketStandardDetail); } @@ -144,7 +144,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-根据id获取详情", notes = "外部标准库-市场法规清单-根据id获取详情") @ApiOperationSupport(order = 2) @PostMapping(value = "/getById") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") @Translation public Result getById(@RequestParam("id") String id) { return Result.OK(lawsMarketStandardDetailService.getById(id)); @@ -160,7 +160,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-删除", notes = "外部标准库-市场法规清单-删除") @ApiOperationSupport(order = 4) @PostMapping(value = "/delete") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public Result delete(@RequestBody Map map) { if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { return Result.error("请选择数据!"); @@ -178,7 +178,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-批量删除", notes = "外部标准库-市场法规清单-批量删除") @ApiOperationSupport(order = 4) @PostMapping(value = "/deleteBatch") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public Result deleteBatch(@RequestBody Map map) { if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { return Result.error("请选择数据!"); @@ -196,7 +196,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-导入", notes = "外部标准库-市场法规清单-导入") @ApiOperationSupport(order = 7) @PostMapping(value = "/importExcel") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public Result importExcel(@RequestParam("file") @ApiParam("文件") MultipartFile file,@RequestParam("manifestId") String manifestId) { return lawsMarketStandardDetailService.importExcel(file, manifestId); } @@ -211,7 +211,7 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单-下载模板", notes = "外部标准库-市场法规清单-下载模板") @ApiOperationSupport(order = 7) @GetMapping(value = "/downloadTemplate") - @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:detail:operate") public void downloadTemplate(HttpServletResponse response) { lawsMarketStandardDetailService.downloadTemplate(response); }