update 权限

nb-system/src/main/java/com/nb/bus/controller/BusClinicController.java

@@ -1,6 +1,7 @@
 package com.nb.bus.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -158,8 +159,8 @@ public class BusClinicController {
 
     @Log(title = "编辑病人（当前）信息")
     @PostMapping("/edit")
-    @SaCheckPermission("bus:clinic:edit")
-    @ApiOperation(value = "编辑病人（当前）信息",notes = "编辑病人临床信息,权限【bus:clinic:edit】")
+    @SaCheckPermission(value = {"bus:clinic:edit","device:manual:edit"},mode = SaMode.OR)
+    @ApiOperation(value = "编辑病人（当前）信息",notes = "编辑病人临床信息,权限【bus:clinic:edit】或【device:manual:edit】")
     public R<Boolean> edit(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId, @RequestBody@Validated(GenericEntity.Update.class) ClinicEditVo entity){
         if(entity.getHaveDevice()){
             BusClinicEntity clinic = entity.getClinic();
@@ -178,10 +179,10 @@ public class BusClinicController {
         }
     }
 
-    @Log(title = "新增无泵监控手术信息")
+    @Log(title = "新增其他监控手术信息")
     @PostMapping("/save")
-    @SaCheckPermission("bus:clinic:save")
-    @ApiOperation(value = "新增手术信息",notes = "新增病人信息,权限【bus:clinic:save】")
+    @SaCheckPermission(value = {"bus:clinic:save","device:manual:add"},mode = SaMode.OR)
+    @ApiOperation(value = "新增手术信息",notes = "新增病人信息,权限【bus:clinic:save】或【device:manual:add】")
     public R save(@RequestBody ClinicEditVo entity){
         deviceManualService.save(entity.getManual(),entity.getClinic());
         return R.success();
@@ -190,8 +191,8 @@ public class BusClinicController {
 
     @Log(title = "修改术前访视单")
     @PostMapping("/edit/visit")
-    @SaCheckPermission("bus:clinic:edit")
-    @ApiOperation(value = "修改术前访视单",notes = "修改术前访视单,权限【bus:clinic:edit】")
+    @SaCheckPermission("manual:visit:edit")
+    @ApiOperation(value = "修改术前访视单",notes = "修改术前访视单,权限【manual:visit:edit】")
     public R editVisit(@RequestBody@Validated VisitRecord source){
         if (clinicService.update(new UpdateWrapper<BusClinicEntity>().lambda().eq(BusClinicEntity::getId,source.getClinicId())
                 .set(BusClinicEntity::getVisitRecord,source.getContent()))) {
@@ -228,8 +229,8 @@ public class BusClinicController {
     }
 
     @PostMapping("/edit/any")
-    @SaCheckPermission("bus:clinic:edit")
-    @ApiOperation(value = "根据ID修改数据（所有临床数据）",notes = "新增病人信息,权限【bus:clinic:edit】")
+    @SaCheckPermission(value = {"bus:clinic:edit","bus:monitor:edit"},mode = SaMode.OR)
+    @ApiOperation(value = "根据ID修改数据（所有临床数据）",notes = "新增病人信息,权限【bus:clinic:edit】或【bus:monitor:edit】")
     public R update(@RequestBody @Validated(GenericEntity.Update.class)BusClinicEntity payload){
         return clinicService.updateById(payload)?R.success(payload):R.fail("更新失败");
     }

nb-system/src/main/java/com/nb/bus/controller/BusEvaluationController.java

@@ -35,7 +35,7 @@ public class BusEvaluationController extends BaseCrudController<BusEvaluationEnt
 
 
     @PostMapping("/query/page")
-    @SaCheckPermission("bus:eval:query")
+    @SaCheckPermission({"bus:eval:query"})
     @ApiOperation(value = "评价(输注查询)查询",notes = "权限：【bus:eval:query】")
     public R<IPage<BusEvaluationEntity>> page(@RequestBody @Validated EvalQuery query){
         return R.success(evaluationService.pageQuery(query));

nb-system/src/main/java/com/nb/bus/controller/BusPatientController.java

@@ -2,6 +2,7 @@ package com.nb.bus.controller;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
@@ -16,7 +17,6 @@ import com.nb.bus.controller.vo.MonitorFinishedVo;
 import com.nb.bus.entity.*;
 import com.nb.bus.enums.DeviceStatusEnum;
 import com.nb.bus.enums.PatientAlarmEnum;
-import com.nb.bus.registry.patient.PatientOperator;
 import com.nb.bus.registry.patient.PatientRegistry;
 import com.nb.bus.service.*;
 import com.nb.bus.service.dto.*;
@@ -53,8 +53,6 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
 
     private final LocalBusClinicService clinicService;
 
-    private final PatientRegistry patientRegistry;
-
     private final LocalBusInfusionHistoryService infusionService;
 
     private final LocalBusDeviceManualService manualService;
@@ -62,6 +60,7 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
     private final WsPublishUtils wsPublishUtils;
 
     private final LocalBusDeviceService deviceService;
+
     @PostMapping("/no_page")
     @SaCheckPermission("device:patient:query")
     @ApiOperation(value = "输注监控列表",notes = "病人监控管理列表，权限【device:patient:query】")
@@ -205,8 +204,8 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
 
 
     @PostMapping("/monitor/reset/{clinicId}")
-    @SaCheckPermission("device:patient:edit")
-    @ApiOperation(value = "病人当前监控时间重启",notes = "当结束临床后有新的输注信息产生，那么病人监控会重新显示，此时监控时间不会重新计算，需先调用该接口，权限标识为【device:patient:edit】")
+    @SaCheckPermission("device:clinic:edit")
+    @ApiOperation(value = "病人当前监控时间重启",notes = "当结束临床后有新的输注信息产生，那么病人监控会重新显示，此时监控时间不会重新计算，需先调用该接口，权限标识为【device:clinic:edit】")
     public R<Boolean> reset(@ApiParam("临床id")@PathVariable("clinicId")String clinicId){
         log.info("病人当前监控时间重启,【{}】",clinicId);
         R<Boolean> result = R.success(clinicService.update(new UpdateWrapper<BusClinicEntity>().lambda().eq(BusClinicEntity::getId, clinicId)
@@ -230,8 +229,8 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
     }
 
     @PostMapping("/shift")
-    @SaCheckPermission("device:patient:shift")
-    @ApiOperation(value = "主泵切换的操作,只切换，不结束",notes = "当出现泵重复状态时，若用户想要进行主泵的切换，调用该接口进行操作，主泵切换完成后，会将副泵自动撤泵，权限标识为【device:patient:shift】")
+    @SaCheckPermission("device:clinic:edit")
+    @ApiOperation(value = "主泵切换的操作,只切换，不结束",notes = "当出现泵重复状态时，若用户想要进行主泵的切换，调用该接口进行操作，主泵切换完成后，会将副泵自动撤泵，权限标识为【device:clinic:edit】")
     public R shift(@RequestBody@Validated DeviceShiftConfig shiftConfig){
         log.info("主泵切换的操作,【{}】",JSONUtil.toJsonStr(shiftConfig));
         patientService.shift(shiftConfig);
@@ -240,8 +239,8 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
     }
 
     @PostMapping("/undo")
-    @SaCheckPermission("device:patient:undo")
-    @ApiOperation(value = "批量撤泵,只撤泵，不切换",notes = "当出现泵重复状态时，若用户想要取消对其他副泵的监控，则调用此接口进行撤泵操作，权限标识为【device:patient:undo】")
+    @SaCheckPermission("device:clinic:edit")
+    @ApiOperation(value = "批量撤泵,只撤泵，不切换",notes = "当出现泵重复状态时，若用户想要取消对其他副泵的监控，则调用此接口进行撤泵操作，权限标识为【device:clinic:edit】")
     public R shift(@RequestBody@Validated ManualUndoConfig undoConfig, @RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId){
         log.info("批量撤泵,【{}】",JSONUtil.toJsonStr(undoConfig));
         undoConfig.setTenantId(tenantId);
@@ -257,8 +256,8 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
 
 
     @PostMapping("/monitor")
-    @SaCheckPermission("device:patient:query")
-    @ApiOperation(value = "查看病人当前监控详情",notes = "查看病人当前监控详情，权限标识为【device:patient:query】")
+    @SaCheckPermission(value = {"device:patient:query","device:manual:query"},mode = SaMode.OR)
+    @ApiOperation(value = "查看病人当前监控详情",notes = "查看病人当前监控详情，权限标识为【device:patient:query】或【device:manual:query】")
     public R<PatientMonitorDetailResult> monitor(@RequestBody@Validated MonitorDetailVo vo){
         log.info("查看病人监控详情,【{}】", JSONUtil.toJsonStr(vo));
         PatientMonitorDetailResult result = new PatientMonitorDetailResult();
@@ -326,15 +325,15 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
 
 
     @PostMapping("/pull/async")
-    @SaCheckPermission("device:patient:pull")
-    @ApiOperation(value = "异步更新患者信息,超时时间默认为10s,超时后数据返回继续处理,输注监控",notes = "权限标识为【bus:patient:pull】")
+    @SaCheckPermission("bus:clinic:edit")
+    @ApiOperation(value = "异步更新患者信息,超时时间默认为10s,超时后数据返回继续处理,输注监控",notes = "权限标识为【bus:clinic:edit】")
     public DeferredResult<R<BusClinicEntity>> syn(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId, @Validated@RequestBody GetPatientInfoVo vo){
         return patientService.getPatientInfoFromHis(tenantId,vo.getPatientCode(),vo.getTimeout(),false);
     }
 
 
-    @SaCheckPermission("device:patient:query")
-    @ApiOperation(value = "泵重复绑定数量",notes = "权限标识为【bus:patient:query】")
+    @SaCheckPermission("bus:clinic:edit")
+    @ApiOperation(value = "泵重复绑定数量",notes = "权限标识为【bus:clinic:edit】")
     @PostMapping("/_count/repeat")
     public R<Integer> repeatCount(){
         return R.success(CollUtil.size(patientService.repeatDevice()));
@@ -355,8 +354,8 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
      * @return R
      */
     @PostMapping("/pull/sync")
-    @SaCheckPermission("device:patient:pull")
-    @ApiOperation(value = "同步更新患者信息,超时时间默认为10s,超时后数据返回则不进行处理,无泵更新",notes = "权限标识为【bus:patient:pull】")
+    @SaCheckPermission("bus:clinic:edit")
+    @ApiOperation(value = "同步更新患者信息,超时时间默认为10s,超时后数据返回则不进行处理,无泵更新",notes = "权限标识为【bus:clinic:edit】")
     public DeferredResult<R<BusClinicEntity>>  async(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId,@Validated @RequestBody GetPatientInfoVo vo){
         return patientService.getPatientInfoFromHis(tenantId,vo.getPatientCode(),vo.getTimeout(),true);
     }