权限

common/src/main/java/com/koobietech/eas/common/result/PageData.java

@@ -2,13 +2,11 @@ package com.koobietech.eas.common.result;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class PageData {
     private long total = 0;
-    private List data = null;
-    public static PageData init(List data, long total){
+    private Object data = null;
+    public static PageData init(Object data, long total){
         PageData ret = new PageData();
         ret.setData(data);
         ret.setTotal(total);

controller/src/main/java/com/koobietech/eas/controller/EasDepartmentController.java

@@ -11,18 +11,20 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping("/department")
+//系统部门控制器
 public class EasDepartmentController {
 
     @Resource
     EasDepartmentService easDepartmentService;
 
-
+    //查询部门
     @GetMapping("/query")
-    public PageData query(@RequestParam Long id) {
+    public JsonResult query(@RequestParam Long id) {
         PageData ret = easDepartmentService.query(id);
-        return ret;
+        return JsonResult.data(ret);
     }
 
+    //添加部门
     @PostMapping("/add")
     public JsonResult add(@RequestBody EasSysDepartment department) {
         Boolean ret = easDepartmentService.add(department);
@@ -33,6 +35,7 @@ public class EasDepartmentController {
     }
 
 
+    //删除部门
     @DeleteMapping("/delete")
     public JsonResult delete(@RequestParam Long id) {
         Boolean ret = easDepartmentService.delete(id);
@@ -42,7 +45,7 @@ public class EasDepartmentController {
         return JsonResult.fail();
     }
 
-
+    //修改部门
     @PutMapping("/update")
     public JsonResult update(@RequestBody EasSysDepartment department) {
         Boolean ret = easDepartmentService.update(department);

controller/src/main/java/com/koobietech/eas/controller/EasPermissionController.java

@@ -11,34 +11,40 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping("/permission")
+//系统权限控制器
 public class EasPermissionController {
 
     @Resource
     EasPermissionService easPermissionService;
 
+    //首页
     @GetMapping("/home")
     public String home(){
         return "home";
     }
 
 
+    //排课信息
     @GetMapping("/lesson")
     public String lesson(){
         return "lesson";
     }
 
 
+    //排课表下载
     @GetMapping("/lesson-download")
     public String download(){
         return "lesson-download";
     }
 
+    //查询权限
     @GetMapping("/query")
-    public PageData query(@RequestParam Integer id){
+    public JsonResult query(@RequestParam Integer id){
         PageData ret = easPermissionService.query(id);
-        return ret;
+        return JsonResult.data(ret);
     }
 
+    //添加权限
     @PostMapping("/add")
     public JsonResult add(@RequestBody EasSysPermission permission){
         Boolean ret = easPermissionService.add(permission);
@@ -48,6 +54,7 @@ public class EasPermissionController {
         return JsonResult.fail();
     }
 
+    //删除权限
     @DeleteMapping("/delete")
     public JsonResult delete(@RequestParam Integer id){
         Boolean ret = easPermissionService.delete(id);
@@ -57,6 +64,7 @@ public class EasPermissionController {
         return JsonResult.fail();
     }
 
+    //修改权限
     @PutMapping("/update")
     public JsonResult update(@RequestBody EasSysPermission permission){
         Boolean ret = easPermissionService.update(permission);

controller/src/main/resources/application-dev.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   datasource:
     url: jdbc:mysql://39.105.160.25:10992/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false

controller/src/main/resources/application-local.yaml

@@ -1,31 +0,0 @@
-server:
-  port: 8081
-spring:
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
-    username: root
-    password: 1234
-    driver-class-name: com.mysql.cj.jdbc.Driver
-  redis:
-    host: localhost
-    database: 9
-    password:
-    port: 26379
-  security:
-    user:
-      name: admin
-      password: 123456
-springdoc:
-  version: v0.0.1
-  api-docs:
-    enabled: true
-  swagger-ui:
-    enabled: true
-knife4j:
-  enable: true
-  setting:
-    language: zh_cn
-logging:
-  level:
-    com.koobietech.eas.*: TRACE
-

controller/src/main/resources/application.yaml

@@ -2,7 +2,7 @@ server:
   port: 8080
 spring:
   profiles:
-    active: local
+    active: dev
   main:
     allow-circular-references: true
   servlet:
@@ -29,7 +29,8 @@ knife4j:
 security:
   url:
     ignored:
-      - /**
+      - /permission/**
+      - /department/**
 eas:
   jwt-secret-key: 123456
   jwt-expires-date: 1

service/pom.xml

@@ -29,7 +29,12 @@
         <dependency>
             <groupId>com.koobietech.eas</groupId>
             <artifactId>mbg</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.koobietech.eas</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

service/src/main/java/com/koobietech/eas/service/EasDepartmentService.java

@@ -3,11 +3,15 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 
-
+//系统部门服务器
 public interface EasDepartmentService {
 
+    //修改部门
     Boolean update(EasSysDepartment department);
+    //添加部门
     Boolean add(EasSysDepartment department);
+    //删除部门
     Boolean delete(Long id);
+    //查询部门
     PageData query(Long id);
 }

service/src/main/java/com/koobietech/eas/service/EasPermissionService.java

@@ -3,10 +3,15 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 
+//系统权限服务器
 public interface EasPermissionService {
 
+    //修改权限
     Boolean update(EasSysPermission record);
+    //添加权限
     Boolean add(EasSysPermission record);
+    //删除权限
     Boolean delete(Integer id);
+    //查询权限
     PageData query(Integer id);
 }

service/src/main/java/com/koobietech/eas/service/impl/EasDepartmentServiceImpl.java

@@ -13,17 +13,20 @@ import java.util.List;
 
 
 @Service
+//系统部门服务器实现
 public class EasDepartmentServiceImpl implements EasDepartmentService {
 
     @Resource
     EasSysDepartmentMapper easSysDepartmentMapper;
 
     @Override
+    //修改部门
     public Boolean update(EasSysDepartment department) {
         return easSysDepartmentMapper.updateByPrimaryKey(department) == 1;
     }
 
     @Override
+    //添加部门
     public Boolean add(EasSysDepartment department) {
         department.setCreateTime(new Date());
         department.setModifyTime(new Date());
@@ -31,11 +34,13 @@ public class EasDepartmentServiceImpl implements EasDepartmentService {
     }
 
     @Override
+    //删除部门
     public Boolean delete(Long id) {
         return easSysDepartmentMapper.deleteByPrimaryKey(id) == 1;
     }
 
     @Override
+    //查询部门
     public PageData query(Long id) {
 
 

service/src/main/java/com/koobietech/eas/service/impl/EasPermissionServiceImpl.java

@@ -12,16 +12,19 @@ import java.util.Date;
 import java.util.List;
 
 @Service
+//系统权限服务器实现
 public class EasPermissionServiceImpl implements EasPermissionService {
 
     @Resource
     EasSysPermissionMapper easSysPermissionMapper;
 
+    //修改权限
     @Override
     public Boolean update(EasSysPermission permission) {
         return easSysPermissionMapper.updateByPrimaryKey(permission) == 1;
     }
 
+    //添加权限
     @Override
     public Boolean add(EasSysPermission permission) {
         permission.setCreateTime(new Date());
@@ -29,11 +32,13 @@ public class EasPermissionServiceImpl implements EasPermissionService {
         return easSysPermissionMapper.insert(permission) == 1;
     }
 
+    //删除权限
     @Override
     public Boolean delete(Integer id) {
         return easSysPermissionMapper.deleteByPrimaryKey(id) == 1;
     }
 
+    //查询权限
     @Override
     public PageData query(Integer id) {
 
@@ -42,7 +47,7 @@ public class EasPermissionServiceImpl implements EasPermissionService {
         criteria.andIdEqualTo(id);
 
         List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
-        PageData ret = new PageData();
+        PageData ret = new PageData( );
         ret.setData(easSysPermissions);
         ret.setTotal(1);
         return ret;