merge code

.gitignore

@@ -4,6 +4,13 @@ target/
 !**/src/main/**/target/
 !**/src/test/**/target/
 
+sys-debug.log
+sys-error.log
+sys-info.log
+sys-debug*
+sys-info*
+sys-error*
+
 ### STS ###
 .apt_generated
 .classpath

Dockerfile

@@ -1,4 +1,4 @@
 FROM openjdk:11
-COPY ./ruoyi-admin/target/ruoyi-admin.jar /tmp/app.jar
+COPY ./controller/target/controller-0.0.1-SNAPSHOT.jar /tmp/app.jar
 EXPOSE 8080
 ENTRYPOINT java -Xms256m -Xmx512m -jar /tmp/app.jar --spring.profiles.active=dev

common/pom.xml

@@ -36,4 +36,17 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>

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/pom.xml

@@ -73,11 +73,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>${maven.compiler.plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                    <encoding>UTF-8</encoding>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <encoding>${maven.compiler.encoding}</encoding>
                 </configuration>
             </plugin>
             <plugin>
@@ -85,7 +85,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring-boot.version}</version>
                 <configuration>
-                    <mainClass>com.koobietech.eas.controller.ControllerApplication</mainClass>
+                    <mainClass>com.koobietech.eas.ControllerApplication</mainClass>
                     <skip>false</skip>
                 </configuration>
                 <executions>
@@ -100,4 +100,17 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>

controller/src/main/java/com/koobietech/eas/config/ExceptionAdvice.java

@@ -1,6 +1,8 @@
 package com.koobietech.eas.config;
 
 import com.koobietech.eas.common.result.JsonResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -8,12 +10,24 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
+
 public class ExceptionAdvice {
+
+    private static final Logger logger = LoggerFactory.getLogger(ExceptionAdvice.class);
+
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     @ExceptionHandler(Exception.class)
     public JsonResult exceptionHandler(Exception e){
+        StackTraceElement[] stackTrace = e.getStackTrace();
         e.printStackTrace();
+        logger.error("运行异常提醒：");
+        logger.error(e.getMessage());
+        logger.error("异常堆栈信息：");
+        for (StackTraceElement element : stackTrace) {
+            logger.error(element.toString());
+        }
+        logger.error("-------------");
         return JsonResult.fail(e.getMessage());
     }
 }

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/java/com/koobietech/eas/controller/EasUserController.java

@@ -1,6 +1,7 @@
 package com.koobietech.eas.controller;
 
 import com.koobietech.eas.dao.dto.TestDto;
+import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.service.DemoService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -19,9 +20,9 @@ public class EasUserController {
 
     @PostMapping("/test")
     @Operation(summary = "控制器测试用例" , description = "用于演示Swagger配置注解")
-    public List<EasSysStudent> test(@RequestBody TestDto dto){
+    public List<EasSysStudent> test(@RequestBody EasEduSubjects easEduSubjects){
 
-        return demoService.test( dto );
+        return demoService.test( easEduSubjects );
     }
 
 }

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

@@ -7,10 +7,10 @@ spring:
     password: eas
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
-    host: localhost
+    host: redis-compose
     database: 9
     password:
-    port: 26379
+    port: 6379
   security:
     user:
       name: admin
@@ -24,4 +24,7 @@ springdoc:
 knife4j:
   enable: true
   setting:
-    language: zh_cn
+    language: zh_cn
+logging:
+  level:
+    com.koobietech.eas.*: TRACE

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

@@ -24,4 +24,8 @@ springdoc:
 knife4j:
   enable: true
   setting:
-    language: zh_cn
+    language: zh_cn
+logging:
+  level:
+    com.koobietech.eas.*: TRACE
+

controller/src/main/resources/logback.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="log.path" value="./" />
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-info.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/sys-debug.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>TRACE</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <root level="info">
+        <appender-ref ref="console" />
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_debug" />
+        <appender-ref ref="file_error" />
+    </root>
+    <logger name="com.koobietech.eas" level="debug" additivity="false">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error" />
+        <appender-ref ref="file_debug" />
+    </logger>
+</configuration>

dao/pom.xml

@@ -20,4 +20,18 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    
 </project>

docker-compose.yml

@@ -1,7 +1,8 @@
 version: "3"
 services:
   eas-project-api:
-    image: ${BRANCH_NAME}:${BUILD_NUMBER}
+    restart: always
+    image: easapi${BRANCH_NAME}:${BUILD_NUMBER}
     ports:
       - 11004:8080
     networks:

jobs/pom.xml

@@ -68,4 +68,17 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>

mbg/pom.xml

@@ -36,4 +36,18 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    
 </project>

pom.xml

@@ -12,6 +12,7 @@
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -33,6 +34,7 @@
         <spring-data-redis.version>2.7.3</spring-data-redis.version>
         <knife4j.version>4.1.0</knife4j.version>
         <pagehelper.starter.version>1.3.1</pagehelper.starter.version>
+        <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>

security/pom.xml

@@ -29,4 +29,18 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    
 </project>

service/pom.xml

@@ -46,4 +46,18 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    
 </project>

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

@@ -1,10 +1,11 @@
 package com.koobietech.eas.service;
 
 import com.koobietech.eas.dao.dto.TestDto;
+import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.mbg.model.EasSysStudent;
 
 import java.util.List;
 
 public interface DemoService {
-    List<EasSysStudent> test(TestDto dto);
+    List test(EasEduSubjects dto);
 }

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/DemoServiceImpl.java

@@ -1,7 +1,9 @@
 package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.dao.dto.TestDto;
+import com.koobietech.eas.mbg.mapper.EasEduSubjectsMapper;
 import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
+import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.mbg.model.EasSysStudentExample;
 import com.koobietech.eas.service.DemoService;
@@ -19,17 +21,15 @@ public class DemoServiceImpl implements DemoService {
     @Resource
     EasSysStudentMapper easSysStudentMapper;
 
+    @Resource
+    EasEduSubjectsMapper easEduSubjectsMapper;
+
     @Override
-    public List<EasSysStudent> test(TestDto dto) {
-        EasSysStudentExample easSysStudentExample = new EasSysStudentExample();
-        EasSysStudentExample.Criteria criteria = easSysStudentExample.createCriteria();
-        if (Objects.nonNull(dto.getId())) {
-            criteria.andIdEqualTo( Long.valueOf(dto.getId()) );
-        }
-        if (StringUtils.hasText(dto.getName())) {
-            criteria.andStudentNameLike( "%" + dto.getName() + "%" );
-        }
-        List<EasSysStudent> easSysStudents = easSysStudentMapper.selectByExample(easSysStudentExample);
-        return easSysStudents;
+    public List test(EasEduSubjects dto) {
+
+        easEduSubjectsMapper.insert(dto);
+
+        List list = easEduSubjectsMapper.selectByExample(null);
+        return list;
     }
 }

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;
+    }
+}

upload/pom.xml

@@ -12,5 +12,17 @@
         <groupId>com.koobietech.eas</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>