tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

publish 0.9.2

Browse Source
This commit is contained in:
曾文豪
2023-03-28 17:56:59 +08:00
parent bfc578e77c
commit 06f295bb66
17 changed files with 130 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
<packaging>pom</packaging>
<name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-encrypt</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-poi</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
<dependency>

2
springboot-ademo/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-ademo</artifactId>

2
springboot-annotation/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-annotation</artifactId>

2
springboot-database/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-database</artifactId>

2
springboot-encrypt/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-encrypt</artifactId>

2
springboot-login/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-login</artifactId>

2
springboot-message/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-message</artifactId>

2
springboot-platform/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-platform</artifactId>

2
springboot-poi/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-poi</artifactId>

2
springboot-util/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-util</artifactId>

2
springboot-web/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</parent>
<artifactId>springboot-web</artifactId>

5
springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobUserMapper.java
View File

@@ -8,8 +8,6 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface CoreJobUserMapper extends BaseMapper<CoreJobUser> {
/**
* 获取指定用户的职位和功能点
*
@@ -17,5 +15,4 @@ public interface CoreJobUserMapper extends BaseMapper<CoreJobUser> {
* @return
*/
List<JobUserOwner> list(@Param("userId") String userId);
}
}

96
springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJob.java
View File

@@ -30,30 +30,6 @@ public class CoreJob extends DaoBase {
@TableField(value = "is_system")
private Integer isSystem;
/**
* 扩展1
*/
@TableField(value = "ext1")
private String ext1;
/**
* 扩展2
*/
@TableField(value = "ext2")
private String ext2;
/**
* 扩展3
*/
@TableField(value = "ext3")
private String ext3;
/**
* 扩展文本
*/
@TableField(value = "ext_text")
private String extText;
/**
* 获取名称
*
@@ -107,76 +83,4 @@ public class CoreJob extends DaoBase {
public void setIsSystem(Integer isSystem) {
this.isSystem = isSystem;
}
/**
* 获取扩展1
*
* @return ext1 - 扩展1
*/
public String getExt1() {
return ext1;
}
/**
* 设置扩展1
*
* @param ext1 扩展1
*/
public void setExt1(String ext1) {
this.ext1 = ext1;
}
/**
* 获取扩展2
*
* @return ext2 - 扩展2
*/
public String getExt2() {
return ext2;
}
/**
* 设置扩展2
*
* @param ext2 扩展2
*/
public void setExt2(String ext2) {
this.ext2 = ext2;
}
/**
* 获取扩展3
*
* @return ext3 - 扩展3
*/
public String getExt3() {
return ext3;
}
/**
* 设置扩展3
*
* @param ext3 扩展3
*/
public void setExt3(String ext3) {
this.ext3 = ext3;
}
/**
* 获取扩展文本
*
* @return ext_text - 扩展文本
*/
public String getExtText() {
return extText;
}
/**
* 设置扩展文本
*
* @param extText 扩展文本
*/
public void setExtText(String extText) {
this.extText = extText;
}
}

100
springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobUser.java
View File

@@ -8,8 +8,8 @@ import com.tiesheng.core.pojos.DaoBase;
import java.util.Date;
/**
* 职位-用户
*/
* 职位-用户
*/
@TableName(value = "core_job_user")
public class CoreJobUser extends DaoBase {
/**
@@ -24,6 +24,30 @@ public class CoreJobUser extends DaoBase {
@TableField(value = "job_id")
private String jobId;
/**
* 扩展1
*/
@TableField(value = "ext1")
private String ext1;
/**
* 扩展2
*/
@TableField(value = "ext2")
private String ext2;
/**
* 扩展3
*/
@TableField(value = "ext3")
private String ext3;
/**
* 扩展文本
*/
@TableField(value = "ext_text")
private String extText;
/**
* 获取用户id
*
@@ -59,4 +83,76 @@ public class CoreJobUser extends DaoBase {
public void setJobId(String jobId) {
this.jobId = jobId;
}
/**
* 获取扩展1
*
* @return ext1 - 扩展1
*/
public String getExt1() {
return ext1;
}
/**
* 设置扩展1
*
* @param ext1 扩展1
*/
public void setExt1(String ext1) {
this.ext1 = ext1;
}
/**
* 获取扩展2
*
* @return ext2 - 扩展2
*/
public String getExt2() {
return ext2;
}
/**
* 设置扩展2
*
* @param ext2 扩展2
*/
public void setExt2(String ext2) {
this.ext2 = ext2;
}
/**
* 获取扩展3
*
* @return ext3 - 扩展3
*/
public String getExt3() {
return ext3;
}
/**
* 设置扩展3
*
* @param ext3 扩展3
*/
public void setExt3(String ext3) {
this.ext3 = ext3;
}
/**
* 获取扩展文本
*
* @return ext_text - 扩展文本
*/
public String getExtText() {
return extText;
}
/**
* 设置扩展文本
*
* @param extText 扩展文本
*/
public void setExtText(String extText) {
this.extText = extText;
}
}

8
springboot-web/src/main/resources/db/migration/core_job.sql
View File

@@ -67,16 +67,16 @@ CREATE TABLE `core_job_user`
-- Table change for core_job_user
-- ----------------------------
alter table core_job
alter table core_job_user
add ext1 varchar(255) null comment '扩展1';
alter table core_job
alter table core_job_user
add ext2 varchar(255) null comment '扩展2';
alter table core_job
alter table core_job_user
add ext3 varchar(500) null comment '扩展3';
alter table core_job
alter table core_job_user
add ext_text text null comment '扩展文本';
SET FOREIGN_KEY_CHECKS = 1;

7
springboot-web/src/main/resources/mapper/CoreJobMapper.xml
View File

@@ -11,14 +11,9 @@
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="is_system" jdbcType="INTEGER" property="isSystem" />
<result column="ext1" jdbcType="VARCHAR" property="ext1" />
<result column="ext2" jdbcType="VARCHAR" property="ext2" />
<result column="ext3" jdbcType="VARCHAR" property="ext3" />
<result column="ext_text" jdbcType="LONGVARCHAR" property="extText" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, create_time, update_time, is_deleted, `name`, remark, is_system, ext1, ext2,
ext3, ext_text
id, create_time, update_time, is_deleted, `name`, remark, is_system
</sql>
</mapper>

8
springboot-web/src/main/resources/mapper/CoreJobUserMapper.xml
View File

@@ -10,10 +10,14 @@
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted" />
<result column="user_id" jdbcType="VARCHAR" property="userId" />
<result column="job_id" jdbcType="VARCHAR" property="jobId" />
<result column="ext1" jdbcType="VARCHAR" property="ext1" />
<result column="ext2" jdbcType="VARCHAR" property="ext2" />
<result column="ext3" jdbcType="VARCHAR" property="ext3" />
<result column="ext_text" jdbcType="LONGVARCHAR" property="extText" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, create_time, update_time, is_deleted, user_id, job_id
id, create_time, update_time, is_deleted, user_id, job_id, ext1, ext2, ext3, ext_text
</sql>
<select id="list" resultType="com.tiesheng.core.pojos.dto.job.JobUserOwner">
@@ -23,4 +27,4 @@
left join core_job cj on cj.id = cju.job_id
where cju.is_deleted=0 and cju.user_id=#{userId}
</select>
</mapper>
</mapper>