update:修改常量查询

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/PatientMonitorController.java

@@ -21,6 +21,10 @@ import com.nb.app.doctor.controller.vo.*;
 import com.nb.app.doctor.controller.vo.ChangeManageVo;
 import com.nb.app.doctor.controller.vo.InviteCodeVo;
 import com.nb.app.doctor.controller.vo.UpdateBindPatientVo;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.common.BusDeviceRunningEntity;
+import com.nb.web.api.enums.DeviceStatusEnum;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import com.nb.web.api.feign.query.DoctorPatientMonitorQuery;
 import com.nb.web.api.feign.result.DoctorPatientMonitorResult;
 import com.nb.app.doctor.service.dto.PatientMonitorConsultResult;
@@ -47,6 +51,7 @@ import com.nb.web.service.bus.service.LocalBusDeviceManualService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.service.LocalBusPatientService;
 import com.nb.web.service.bus.service.constant.AbstractConstantService;
+import com.nb.web.service.bus.service.dto.ConstantQuery;
 import com.nb.web.service.bus.service.dto.DeviceHistoryQuery;
 import com.nb.web.service.bus.service.dto.ManualUndoConfig;
 import com.nb.web.service.bus.utils.WsPublishUtils;
@@ -244,9 +249,10 @@ public class PatientMonitorController {
     }
 
     @PostMapping("/do/{monitorType}/finished")
+    @SaCheckPermission("app:finished:*")
     @Log(title = "手动结束管理")
     @ApiResponse(code = 4001,message = "病号当前绑定了多个设备，不可结束管理")
-    @ApiOperation(value = "手动结束管理",notes = "病患当前绑定主设备必须要在关机、不在服务器、待机中才能结束管理")
+    @ApiOperation(value = "手动结束管理",notes = "病患当前绑定主设备必须要在关机、不在服务器、待机中才能结束管理,权限【app:finished:*】")
     public R<Boolean> appFinished(@PathVariable("monitorType")@ApiParam(value = "是否为无泵管理 false、无泵 true、有泵",defaultValue = "false" ) boolean haveDevice,
                                   @RequestBody MonitorFinishedVo monitorFinishedVo,
                                   @RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId) {
@@ -320,18 +326,14 @@ public class PatientMonitorController {
         return R.success(historyService.pageQuery(query));
     }
 
-    @PostMapping("/{type}/page")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "type",value = "常量类型",required = true,allowableValues = "mix,doctor,alarm",allowMultiple = true,dataTypeClass = ConstantEnum.class),
-            @ApiImplicitParam(name = "query",value = "查询参数",required = true)
-    })
+    @PostMapping("/constant/page")
     @ApiOperation(value = "使用POST方式分页动态查询")
-    public R<IPage<?>> queryPager(@PathVariable("type") ConstantEnum type,@RequestBody QueryParamEntity<?> query) {
-        AbstractConstantService constantService = constantHashMap.get(type);
+    public R<IPage<?>> queryPager(@RequestBody ConstantQuery query) {
+        AbstractConstantService constantService = constantHashMap.get(query.getType());
         if(constantService==null){
-            return R.fail("常量类型{"+type+"}不存在");
+            return R.fail("常量类型{"+query.getType()+"}不存在");
         }
-        return R.success(constantService.list(query));
+        return R.success(constantService.list(query.getQuery()));
     }
 
     /**

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ConstantQuery.java

@@ -0,0 +1,25 @@
+package com.nb.web.service.bus.service.dto;
+
+import com.nb.core.entity.QueryParamEntity;
+import com.nb.web.service.bus.enums.ConstantEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zzy
+ * @Data 2025/4/17
+ * @Version 1.0
+ * @Description XXX
+ */
+@ApiModel("常量查询请求参数")
+@Data
+public class ConstantQuery {
+
+    @ApiModelProperty(value = "常量类型",required = true,allowableValues = "mix,doctor,alarm")
+    private ConstantEnum type;
+
+    @ApiModelProperty(value = "查询参数",required = true)
+    private QueryParamEntity query;
+
+}