From 2d445bf6ada18528d98598c262ac1b0bfae8b98f Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Sat, 10 Jan 2026 19:38:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86]=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxhq/business/controller/SjController.java | 24 ++++++++++++++++++---- .../com/hxhq/business/controller/YqController.java | 20 ++++++++++++------ .../java/com/hxhq/business/form/yq/YqForm.java | 10 +++++++++ 3 files changed, 44 insertions(+), 10 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java index eac7274..f3dc7fa 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java @@ -11,6 +11,7 @@ import com.hxhq.business.form.sj.*; import com.hxhq.business.service.ISjService; import com.hxhq.business.service.ISjTzService; import com.hxhq.business.service.ISjJcgjService; +import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -54,6 +55,7 @@ public class SjController extends BaseController * 稽查轨迹列表 */ @GetMapping("/jcgjList") + @RequiresPermissions("business:resource:sj:list") public TableDataInfo jcgjList(SjJcgj form) { startPage(); @@ -65,6 +67,7 @@ public class SjController extends BaseController * 台账列表 */ @GetMapping("/tzList") + @RequiresPermissions("business:resource:sj:list") public TableDataInfo tzList(SjTz form) { startPage(); @@ -73,9 +76,10 @@ public class SjController extends BaseController } /** - * 查询试剂库存列表 + * 查询试剂列表 */ @GetMapping("/list") + @RequiresPermissions("business:resource:sj:list") public TableDataInfo list(SjSearchListForm form) { startPage(); @@ -84,18 +88,20 @@ public class SjController extends BaseController } /** - * 获取试剂库存详细信息 + * 获取试剂详细信息 */ @GetMapping(value = "/info") + @RequiresPermissions("business:resource:sj:xq") public AjaxResult getInfo(Long id) { return AjaxResult.success(sjService.getById(id)); } /** - * 新增试剂库存信息 + * 编辑试剂信息 */ - @PostMapping("/save") + @PostMapping("/bj") + @RequiresPermissions("business:resource:sj:bj") public AjaxResult save(@RequestBody SjBjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -107,6 +113,7 @@ public class SjController extends BaseController * 修改库存 */ @PostMapping("xgkc") + @RequiresPermissions("business:resource:sj:xgkc") public AjaxResult xgkc(@RequestBody @Validated SjXgkcForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -116,6 +123,7 @@ public class SjController extends BaseController /** 处置 */ @PostMapping("/cz") + @RequiresPermissions("business:resource:sj:cz") public AjaxResult cz(@RequestBody @Validated CzSjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -125,6 +133,7 @@ public class SjController extends BaseController /** 批量处置 */ @PostMapping("/plcz") + @RequiresPermissions("business:resource:sj:cz") public AjaxResult plcz(@RequestBody @Validated PlczSjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -134,6 +143,7 @@ public class SjController extends BaseController /** 锁定 */ @PostMapping("/sd") + @RequiresPermissions("business:resource:sj:sd") public AjaxResult sd(@RequestBody @Validated SdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -143,6 +153,7 @@ public class SjController extends BaseController /** 批量锁定 */ @PostMapping("/plsd") + @RequiresPermissions("business:resource:sj:sd") public AjaxResult plsd(@RequestBody @Validated SdSjForm form) { if(form.getIds() == null || form.getIds().length == 0) { @@ -155,6 +166,7 @@ public class SjController extends BaseController /** 解锁 */ @PostMapping("/js") + @RequiresPermissions("business:resource:sj:js") public AjaxResult js(@RequestBody @Validated JsSjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -166,6 +178,7 @@ public class SjController extends BaseController * 借阅 */ @PostMapping("/jy") + @RequiresPermissions("business:resource:sj:jy") public AjaxResult jy(@RequestBody @Validated JySjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -177,6 +190,7 @@ public class SjController extends BaseController * 解档 */ @PostMapping("/jd") + @RequiresPermissions("business:resource:sj:jd") public AjaxResult jd(@RequestBody @Validated JdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -188,6 +202,7 @@ public class SjController extends BaseController * 批量归档 */ @PostMapping("/plgd") + @RequiresPermissions("business:resource:sj:gd") public AjaxResult plgd(@RequestBody GdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); @@ -199,6 +214,7 @@ public class SjController extends BaseController * 归档 */ @PostMapping("/gd") + @RequiresPermissions("business:resource:sj:gd") public AjaxResult gd(@RequestBody @Validated GdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java index 1d2e670..0d934de 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java @@ -8,6 +8,7 @@ import com.hxhq.business.domain.YqJcgj; import com.hxhq.business.form.yq.YqForm; import com.hxhq.business.form.yq.YqSearchForm; import com.hxhq.business.service.IYqJcgjService; +import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +40,7 @@ public class YqController extends BaseController { * 查询仪器管理列表 */ @GetMapping("/list") + @RequiresPermissions("business:resource:yq:list") public TableDataInfo list(YqSearchForm form) { startPage(); List list = yqService.queryList(form); @@ -48,6 +50,7 @@ public class YqController extends BaseController { /** * 查询仪器稽查轨迹列表 */ + @RequiresPermissions("business:resource:yq:list") @GetMapping("/jcgj/list") public TableDataInfo list(Long id) { if(id == null ) { @@ -63,6 +66,7 @@ public class YqController extends BaseController { /** * 获取仪器管理详细信息 */ + @RequiresPermissions("business:resource:yq:xq") @GetMapping(value = "/info") public AjaxResult getInfo(Long id) { return AjaxResult.success(yqService.getById(id)); @@ -72,14 +76,18 @@ public class YqController extends BaseController { * 新增、编辑仪器管理信息 */ @PostMapping("/save") + @RequiresPermissions("business:resource:yq:xz") public AjaxResult save(@RequestBody @Validated YqForm form) { - // TODO 签名密码校验 - if(form.getId() != null) { - yqService.updateYq(form); - } else { - yqService.addYq(form); - } + form.setQmrId(SecurityUtils.getUserId()); + yqService.addYq(form); return success(); } + @PostMapping("/update") + @RequiresPermissions("business:resource:yq:bj") + public AjaxResult update(@RequestBody @Validated YqForm form) { + form.setQmrId(SecurityUtils.getUserId()); + yqService.updateYq(form); + return success(); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java index 61b494c..487c16c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java @@ -76,6 +76,16 @@ public class YqForm { @NotNull(message = "请输入签名人密码") private String qmrmm; + private Long qmrId; + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + public Long getId() { return id; }