lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

权限字符修改

Browse Source
This commit is contained in:
lg
2025-11-25 19:40:59 +08:00
parent 45d143ace3
commit cad5ba1101
9 changed files with 124 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/controller/BusFormalitiesAreConsolidatedController.java
View File

@ -2,12 +2,16 @@ package org.dromara.formalities.controller;
import java.util.List;
import cn.dev33.satoken.annotation.SaMode;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.formalities.domain.bo.BusFormalitiesAnnexBo;
import org.dromara.formalities.domain.bo.BusListOfFormalitiesBo;
import org.dromara.formalities.domain.vo.BusFormalitiesAnnexVo;
import org.dromara.formalities.domain.vo.BusListOfFormalitiesVo;
import org.dromara.formalities.service.IBusFormalitiesAnnexService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -39,6 +43,7 @@ public class BusFormalitiesAreConsolidatedController extends BaseController {
private final IBusFormalitiesAreConsolidatedService busFormalitiesAreConsolidatedService;
private final IBusFormalitiesAnnexService busFormalitiesAnnexService;
/**
* 查询合规性手续合账列表
*/
@ -57,14 +62,16 @@ public class BusFormalitiesAreConsolidatedController extends BaseController {
/**
* 查询手续办理清单模板列表
*/
@SaCheckPermission("formalities:formalitiesAreConsolidated:getTree")
// @SaCheckPermission("formalities:formalitiesAreConsolidated:getTree")
@SaCheckPermission("formalities:formalitiesAreConsolidated:list")
@GetMapping("/getTree")
public R<List<BusListOfFormalitiesVo>> getTree(BusFormalitiesAreConsolidatedBo bo) {
List<BusListOfFormalitiesVo> vo = busFormalitiesAreConsolidatedService.getFormalitieTree(bo);
return R.ok(vo);
}
@SaCheckPermission("formalities:formalitiesAreConsolidated:getWhetherItExists")
// @SaCheckPermission("formalities:formalitiesAreConsolidated:getWhetherItExists")
@SaCheckPermission("formalities:formalitiesAreConsolidated:list")
@GetMapping("/getWhetherItExists")
public R<Boolean> getWhetherItExists(BusFormalitiesAreConsolidatedBo bo) {
return R.ok(busFormalitiesAreConsolidatedService.getWhetherItExists(bo));
@ -108,7 +115,8 @@ public class BusFormalitiesAreConsolidatedController extends BaseController {
/**
* 新增手续模板和合规性手续合账
*/
@SaCheckPermission("formalities:formalitiesAreConsolidated:addFormalities")
// @SaCheckPermission("formalities:formalitiesAreConsolidated:addFormalities")
@SaCheckPermission("formalities:formalitiesAreConsolidated:add")
@Log(title = "合规性手续合账", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/addFormalities")
@ -131,7 +139,8 @@ public class BusFormalitiesAreConsolidatedController extends BaseController {
/**
* 修改合规性手续合账
*/
@SaCheckPermission("formalities:formalitiesAreConsolidated:editStatus")
// @SaCheckPermission("formalities:formalitiesAreConsolidated:editStatus")
@SaCheckPermission("formalities:formalitiesAreConsolidated:edit")
@Log(title = "合规性手续合账", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping("/editStatus")
@ -151,4 +160,46 @@ public class BusFormalitiesAreConsolidatedController extends BaseController {
@PathVariable Long[] ids) {
return toAjax(busFormalitiesAreConsolidatedService.deleteWithValidByIds(List.of(ids), true));
}
/**
* 新增合规性手续附件
*/
@SaCheckPermission(value = {"formalities:formalitiesAreConsolidated:list","formalities:formalitiesAreConsolidated:add","formalities:formalitiesAreConsolidated:edit"},mode = SaMode.OR)
@Log(title = "合规性手续附件", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PutMapping("/fj")
public R<Void> add(BusFormalitiesAnnexBo bo,
@RequestPart("file") List<MultipartFile> file) {
return toAjax(busFormalitiesAnnexService.insertByBo(bo,file));
}
/**
* 查询合规性手续附件列表
*/
@SaCheckPermission(value = {"formalities:formalitiesAreConsolidated:list","formalities:formalitiesAreConsolidated:add","formalities:formalitiesAreConsolidated:edit"},mode = SaMode.OR)
@GetMapping("/listfj")
public TableDataInfo<BusFormalitiesAnnexVo> list(BusFormalitiesAnnexBo bo, PageQuery pageQuery) {
return busFormalitiesAnnexService.queryPageList(bo, pageQuery);
}
/**
* 删除合规性手续附件
*
* @param ids 主键串
*/
// @SaCheckPermission("formalities:formalitiesAnnex:remove")
@SaCheckPermission("formalities:formalitiesAreConsolidated:remove")
@Log(title = "合规性手续附件", businessType = BusinessType.DELETE)
@DeleteMapping("/fj/{ids}")
public R<Void> removefj(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(busFormalitiesAnnexService.deleteWithValidByIds(List.of(ids), true));
}
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/controller/BusListOfFormalitiesController.java
View File

@ -41,7 +41,7 @@ public class BusListOfFormalitiesController extends BaseController {
// return busListOfFormalitiesService.queryPageList(bo, pageQuery);
// }
/**
* 查询手续办理清单模板列表
* project:project:listSubMatrix
*/
@SaCheckPermission("formalities:listOfFormalities:list")
@GetMapping("/list")

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusEnterRoadController.java
View File

@ -127,7 +127,8 @@ public class BusEnterRoadController extends BaseController {
}
@SaCheckPermission("land:enterRoad:upload")
// @SaCheckPermission("land:enterRoad:upload")
@SaCheckPermission("land:enterRoad:list")
@PostMapping("/upload/{projectId}")
public R<Boolean> upload(MultipartFile file, @NotNull(message = "所属项目不明确")
@PathVariable Long projectId) {

17
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandBlockController.java
View File

@ -23,8 +23,10 @@ import org.dromara.common.web.core.BaseController;
import org.dromara.land.domain.BusLandBlock;
import org.dromara.land.domain.bo.BusLandBlockBo;
import org.dromara.land.domain.bo.BusLandBlockImportBo;
import org.dromara.land.domain.bo.LandUnitBo;
import org.dromara.land.domain.vo.BusLandBlockVo;
import org.dromara.land.service.IBusLandBlockService;
import org.dromara.land.service.IBusLandBlockUnitProjectService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -50,6 +52,8 @@ public class BusLandBlockController extends BaseController {
private final IBusLandBlockService busLandBlockService;
private final IBusLandBlockUnitProjectService busLandBlockUnitProjectService;
/**
* 查询地块信息列表
*/
@ -82,6 +86,16 @@ public class BusLandBlockController extends BaseController {
return R.ok(busLandBlockService.queryById(id));
}
@SaCheckPermission("land:landBlock:edit")
@Log(title = "地块关联方阵", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/LandUnit")
public R<Void> add(@Validated(AddGroup.class) @RequestBody LandUnitBo bo) {
busLandBlockUnitProjectService.insertBatch(bo.getLandId(), bo.getUnitBoList());
return toAjax(true);
}
/**
* 新增地块信息
*/
@ -118,7 +132,8 @@ public class BusLandBlockController extends BaseController {
return toAjax(busLandBlockService.deleteWithValidByIds(List.of(ids), true));
}
@SaCheckPermission("land:landBlock:upload")
// @SaCheckPermission("land:landBlock:upload")
@SaCheckPermission("land:landBlock:edit")
@PostMapping("/upload/{projectId}")
public R<Boolean> upload(MultipartFile file, @NotNull(message = "所属项目不明确")
@PathVariable Long projectId) {

43
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandTransferLedgerController.java
View File

@ -19,10 +19,12 @@ import org.dromara.common.web.core.BaseController;
import org.dromara.land.domain.BusLandTransferLedger;
import org.dromara.land.domain.BusLandTransferLedgerSon;
import org.dromara.land.domain.bo.BusLandTransferLedgerBo;
import org.dromara.land.domain.bo.BusLandTransferLedgerSonBo;
import org.dromara.land.domain.vo.BusLandTransferLedgerCountVo;
import org.dromara.land.domain.vo.BusLandTransferLedgerVo;
import org.dromara.land.service.IBusLandTransferLedgerService;
import org.dromara.land.service.impl.BusLandTransferLedgerSonServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -48,6 +50,41 @@ public class BusLandTransferLedgerController extends BaseController {
@Autowired
private BusLandTransferLedgerSonServiceImpl busLandTransferLedgerSonService;
/**
* 添加子级
*/
@SaCheckPermission("land:landTransferLedger:add")
@Log(title = "项目土地流转台账子级数据", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/childrenAdd")
public R<BusLandTransferLedgerSon> add(@RequestBody BusLandTransferLedgerSonBo busLandTransferLedgerSon){
BusLandTransferLedgerSon son = new BusLandTransferLedgerSon();
BeanUtils.copyProperties(busLandTransferLedgerSon, son);
boolean save = busLandTransferLedgerSonService.save(son);
if (save){
return R.ok(son);
}else {
return R.fail("添加子级失败");
}
}
/**
* 子级列表
*/
@SaCheckPermission("land:landTransferLedger:list")
@GetMapping("/childrenList")
public R<List<BusLandTransferLedgerSon>> getList(@RequestParam Long parentId){
LambdaQueryWrapper<BusLandTransferLedgerSon> lqw = new LambdaQueryWrapper<>();
lqw.eq(BusLandTransferLedgerSon::getParentId, parentId);
List<BusLandTransferLedgerSon> list = busLandTransferLedgerSonService.list(lqw);
return R.ok(list);
}
/**
* 查询项目土地流转台账列表
*/
@ -60,7 +97,7 @@ public class BusLandTransferLedgerController extends BaseController {
/**
* 查询项目土地流转台账方阵列表
*/
@SaCheckPermission("land:landTransferLedger:listUnit")
@SaCheckPermission("land:landTransferLedger:list")
@GetMapping("/listUnit")
public TableDataInfo<BusLandTransferLedgerVo> listUnit(BusLandTransferLedgerBo bo, PageQuery pageQuery) {
return busLandTransferLedgerService.queryUnitPageList(bo, pageQuery);
@ -125,7 +162,7 @@ public class BusLandTransferLedgerController extends BaseController {
}
@SaCheckPermission("land:landTransferLedger:count")
@SaCheckPermission("land:landTransferLedger:list")
@GetMapping("/count/{projectId}")
public R<BusLandTransferLedgerCountVo> count(@NotNull(message = "项目不能为空")
@PathVariable Long projectId) {
@ -135,7 +172,7 @@ public class BusLandTransferLedgerController extends BaseController {
/**
* 获取主页面三项主数据
*/
@SaCheckPermission("land:landTransferLedger:allCountValue")
@SaCheckPermission("land:landTransferLedger:list")
@GetMapping("/allCountValue/{projectId}")
R<Map<String,Object> > allCountValue(@PathVariable Long projectId){
LambdaQueryWrapper<BusLandTransferLedger> lambdaQueryWrapper = new LambdaQueryWrapper<>();

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/controller/OthDevicePresetController.java
View File

@ -97,7 +97,8 @@ public class OthDevicePresetController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("other:devicePreset:move")
// @SaCheckPermission("other:devicePreset:move")
@SaCheckPermission("other:devicePreset:edit")
@Log(title = "摄像头预置位", businessType = BusinessType.UPDATE)
@PutMapping("/move/{id}")
public R<Void> move(@NotNull(message = "主键不能为空")

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/controller/OthYs7DeviceImgController.java
View File

@ -1,6 +1,7 @@
package org.dromara.other.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
@ -81,7 +82,8 @@ public class OthYs7DeviceImgController extends BaseController {
/**
* 萤石摄像头图片抓图
*/
@SaCheckPermission("other:ys7DeviceImg:add")
// @SaCheckPermission("other:ys7DeviceImg:capture")
@SaCheckPermission(value = {"other:ys7DeviceImg:edit","other:ys7DeviceImg:add"},mode = SaMode.OR)
@Log(title = "萤石摄像头图片", businessType = BusinessType.INSERT)
@PostMapping("/capture")
public R<Void> capture(@RequestBody OthYs7DeviceImgCaptureReq req) {

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltKnowledgeDocumentController.java
View File

@ -95,7 +95,7 @@ public class QltKnowledgeDocumentController extends BaseController {
/**
* 新增质量知识库文件
*/
@SaCheckPermission("quality:knowledgeDocument:file")
@SaCheckPermission("quality:knowledgeDocument:add")
@Log(title = "质量知识库", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/file")
@ -106,7 +106,7 @@ public class QltKnowledgeDocumentController extends BaseController {
/**
* 修改质量知识库
*/
@SaCheckPermission("quality:knowledgeDocument:file")
@SaCheckPermission("quality:knowledgeDocument:edit")
@Log(title = "质量知识库", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping("/file")
@ -119,7 +119,7 @@ public class QltKnowledgeDocumentController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("quality:knowledgeDocument:file")
@SaCheckPermission("quality:knowledgeDocument:remove")
@Log(title = "质量知识库", businessType = BusinessType.DELETE)
@DeleteMapping("/file/{id}")
public R<Void> remove(@NotNull(message = "主键不能为空")
@ -132,7 +132,7 @@ public class QltKnowledgeDocumentController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("quality:knowledgeDocument:fileRecycleBin")
@SaCheckPermission("quality:knowledgeDocument:remove")
@Log(title = "质量知识库", businessType = BusinessType.DELETE)
@DeleteMapping("/file/recycleBin/{ids}")
public R<Void> removeRecycleBin(@NotNull(message = "主键不能为空")

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdCorrespondentList.java
View File

@ -84,7 +84,7 @@ public class XzdCorrespondentList {
/**
* 客户信息列表
*/
@SaCheckPermission("xzd:customertypeInfo:query")
@SaCheckPermission("xzd:customertypeInfo:list")
@GetMapping("/queryCustomertype")
public R<XzdClienteleListSumVo> queryCustomertype( XzdClienteleListDto dto, PageQuery pageQuery) {
return iXzdCorrespondentList.queryCustomertype(dto, pageQuery);