update

.gitignore

@@ -0,0 +1,49 @@
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+*.class
+*.log
+
+
+### Eclipse & STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+
+### VS Code ###
+.vscode
+node_modules
+package-lock.json
+yarn.lock
+
+
+### Package Files ###
+*.war
+*.ear
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+target/
+logs/
+
+.flattened-pom.xml
+.DS_Store
+

pom.xml

@@ -10,14 +10,13 @@
 
 	<properties>
 		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
-		<mybatis-plus.version>3.4.3.3</mybatis-plus.version>
+		<qmth-boot-version>1.0.2</qmth-boot-version>
 		<maven-compiler-version>3.8.1</maven-compiler-version>
 		<maven-surefire-version>2.22.2</maven-surefire-version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<qmth-boot-version>1.0.2</qmth-boot-version>
 	</properties>
 
 	<repositories>
@@ -37,19 +36,15 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>${mybatis-plus.version}</version>
-		</dependency>
+            <groupId>com.qmth.boot</groupId>
+            <artifactId>starter-api</artifactId>
+            <version>${qmth-boot-version}</version>
+        </dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>com.qmth.boot</groupId>
+			<artifactId>data-mybatis-plus</artifactId>
+			<version>${qmth-boot-version}</version>
 		</dependency>
-
 		<!-- Swagger jars start -->
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
@@ -147,21 +142,12 @@
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz-jobs</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.qmth.boot</groupId>
-			<artifactId>core-cache</artifactId>
-			<version>${qmth-boot-version}</version>
-		</dependency>
  		<dependency>
             <groupId>net.sf.json-lib</groupId>
             <artifactId>json-lib-ext-spring</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.qmth.boot</groupId>
-            <artifactId>core-solar</artifactId>
-            <version>${qmth-boot-version}</version>
-        </dependency>
+
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/cn/com/qmth/print/manage/controller/OrgController.java

@@ -0,0 +1,26 @@
+package cn.com.qmth.print.manage.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.com.qmth.print.manage.service.OrgService;
+import cn.com.qmth.print.manage.service.query.OrgQuery;
+
+import com.qmth.boot.api.constant.ApiConstant;
+
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/org")
+public class OrgController {
+
+    @Resource
+    private OrgService orgService;
+
+    @RequestMapping("/query")
+    public Object appInfo(@Validated OrgQuery query) {
+        return orgService.list();
+    }
+
+}

src/main/java/cn/com/qmth/print/manage/dao/OrgDao.java

@@ -0,0 +1,9 @@
+package cn.com.qmth.print.manage.dao;
+
+import cn.com.qmth.print.manage.entity.OrgEntity;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface OrgDao extends BaseMapper<OrgEntity> {
+
+}

src/main/java/cn/com/qmth/print/manage/entity/OrgEntity.java

@@ -0,0 +1,122 @@
+package cn.com.qmth.print.manage.entity;
+
+import java.util.UUID;
+
+import cn.com.qmth.print.manage.entity.base.AuditingEntity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * 机构
+ */
+@TableName("pm_org")
+public class OrgEntity extends AuditingEntity {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 7717219502886694657L;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 代码
+     */
+    private String code;
+
+    /**
+     * 图片地址、名称
+     */
+    private String logoUrl;
+
+    /**
+     * 域名
+     */
+    private String domainName;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 是否启用
+     */
+    private Boolean enable;
+
+    private String accessKey;
+
+    private String accessSecret;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAccessKey() {
+        return accessKey;
+    }
+
+    public void setAccessKey(String accessKey) {
+        this.accessKey = accessKey;
+    }
+
+    public String getAccessSecret() {
+        return accessSecret;
+    }
+
+    public void setAccessSecret(String accessSecret) {
+        this.accessSecret = accessSecret;
+    }
+
+    public void resetAccessKeyAndSecret() {
+        accessKey = UUID.randomUUID().toString().replaceAll("-", "");
+        accessSecret = UUID.randomUUID().toString().replaceAll("-", "");
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDomainName() {
+        return domainName;
+    }
+
+    public void setDomainName(String domainName) {
+        this.domainName = domainName;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+}

src/main/java/cn/com/qmth/print/manage/entity/UserEntity.java

@@ -0,0 +1,63 @@
+package cn.com.qmth.print.manage.entity;
+
+import cn.com.qmth.print.manage.entity.base.AuditingEntity;
+import cn.com.qmth.print.manage.enums.RoleMeta;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("pm_user")
+public class UserEntity extends AuditingEntity {
+
+    private static final long serialVersionUID = -3406556250715857392L;
+
+    private String name;
+
+    private String loginName;
+
+    private String password;
+
+    private Boolean enable;
+
+    private RoleMeta role;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public RoleMeta getRole() {
+        return role;
+    }
+
+    public void setRole(RoleMeta role) {
+        this.role = role;
+    }
+
+}

src/main/java/cn/com/qmth/print/manage/entity/base/AuditingEntity.java

@@ -0,0 +1,86 @@
+package cn.com.qmth.print.manage.entity.base;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 实体类基类
+ */
+public abstract class AuditingEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    protected Long id;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    protected Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    protected Date updateTime;
+    
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updaterId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public Long getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Long creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Long getUpdaterId() {
+		return updaterId;
+	}
+
+	public void setUpdaterId(Long updaterId) {
+		this.updaterId = updaterId;
+	}
+
+    
+}

src/main/java/cn/com/qmth/print/manage/entity/base/AuditingWithoutIdEntity.java

@@ -0,0 +1,75 @@
+package cn.com.qmth.print.manage.entity.base;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+
+/**
+ * 实体类基类
+ */
+public abstract class AuditingWithoutIdEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    protected Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    protected Date updateTime;
+    
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updaterId;
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public Long getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Long creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Long getUpdaterId() {
+		return updaterId;
+	}
+
+	public void setUpdaterId(Long updaterId) {
+		this.updaterId = updaterId;
+	}
+
+
+}

src/main/java/cn/com/qmth/print/manage/entity/base/IdEntity.java

@@ -0,0 +1,57 @@
+package cn.com.qmth.print.manage.entity.base;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 实体类基类
+ */
+public abstract class IdEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    protected Long id;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    protected Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    protected Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}

src/main/java/cn/com/qmth/print/manage/enums/RoleMeta.java

@@ -0,0 +1,46 @@
+package cn.com.qmth.print.manage.enums;
+
+public enum RoleMeta {
+
+    SUPER_ADMIN("管理员", 1L),
+
+    PRINT_ADMIN("校验员", 2L);
+
+    /**
+     * 角色名
+     */
+    private String name;
+
+    private Long id;
+
+    RoleMeta(String name) {
+        this.name = name;
+    }
+
+    private RoleMeta(String name, Long id) {
+        this.name = name;
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public static RoleMeta getByName(String name) {
+        for (RoleMeta r : RoleMeta.values()) {
+            if (r.getName().equals(name)) {
+                return r;
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/cn/com/qmth/print/manage/service/OrgService.java

@@ -0,0 +1,9 @@
+package cn.com.qmth.print.manage.service;
+
+import cn.com.qmth.print.manage.entity.OrgEntity;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface OrgService extends IService<OrgEntity> {
+
+}

src/main/java/cn/com/qmth/print/manage/service/impl/OrgServiceImpl.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.print.manage.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.print.manage.dao.OrgDao;
+import cn.com.qmth.print.manage.entity.OrgEntity;
+import cn.com.qmth.print.manage.service.OrgService;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+@Service
+public class OrgServiceImpl extends ServiceImpl<OrgDao, OrgEntity> implements OrgService {
+
+}

src/main/java/cn/com/qmth/print/manage/service/query/OrgQuery.java

@@ -0,0 +1,48 @@
+package cn.com.qmth.print.manage.service.query;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+import org.springframework.validation.annotation.Validated;
+
+import cn.com.qmth.print.manage.entity.OrgEntity;
+
+import com.qmth.boot.mybatis.query.BaseQuery;
+
+@Validated
+public class OrgQuery extends BaseQuery<OrgEntity> {
+
+    private static final long serialVersionUID = 3260496142491163981L;
+
+    private String name;
+
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    @Min(1)
+    public long getPageNumber() {
+        return super.getPageNumber();
+    }
+
+    @Min(1)
+    @Max(100)
+    public long getPageSize() {
+        return super.getPageSize();
+    }
+
+}

src/main/resources/application.properties

@@ -1,8 +1,7 @@
 #
 # ********** server config **********
 #
-$rmp.ctr=/api/pm
-server.port=8081
+server.port=8088
 server.servlet.session.timeout=PT2H
 server.servlet.context-path=/
 spring.servlet.multipart.max-request-size=100MB
@@ -20,9 +19,9 @@ mybatis-plus.configuration.map-underscore-to-camel-case=true
 db.host=localhost
 db.port=3306
 db.database=print_manage_dev
-spring.datasource.username=root
-spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.database}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true
+com.qmth.datasource.username=root
+com.qmth.datasource.password=root
+com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.database}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=5

src/main/resources/mapper/OrgMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.qmth.print.manage.dao.OrgDao">
+
+	
+</mapper>

src/test/java/cn/com/qmth/print/manage/test/OrgServiceTest.java

@@ -0,0 +1,27 @@
+package cn.com.qmth.print.manage.test;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import cn.com.qmth.print.manage.entity.OrgEntity;
+import cn.com.qmth.print.manage.service.OrgService;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class OrgServiceTest {
+
+    @Autowired
+    private OrgService orgService;
+
+    @Test
+    public void test() throws Exception {
+        List<OrgEntity> list = orgService.list();
+        list.forEach(e -> System.out.println(e.getName()));
+    }
+
+}