Merge branch 'cuidi' of wuheng/eas-system into master

.gitignore

@@ -7,6 +7,9 @@ target/
 sys-debug.log
 sys-error.log
 sys-info.log
+sys-debug*
+sys-info*
+sys-error*
 
 ### STS ###
 .apt_generated

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

@@ -0,0 +1,66 @@
+package com.koobietech.eas.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasSysDepartment;
+import com.koobietech.eas.service.EasDepartmentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@Tag(name = "部门模块")
+@RequestMapping("/department")
+public class EasDepartmentController {
+
+    @Resource
+    EasDepartmentService easDepartmentService;
+
+
+    @PostMapping("/query")
+    @Operation(summary = "查询部门" ,  description = "根据参数查询基本信息")
+    public JsonResult query(@RequestBody EasSysDepartment department,
+                            @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easDepartmentService.query(department);
+        return JsonResult.data(ret);
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "添加部门" ,  description = "添加部门信息")
+    public JsonResult add(@RequestBody EasSysDepartment department) {
+        Boolean ret = easDepartmentService.add(department);
+        if (ret) {
+            return JsonResult.data(ret);
+        }
+        return JsonResult.fail();
+    }
+
+
+    @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除部门" ,  description = "删除部门根据ID")
+    public JsonResult delete(@PathVariable(name="id") Long id) {
+        Boolean ret = easDepartmentService.delete(id);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+
+    @PutMapping("/update")
+    @Operation(summary = "更新部门" ,  description = "更新部门信息根据ID")
+    public JsonResult update(@RequestBody EasSysDepartment department) {
+        Boolean ret = easDepartmentService.update(department);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+
+}

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

@@ -0,0 +1,61 @@
+package com.koobietech.eas.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasSysPermission;
+import com.koobietech.eas.service.EasPermissionService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@Tag(name = "权限模块")
+@RequestMapping("/permission")
+public class EasPermissionController {
+
+    @Resource
+    EasPermissionService easPermissionService;
+
+    @PostMapping("/query")
+    @Operation(summary = "查询权限" ,  description = "根据参数查询基本权限表信息")
+    public PageData query(@RequestBody(required = false) EasSysPermission permission,
+                          @RequestParam Integer pageNum, @RequestParam Integer pageSize ){
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easPermissionService.query(permission);
+        return ret;
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "添加权限" ,  description = "录入权限表基本信息")
+    public JsonResult add(@RequestBody EasSysPermission permission){
+        Boolean ret = easPermissionService.add(permission);
+        if(ret){
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除权限" ,  description = "删除权限表数据根据ID")
+    public JsonResult delete(@RequestParam Integer id){
+        Boolean ret = easPermissionService.delete(id);
+        if(ret){
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新权限" ,  description = "根据ID 更新权限表信息")
+    public JsonResult update(@RequestBody EasSysPermission permission){
+        Boolean ret = easPermissionService.update(permission);
+        if(ret){
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+}

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

@@ -1,10 +1,10 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:13306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+    url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
     username: root
-    password: 0JZBdtlYoiOepddh
+    password: 1234
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
     host: localhost
@@ -27,4 +27,5 @@ knife4j:
     language: zh_cn
 logging:
   level:
-    com.koobietech.eas.*: TRACE
+    com.koobietech.eas.*: TRACE
+

service/pom.xml

@@ -32,6 +32,11 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.koobietech.eas</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <parent>

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

@@ -0,0 +1,13 @@
+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(EasSysDepartment department);
+}

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

@@ -0,0 +1,12 @@
+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(EasSysPermission permission);
+}

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

@@ -0,0 +1,77 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasSysDepartmentMapper;
+import com.koobietech.eas.mbg.model.EasSysDepartment;
+import com.koobietech.eas.mbg.model.EasSysDepartmentExample;
+import com.koobietech.eas.service.EasDepartmentService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+
+@Service
+public class EasDepartmentServiceImpl implements EasDepartmentService {
+
+    @Resource
+    EasSysDepartmentMapper easSysDepartmentMapper;
+
+    @Override
+    public Boolean update(EasSysDepartment department) {
+        department.setModifyTime(new Date());
+        return easSysDepartmentMapper.updateByPrimaryKey(department) == 1;
+    }
+
+    @Override
+    public Boolean add(EasSysDepartment department) {
+        department.setCreateTime(new Date());
+        department.setModifyTime(new Date());
+        return easSysDepartmentMapper.insert(department) == 1;
+    }
+
+    @Override
+    public Boolean delete(Long id) {
+        return easSysDepartmentMapper.deleteByPrimaryKey(id) == 1;
+    }
+
+    @Override
+    public PageData query(EasSysDepartment department) {
+
+        EasSysDepartmentExample departmentExample = new EasSysDepartmentExample();
+        EasSysDepartmentExample.Criteria criteria = departmentExample.createCriteria();
+        if (Objects.nonNull(department)) {
+            if (Objects.nonNull(department.getId())) {
+                criteria.andIdEqualTo(department.getId());
+            }
+            if (StringUtils.hasText(department.getAddress())) {
+                criteria.andAddressLike("%" + department.getAddress() + "%");
+            }
+            if (StringUtils.hasText(department.getDepname())) {
+                criteria.andDepnameLike("%" + department.getDepname() + "%");
+            }
+            if (StringUtils.hasText(department.getEmail())) {
+                criteria.andEmailLike("%" + department.getEmail() + "%");
+            }
+            if (StringUtils.hasText(department.getManager())) {
+                criteria.andManagerLike("%" + department.getManager() + "%");
+            }
+            if (StringUtils.hasText(department.getPhone())) {
+                criteria.andPhoneLike("%" + department.getPhone() + "%");
+            }
+            if (Objects.nonNull(department.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(department.getCreateTime());
+            }
+        }
+        List<EasSysDepartment> departments =
+                 easSysDepartmentMapper.selectByExample(departmentExample);
+        long l = easSysDepartmentMapper.countByExample(departmentExample);
+        PageData ret = new PageData();
+        ret.setData(departments);
+        ret.setTotal(l);
+        return ret;
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasSysPermissionMapper;
+import com.koobietech.eas.mbg.model.EasSysPermission;
+import com.koobietech.eas.mbg.model.EasSysPermissionExample;
+import com.koobietech.eas.service.EasPermissionService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class EasPermissionServiceImpl implements EasPermissionService {
+
+    @Resource
+    EasSysPermissionMapper easSysPermissionMapper;
+
+    @Override
+    public Boolean update(EasSysPermission permission) {
+        permission.setModifyTime(new Date());
+        return easSysPermissionMapper.updateByPrimaryKey(permission) == 1;
+    }
+
+    @Override
+    public Boolean add(EasSysPermission permission) {
+        permission.setCreateTime(new Date());
+        permission.setModifyTime(new Date());
+        return easSysPermissionMapper.insert(permission) == 1;
+    }
+
+    @Override
+    public Boolean delete(Integer id) {
+        return easSysPermissionMapper.deleteByPrimaryKey(id) == 1;
+    }
+
+    @Override
+    public PageData query(EasSysPermission permission) {
+        EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
+        EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
+        if ( Objects.nonNull(permission) ) {
+            if (Objects.nonNull(permission.getId())) {
+                criteria.andIdEqualTo(permission.getId());
+            }
+            if (Objects.nonNull(permission.getIsActive())) {
+                criteria.andIsActiveEqualTo(permission.getIsActive());
+            }
+            if (StringUtils.hasText(permission.getDisabled())) {
+                criteria.andDisabledEqualTo(permission.getDisabled());
+            }
+            if (StringUtils.hasText(permission.getName())) {
+                criteria.andNameLike("%" + permission.getName() + "%");
+            }
+            if (Objects.nonNull(permission.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(permission.getCreateTime());
+            }
+        }
+        List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
+        long l = easSysPermissionMapper.countByExample(easSysPermissionExample);
+        PageData ret = new PageData();
+        ret.setData(easSysPermissions);
+        ret.setTotal(l);
+        return ret;
+    }
+}