Browse Source

增加权限申请接口

yangxiaokun 3 years ago
parent
commit
87b6f997f1

+ 1 - 0
src/main/java/com/zy/bms/config/CorsConfig.java

@@ -11,6 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Profile("dev")
 @Configuration
 public class CorsConfig implements WebMvcConfigurer {
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         //设置允许跨域的路径

+ 0 - 4
src/main/java/com/zy/bms/controller/ItemController.java

@@ -1,16 +1,12 @@
 package com.zy.bms.controller;
 
-
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zy.bms.common.ServerResponse;
-import com.zy.bms.entity.Group;
 import com.zy.bms.entity.Item;
-import com.zy.bms.pojo.io.GroupIO;
 import com.zy.bms.pojo.io.ItemIO;
 import com.zy.bms.service.IItemService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;

+ 1 - 2
src/main/java/com/zy/bms/controller/PrivilegeApplyController.java

@@ -4,7 +4,6 @@ package com.zy.bms.controller;
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.entity.PrivilegeApplyRecord;
 import com.zy.bms.pojo.io.PrivilegeApplyIO;
-import com.zy.bms.service.IGroupService;
 import com.zy.bms.service.IPrivilegeApplyRecordService;
 import com.zy.bms.service.IUserPrivilegeService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -55,7 +54,7 @@ public class PrivilegeApplyController extends BaseController {
         //审核时间
         entity.setAuditTime(LocalDateTime.now());
         //保存有权限的设备组
-        userPrivilegeService.saveBatch(userId(), groups);
+        if (entity.getStatus() != null && entity.getStatus() == 1) userPrivilegeService.saveBatch(userId(), groups);
         //更新申请记录
         privilegeApplyRecordService.updateById(entity);
         return ServerResponse.success();

+ 28 - 0
src/main/resources/application-ailishi.yml

@@ -0,0 +1,28 @@
+server:
+  port: 9001 # Key product method
+spring:
+  redis:
+    host: localhost
+    port: 6379
+    timeout: 10000
+#    password: CHENyi_406
+  jackson:
+    default-property-inclusion: non_null
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  # MySQL
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://59.110.141.39:3306/bms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=true
+    username: useryxk
+    password: CHENyi406@
+    dbcp2:
+      min-idle: 10
+      initial-size: 15
+      max-total: 20
+      max-wait-millis: 2000
+# mybatis-plus
+mybatis-plus:
+  type-aliases-package: com.zy.bms.entity
+  mapper-locations: classpath:mapper/*.xml

+ 1 - 1
src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: ailishi