Explorar o código

fix用户删除后删除相应的关联角色

A17404李放 %!s(int64=3) %!d(string=hai) anos
pai
achega
e4a31f6066

+ 5 - 0
nb-common/src/main/java/com/nb/common/config/MinioConfig.java

@@ -14,8 +14,13 @@ import org.springframework.stereotype.Component;
 @Data
 public class MinioConfig {
 
+
     private String endpoint;
 
+    private int port;
+
+    private boolean secure;
+
     private String accessKey;
 
     private String secretKey;

+ 1 - 1
nb-common/src/main/java/com/nb/common/util/MinioUtil.java

@@ -29,7 +29,7 @@ public class MinioUtil {
     @Bean
     private MinioClient minioClient() {
         MinioClient minioClient = MinioClient.builder()
-                .endpoint(minioConfig.getEndpoint())
+                .endpoint(minioConfig.getEndpoint(),minioConfig.getPort(),minioConfig.isSecure())
                 .credentials(minioConfig.getAccessKey(), minioConfig.getSecretKey())
                 .build();
         return minioClient;

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

@@ -78,8 +78,8 @@ public class BusClinicController {
 
     @Log(title = "查询临床信息的镇痛访视记录单")
     @PostMapping("/anal/record/{clinicId}/{after}")
-    @SaCheckPermission(value = {"bus:clinic:query","bus:patient:query"},mode = SaMode.OR)
-    @ApiOperation(value = "查询临床信息的镇痛访视记录单",notes = "权限【bus:clinic:query】或【bus:patient:query】")
+    @SaCheckPermission(value = {"bus:clinic:query","device:patient:query"},mode = SaMode.OR)
+    @ApiOperation(value = "查询临床信息的镇痛访视记录单",notes = "权限【bus:clinic:query】或【device:patient:query】")
     public R<ClinicAnalRecordResult> analRecord(@PathVariable("clinicId") String clinicId,@PathVariable("after")@ApiParam("0、术前 1、术后") Boolean after,@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId){
         log.info("查询临床访视单【{}】",clinicId);
         ClinicAnalRecordResult result = new ClinicAnalRecordResult();

+ 2 - 2
nb-system/src/main/java/com/nb/bus/controller/BusStatsAnalyseController.java

@@ -49,8 +49,8 @@ public class BusStatsAnalyseController {
     }
 
     @PostMapping("/{type}")
-    @SaCheckPermission("stats:analgesia:query")
-    @ApiOperation("统计")
+    @SaCheckPermission("stats:analgesia:*")
+    @ApiOperation(value = "统计",notes = "权限 【stats:analgesia:*】 模糊匹配")
     public R stats(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId,@PathVariable("type")@ApiParam("统计类型 1、PCA镇痛分析 2、提示分析 3、评价分析 4、自控分析 5、输注量分析") Integer type, @RequestBody @Validated CombineQuery query){
         if (StrUtil.isBlank(tenantId)) {
             throw new TenantException();

+ 4 - 4
nb-system/src/main/java/com/nb/bus/controller/BusVersionController.java

@@ -24,7 +24,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/bus/version")
-@Api(tags = "版本管理",description="版本管理")
+@Api(tags = "版本管理",description="版本管理    权限: bus:version: ")
 public class BusVersionController extends BaseCrudController<BusVersionEntity,String> {
     @Resource
     private LocalBusVersionService versionService;
@@ -39,8 +39,8 @@ public class BusVersionController extends BaseCrudController<BusVersionEntity,St
 
 
     @PostMapping
-    @SaCheckPermission("bus:app:save")
-    @ApiOperation(value="上传安装包",notes = "权限【bus:app:save】")
+    @SaCheckPermission("bus:version:save")
+    @ApiOperation(value="上传安装包",notes = "权限【bus:version:save】")
     public R save(@RequestBody BusVersionEntity busVersionEntity) {
         if(CharSequenceUtil.isAllBlank(busVersionEntity.getId())){
             BusVersionEntity exist = versionService.getOne(new QueryWrapper<BusVersionEntity>().lambda().last("limit 1"));
@@ -59,6 +59,6 @@ public class BusVersionController extends BaseCrudController<BusVersionEntity,St
 
     @Override
     public String getPermissionPrefix() {
-        return "bus:app";
+        return "bus:version";
     }
 }