diff --git a/tamguo-bms/pom.xml b/tamguo-bms/pom.xml index d93c16c..293661c 100644 --- a/tamguo-bms/pom.xml +++ b/tamguo-bms/pom.xml @@ -166,6 +166,16 @@ org.springframework.boot spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + \ No newline at end of file diff --git a/tamguo-common/pom.xml b/tamguo-common/pom.xml index 0b34b17..8a14dcd 100644 --- a/tamguo-common/pom.xml +++ b/tamguo-common/pom.xml @@ -32,15 +32,15 @@ tamguo-modules-core - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + \ No newline at end of file diff --git a/tamguo-config-repo/tamguo/README b/tamguo-config-repo/tamguo/README deleted file mode 100644 index e69de29..0000000 diff --git a/tamguo-config-repo/tamguo/tamguo-pre.properties b/tamguo-config-repo/tamguo/tamguo-pre.properties deleted file mode 100644 index 28c8229..0000000 --- a/tamguo-config-repo/tamguo/tamguo-pre.properties +++ /dev/null @@ -1,63 +0,0 @@ -sitename=tamguo -domain.name=http://localhost:8081/ -admin.domain.name=http://admin.tanguoguo.com -server.port=8081 -jasypt.encryptor.password=tamguo - -spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.filters=stat,wall,log4j -spring.datasource.initialSize=5 -spring.datasource.maxActive=20 -spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 -spring.datasource.maxWait=60000 -spring.datasource.minEvictableIdleTimeMillis=300000 -spring.datasource.minIdle=5 -spring.datasource.password=Tanguo -spring.datasource.poolPreparedStatements=true -spring.datasource.testOnBorrow=false -spring.datasource.testOnReturn=false -spring.datasource.testWhileIdle=true -spring.datasource.timeBetweenEvictionRunsMillis=60000 -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false -spring.datasource.username=root -spring.datasource.validationQuery=SELECT 1 FROM DUAL - -mybatis-plus.mapper-locations=classpath:/mappers/*Mapper.xml -mybatis-plus.typeAliasesPackage=com.tamguo.model -mybatis-plus.typeEnumsPackage=com.tamguo.model.enums -mybatis-plus.global-config.id-type=5 -mybatis-plus.global-config.field-strategy=2 -mybatis-plus.global-config.db-column-underline=true -mybatis-plus.global-config.refresh-mapper=true -mybatis-plus.global-config.key-generator=com.baomidou.mybatisplus.incrementer.H2KeyGenerator -mybatis-plus.global-config.logic-delete-value=0 -mybatis-plus.global-config.logic-not-delete-value=1 -mybatis-plus.global-config.sql-injector=com.baomidou.mybatisplus.mapper.LogicSqlInjector -mybatis-plus.global-config.meta-object-handler=com.tamguo.config.dao.MyMetaObjectHandler -mybatis-plus.global-config.sql-parser-cache=true -mybatis-plus.configuration.map-underscore-to-camel-case=true -mybatis-plus.configuration.cache-enabled=false - -spring.thymeleaf.prefix=classpath:/templates/ -spring.thymeleaf.suffix=.html -spring.thymeleaf.mode=LEGACYHTML5 -spring.thymeleaf.encoding=UTF-8 -spring.thymeleaf.content-type=text/html -spring.thymeleaf.cache=false - -redis.hostname=127.0.0.1 -redis.port=6379 -redis.password= - -logging.level.root=INFO -logging.level.org.springframework.web=INFO -logging.file=/home/webdata/log/tamguo.log -logging.pattern.console=%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n -logging.pattern.file=%d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n - -server.compression.enabled=true -server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain - -file.storage.path=/home/webdata/files/ \ No newline at end of file diff --git a/tamguo-config-repo/tamguo/tamguo-test.properties b/tamguo-config-repo/tamguo/tamguo-test.properties deleted file mode 100644 index ab00b4f..0000000 --- a/tamguo-config-repo/tamguo/tamguo-test.properties +++ /dev/null @@ -1,63 +0,0 @@ -sitename=tamguo -domain.name=http://localhost:8081/ -admin.domain.name=http://admin.tanguoguo.com -server.port=8081 -jasypt.encryptor.password=tamguo - -spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.filters=stat,wall,log4j -spring.datasource.initialSize=5 -spring.datasource.maxActive=20 -spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 -spring.datasource.maxWait=60000 -spring.datasource.minEvictableIdleTimeMillis=300000 -spring.datasource.minIdle=5 -spring.datasource.password=admin -spring.datasource.poolPreparedStatements=true -spring.datasource.testOnBorrow=false -spring.datasource.testOnReturn=false -spring.datasource.testWhileIdle=true -spring.datasource.timeBetweenEvictionRunsMillis=60000 -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false -spring.datasource.username=root -spring.datasource.validationQuery=SELECT 1 FROM DUAL - -mybatis-plus.mapper-locations=classpath:/mappers/*Mapper.xml -mybatis-plus.typeAliasesPackage=com.tamguo.model -mybatis-plus.typeEnumsPackage=com.tamguo.model.enums -mybatis-plus.global-config.id-type=5 -mybatis-plus.global-config.field-strategy=2 -mybatis-plus.global-config.db-column-underline=true -mybatis-plus.global-config.refresh-mapper=true -mybatis-plus.global-config.key-generator=com.baomidou.mybatisplus.incrementer.H2KeyGenerator -mybatis-plus.global-config.logic-delete-value=0 -mybatis-plus.global-config.logic-not-delete-value=1 -mybatis-plus.global-config.sql-injector=com.baomidou.mybatisplus.mapper.LogicSqlInjector -mybatis-plus.global-config.meta-object-handler=com.tamguo.config.dao.MyMetaObjectHandler -mybatis-plus.global-config.sql-parser-cache=true -mybatis-plus.configuration.map-underscore-to-camel-case=true -mybatis-plus.configuration.cache-enabled=false - -spring.thymeleaf.prefix=classpath:/templates/ -spring.thymeleaf.suffix=.html -spring.thymeleaf.mode=LEGACYHTML5 -spring.thymeleaf.encoding=UTF-8 -spring.thymeleaf.content-type=text/html -spring.thymeleaf.cache=false - -redis.hostname=127.0.0.1 -redis.port=6379 -redis.password= - -logging.level.root=INFO -logging.level.org.springframework.web=INFO -logging.file=/home/webdata/log/tamguo.log -logging.pattern.console=%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n -logging.pattern.file=%d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n - -server.compression.enabled=true -server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain - -file.storage.path=/home/webdata/files/ \ No newline at end of file diff --git a/tamguo-crawler/pom.xml b/tamguo-crawler/pom.xml index 0fd0c42..e3f6e9d 100644 --- a/tamguo-crawler/pom.xml +++ b/tamguo-crawler/pom.xml @@ -102,6 +102,16 @@ org.springframework.boot spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + \ No newline at end of file diff --git a/tamguo-mms/pom.xml b/tamguo-mms/pom.xml index 277c085..7f8649e 100644 --- a/tamguo-mms/pom.xml +++ b/tamguo-mms/pom.xml @@ -166,6 +166,16 @@ org.springframework.boot spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + \ No newline at end of file diff --git a/tamguo-modules-core/pom.xml b/tamguo-modules-core/pom.xml index d42f307..7d6a65e 100644 --- a/tamguo-modules-core/pom.xml +++ b/tamguo-modules-core/pom.xml @@ -67,6 +67,12 @@ commons-email 1.5 + + org.projectlombok + lombok + 1.16.20 + true + diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookCategoryEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookCategoryEntity.java index 9b0270e..885f04d 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookCategoryEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookCategoryEntity.java @@ -6,7 +6,9 @@ import java.util.Date; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +@Data @TableName(value="b_book_category") public class BookCategoryEntity extends Model{ @@ -27,91 +29,7 @@ public class BookCategoryEntity extends Model{ private String seoDescription; private Date createDate; private Date updateDate; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getTreeSort() { - return treeSort; - } - public void setTreeSort(String treeSort) { - this.treeSort = treeSort; - } - public String getTreeSorts() { - return treeSorts; - } - public void setTreeSorts(String treeSorts) { - this.treeSorts = treeSorts; - } - public String getTreeLeaf() { - return treeLeaf; - } - public void setTreeLeaf(String treeLeaf) { - this.treeLeaf = treeLeaf; - } - public String getTreeLevel() { - return treeLevel; - } - public void setTreeLevel(String treeLevel) { - this.treeLevel = treeLevel; - } - public String getTreeNames() { - return treeNames; - } - public void setTreeNames(String treeNames) { - this.treeNames = treeNames; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getSeoTitle() { - return seoTitle; - } - public void setSeoTitle(String seoTitle) { - this.seoTitle = seoTitle; - } - public String getSeoKeywords() { - return seoKeywords; - } - public void setSeoKeywords(String seoKeywords) { - this.seoKeywords = seoKeywords; - } - public String getSeoDescription() { - return seoDescription; - } - public void setSeoDescription(String seoDescription) { - this.seoDescription = seoDescription; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - public String getParentId() { - return parentId; - } - public void setParentId(String parentId) { - this.parentId = parentId; - } - public String getParentIds() { - return parentIds; - } - public void setParentIds(String parentIds) { - this.parentIds = parentIds; - } + @Override protected Serializable pkVal() { return getId(); diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookEntity.java index c23f62a..c13b405 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/BookEntity.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +@Data @TableName(value="b_book") public class BookEntity extends Model{ @@ -32,87 +34,9 @@ public class BookEntity extends Model{ private String memberName; @TableField(exist=false) private String categoryName; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getCategoryId() { - return categoryId; - } - public void setCategoryId(String categoryId) { - this.categoryId = categoryId; - } - public String getOwner() { - return owner; - } - public void setOwner(String owner) { - this.owner = owner; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getSeoTitle() { - return seoTitle; - } - public void setSeoTitle(String seoTitle) { - this.seoTitle = seoTitle; - } - public String getSeoKeywords() { - return seoKeywords; - } - public void setSeoKeywords(String seoKeywords) { - this.seoKeywords = seoKeywords; - } - public String getSeoDescription() { - return seoDescription; - } - public void setSeoDescription(String seoDescription) { - this.seoDescription = seoDescription; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - public String getBookImage() { - return bookImage; - } - public void setBookImage(String bookImage) { - this.bookImage = bookImage; - } + @Override protected Serializable pkVal() { return getId(); } - public List getCategoryIds() { - return categoryIds; - } - public void setCategoryIds(List categoryIds) { - this.categoryIds = categoryIds; - } - public String getMemberName() { - return memberName; - } - public void setMemberName(String memberName) { - this.memberName = memberName; - } - public String getCategoryName() { - return categoryName; - } - public void setCategoryName(String categoryName) { - this.categoryName = categoryName; - } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/DocumentEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/DocumentEntity.java index 83c1dc5..d8bce1e 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/DocumentEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/DocumentEntity.java @@ -11,7 +11,9 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.modules.book.model.enums.DocumentStatusEnum; +import lombok.Data; +@Data @TableName(value="b_document") public class DocumentEntity extends Model{ @@ -47,118 +49,10 @@ public class DocumentEntity extends Model{ @TableField(exist=false) private List fileUploads; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getBookId() { - return bookId; - } - public void setBookId(String bookId) { - this.bookId = bookId; - } - public String getOwner() { - return owner; - } - public void setOwner(String owner) { - this.owner = owner; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - public String getContent() { - return content; - } - public void setContent(String content) { - this.content = content; - } - public String getMarkdown() { - return markdown; - } - public void setMarkdown(String markdown) { - this.markdown = markdown; - } - public String getParentId() { - return parentId; - } - public void setParentId(String parentId) { - this.parentId = parentId; - } - public Integer getLevel() { - return level; - } - public void setLevel(Integer level) { - this.level = level; - } - public String getRootId() { - return rootId; - } - public void setRootId(String rootId) { - this.rootId = rootId; - } - public boolean isLeaf() { - return leaf; - } - public void setLeaf(boolean leaf) { - this.leaf = leaf; - } - public String getIsOpen() { - return isOpen; - } - public void setIsOpen(String isOpen) { - this.isOpen = isOpen; - } - public List getChildren() { - return children; - } - public void setChildren(List children) { - this.children = children; - } + @Override protected Serializable pkVal() { return getId(); } - public String getCover() { - return cover; - } - public void setCover(String cover) { - this.cover = cover; - } - public DocumentStatusEnum getStatus() { - return status; - } - public void setStatus(DocumentStatusEnum status) { - this.status = status; - } - public List getFileUploads() { - return fileUploads; - } - public void setFileUploads(List fileUploads) { - this.fileUploads = fileUploads; - } - public String getBatchNo() { - return batchNo; - } - public void setBatchNo(String batchNo) { - this.batchNo = batchNo; - } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileEntity.java index f6a19b7..40fe810 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileEntity.java @@ -2,14 +2,9 @@ package com.tamguo.modules.book.model; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; -/** - * - * Entity - 图片 - * - * @author tamguo - * - */ +@Data @TableName(value="b_file_entity") public class FileEntity { @@ -21,49 +16,4 @@ public class FileEntity { private String fileContentType; private String fileExtension; private Long fileSize; - - public String getFileId() { - return fileId; - } - public void setFileId(String fileId) { - this.fileId = fileId; - } - public String getFileMd5() { - return fileMd5; - } - public void setFileMd5(String fileMd5) { - this.fileMd5 = fileMd5; - } - public String getFilePath() { - return filePath; - } - public void setFilePath(String filePath) { - this.filePath = filePath; - } - public String getFileContentType() { - return fileContentType; - } - public void setFileContentType(String fileContentType) { - this.fileContentType = fileContentType; - } - public String getFileExtension() { - return fileExtension; - } - public void setFileExtension(String fileExtension) { - this.fileExtension = fileExtension; - } - public Long getFileSize() { - return fileSize; - } - public void setFileSize(Long fileSize) { - this.fileSize = fileSize; - } - - public String getFileUrl() { - return getFilePath(); - } - - public String getId() { - return getFileId(); - } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileUploadEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileUploadEntity.java index eef88a1..4921c8e 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileUploadEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/book/model/FileUploadEntity.java @@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.modules.book.model.enums.BizTypeEnum; import com.tamguo.modules.book.model.enums.FileUploadStatusEnum; +import lombok.Data; +@Data @TableName(value="b_file_upload") public class FileUploadEntity extends Model{ @@ -30,99 +32,13 @@ public class FileUploadEntity extends Model{ private String updateBy; private Date updateDate; private String remarks; - @TableField(exist=false) private String filePath; @TableField(exist=false) private Long fileSize; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getFileId() { - return fileId; - } - public void setFileId(String fileId) { - this.fileId = fileId; - } - public String getFileName() { - return fileName; - } - public void setFileName(String fileName) { - this.fileName = fileName; - } - public String getFileType() { - return fileType; - } - public void setFileType(String fileType) { - this.fileType = fileType; - } - public String getBizKey() { - return bizKey; - } - public void setBizKey(String bizKey) { - this.bizKey = bizKey; - } - public String getCreateBy() { - return createBy; - } - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public String getUpdateBy() { - return updateBy; - } - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - public String getRemarks() { - return remarks; - } - public void setRemarks(String remarks) { - this.remarks = remarks; - } @Override protected Serializable pkVal() { return getId(); } - public BizTypeEnum getBizType() { - return bizType; - } - public void setBizType(BizTypeEnum bizType) { - this.bizType = bizType; - } - public FileUploadStatusEnum getStatus() { - return status; - } - public void setStatus(FileUploadStatusEnum status) { - this.status = status; - } - public String getFilePath() { - return filePath; - } - public void setFilePath(String filePath) { - this.filePath = filePath; - } - public Long getFileSize() { - return fileSize; - } - public void setFileSize(Long fileSize) { - this.fileSize = fileSize; - } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java index e1b3d58..c764cf7 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java @@ -7,164 +7,29 @@ import java.util.Date; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; +import lombok.Data; -/** - * The persistent class for the tiku_ad database table. - * - */ +@Data @TableName(value="t_member") public class MemberEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; private String username; - private String nickName; - private String password; - private String avatar; - private String mobile; - private String email; - private Integer point; - private BigDecimal amount; - private Date lastLoginTime; - private Integer paperNum; - private Integer questionNum; - private Integer downNum; - private Integer hitsNum; - @TableField(exist=false) private String verifyCode; - @TableField(exist=false) private String nowPassword; - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public Integer getPoint() { - return point; - } - - public void setPoint(Integer point) { - this.point = point; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public Integer getPaperNum() { - return paperNum; - } - - public void setPaperNum(Integer paperNum) { - this.paperNum = paperNum; - } - - public Integer getQuestionNum() { - return questionNum; - } - - public void setQuestionNum(Integer questionNum) { - this.questionNum = questionNum; - } - - public Integer getHitsNum() { - return hitsNum; - } - - public void setHitsNum(Integer hitsNum) { - this.hitsNum = hitsNum; - } - - public Integer getDownNum() { - return downNum; - } - - public void setDownNum(Integer downNum) { - this.downNum = downNum; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getVerifyCode() { - return verifyCode; - } - - public void setVerifyCode(String verifyCode) { - this.verifyCode = verifyCode; - } - - public String getNowPassword() { - return nowPassword; - } - - public void setNowPassword(String nowPassword) { - this.nowPassword = nowPassword; - } - - public Date getLastLoginTime() { - return lastLoginTime; - } - - public void setLastLoginTime(Date lastLoginTime) { - this.lastLoginTime = lastLoginTime; - } } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java index 846a0cf..66195eb 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java @@ -12,12 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.sys.model.enums.SysAreaStatusEnum; +import lombok.Data; /** * The persistent class for the sys_area database table. * */ +@Data @TableName(value="sys_area") public class SysAreaEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -54,154 +56,7 @@ public class SysAreaEntity implements Serializable { @TableField(exist=false) private List children; - public SysAreaEntity() { - } - - public String getAreaCode() { - return this.areaCode; - } - - public void setAreaCode(String areaCode) { - this.areaCode = areaCode; - } - - public String getAreaName() { - return this.areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getAreaType() { - return this.areaType; - } - - public void setAreaType(String areaType) { - this.areaType = areaType; - } - - public String getCreateBy() { - return this.createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateDate() { - return this.createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public String getParentCode() { - return this.parentCode; - } - - public void setParentCode(String parentCode) { - this.parentCode = parentCode; - } - - public String getParentCodes() { - return this.parentCodes; - } - - public void setParentCodes(String parentCodes) { - this.parentCodes = parentCodes; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public BigDecimal getTreeLevel() { - return this.treeLevel; - } - - public void setTreeLevel(BigDecimal treeLevel) { - this.treeLevel = treeLevel; - } - - public String getTreeNames() { - return this.treeNames; - } - - public void setTreeNames(String treeNames) { - this.treeNames = treeNames; - } - - public BigDecimal getTreeSort() { - return this.treeSort; - } - - public void setTreeSort(BigDecimal treeSort) { - this.treeSort = treeSort; - } - - public String getTreeSorts() { - return this.treeSorts; - } - - public void setTreeSorts(String treeSorts) { - this.treeSorts = treeSorts; - } - - public String getUpdateBy() { - return this.updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateDate() { - return this.updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - public String getId() { - return getAreaCode(); - } - - public Boolean getTreeLeaf() { - return treeLeaf; - } - - public void setTreeLeaf(Boolean treeLeaf) { - this.treeLeaf = treeLeaf; - } - - public SysAreaStatusEnum getStatus() { - return status; - } - - public void setStatus(SysAreaStatusEnum status) { - this.status = status; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - public String getValue() { - return getAreaCode(); - } - - public String getLable() { - return getAreaName(); + return areaCode; } } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java index ed97ebb..43b654b 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java @@ -9,11 +9,9 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; +import lombok.Data; -/** - * The persistent class for the sys_company database table. - * - */ +@Data @TableName(value="sys_company") @KeySequence public class SysCompanyEntity implements Serializable { @@ -48,183 +46,10 @@ public class SysCompanyEntity implements Serializable { @TableField(fill = FieldFill.INSERT) private Date updateDate; private String viewCode; - @TableField(exist=false) private String treeAreaNames; - public SysCompanyEntity() { - } - - public String getAreaCode() { - return this.areaCode; - } - - public void setAreaCode(String areaCode) { - this.areaCode = areaCode; - } - - public String getCompanyName() { - return this.companyName; - } - - public void setCompanyName(String companyName) { - this.companyName = companyName; - } - - public String getCorpCode() { - return this.corpCode; - } - - public void setCorpCode(String corpCode) { - this.corpCode = corpCode; - } - - public String getCorpName() { - return this.corpName; - } - - public void setCorpName(String corpName) { - this.corpName = corpName; - } - - public String getCreateBy() { - return this.createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateDate() { - return this.createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public String getFullName() { - return this.fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getParentCode() { - return this.parentCode; - } - - public void setParentCode(String parentCode) { - this.parentCode = parentCode; - } - - public String getParentCodes() { - return this.parentCodes; - } - - public void setParentCodes(String parentCodes) { - this.parentCodes = parentCodes; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status = status; - } - - public BigDecimal getTreeLevel() { - return this.treeLevel; - } - - public void setTreeLevel(BigDecimal treeLevel) { - this.treeLevel = treeLevel; - } - - public String getTreeNames() { - return this.treeNames; - } - - public void setTreeNames(String treeNames) { - this.treeNames = treeNames; - } - - public String getTreeSort() { - return this.treeSort; - } - - public void setTreeSort(String treeSort) { - this.treeSort = treeSort; - } - - public String getTreeSorts() { - return this.treeSorts; - } - - public void setTreeSorts(String treeSorts) { - this.treeSorts = treeSorts; - } - - public String getUpdateBy() { - return this.updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateDate() { - return this.updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - - public String getViewCode() { - return this.viewCode; - } - - public void setViewCode(String viewCode) { - this.viewCode = viewCode; - } - - public Boolean getTreeLeaf() { - return treeLeaf; - } - - public void setTreeLeaf(Boolean treeLeaf) { - this.treeLeaf = treeLeaf; - } - public String getId() { - return this.getCompanyCode(); - } - - public String getCompanyCode() { return companyCode; } - - public void setCompanyCode(String companyCode) { - this.companyCode = companyCode; - } - - public String getTreeAreaNames() { - return treeAreaNames; - } - - public void setTreeAreaNames(String treeAreaNames) { - this.treeAreaNames = treeAreaNames; - } - } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java index a063223..7a32013 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java @@ -11,12 +11,9 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.sys.model.enums.SysMenuStatusEnum; +import lombok.Data; - -/** - * The persistent class for the sys_menu database table. - * - */ +@Data @TableName(value="sys_menu") public class SysMenuEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -57,205 +54,7 @@ public class SysMenuEntity implements Serializable { private Date updateDate; private BigDecimal weight; - public SysMenuEntity() { - } - - public String getMenuCode() { - return this.menuCode; - } - - public void setMenuCode(String menuCode) { - this.menuCode = menuCode; - } - - public String getCreateBy() { - return this.createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateDate() { - return this.createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public String getIsShow() { - return this.isShow; - } - - public void setIsShow(String isShow) { - this.isShow = isShow; - } - - public String getMenuColor() { - return this.menuColor; - } - - public void setMenuColor(String menuColor) { - this.menuColor = menuColor; - } - - public String getMenuHref() { - return this.menuHref; - } - - public void setMenuHref(String menuHref) { - this.menuHref = menuHref; - } - - public String getMenuIcon() { - return this.menuIcon; - } - - public void setMenuIcon(String menuIcon) { - this.menuIcon = menuIcon; - } - - public String getMenuName() { - return this.menuName; - } - - public void setMenuName(String menuName) { - this.menuName = menuName; - } - - public String getMenuTarget() { - return this.menuTarget; - } - - public void setMenuTarget(String menuTarget) { - this.menuTarget = menuTarget; - } - - public String getMenuType() { - return this.menuType; - } - - public void setMenuType(String menuType) { - this.menuType = menuType; - } - - public String getParentCode() { - return this.parentCode; - } - - public void setParentCode(String parentCode) { - this.parentCode = parentCode; - } - - public String getParentCodes() { - return this.parentCodes; - } - - public void setParentCodes(String parentCodes) { - this.parentCodes = parentCodes; - } - - public String getPermission() { - return this.permission; - } - - public void setPermission(String permission) { - this.permission = permission; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - - public String getSysCode() { - return this.sysCode; - } - - public void setSysCode(String sysCode) { - this.sysCode = sysCode; - } - - public BigDecimal getTreeLevel() { - return this.treeLevel; - } - - public void setTreeLevel(BigDecimal treeLevel) { - this.treeLevel = treeLevel; - } - - public String getTreeNames() { - return this.treeNames; - } - - public void setTreeNames(String treeNames) { - this.treeNames = treeNames; - } - - public BigDecimal getTreeSort() { - return this.treeSort; - } - - public void setTreeSort(BigDecimal treeSort) { - this.treeSort = treeSort; - } - - public String getTreeSorts() { - return this.treeSorts; - } - - public void setTreeSorts(String treeSorts) { - this.treeSorts = treeSorts; - } - - public String getUpdateBy() { - return this.updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateDate() { - return this.updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - - public BigDecimal getWeight() { - return this.weight; - } - - public void setWeight(BigDecimal weight) { - this.weight = weight; - } - - // grid tree - public String getId() { - return getMenuCode(); - } - - public SysMenuStatusEnum getStatus() { - return status; - } - - public void setStatus(SysMenuStatusEnum status) { - this.status = status; - } - - public Boolean getTreeLeaf() { - return treeLeaf; - } - - public void setTreeLeaf(Boolean treeLeaf) { - this.treeLeaf = treeLeaf; - } - + public String getId() { + return menuCode; + } } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java index 583f7c4..4efd0f6 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java @@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; +import lombok.Data; /** * The persistent class for the sys_office database table. * */ +@Data @TableName(value="sys_office") public class SysOfficeEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -52,209 +54,6 @@ public class SysOfficeEntity implements Serializable { private String viewCode; private String zipCode; - public SysOfficeEntity() { - } - - public String getOfficeCode() { - return this.officeCode; - } - - public void setOfficeCode(String officeCode) { - this.officeCode = officeCode; - } - - public String getAddress() { - return this.address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCorpCode() { - return this.corpCode; - } - - public void setCorpCode(String corpCode) { - this.corpCode = corpCode; - } - - public String getCorpName() { - return this.corpName; - } - - public void setCorpName(String corpName) { - this.corpName = corpName; - } - - public String getCreateBy() { - return this.createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateDate() { - return this.createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public String getEmail() { - return this.email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getFullName() { - return this.fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getLeader() { - return this.leader; - } - - public void setLeader(String leader) { - this.leader = leader; - } - - public String getOfficeName() { - return this.officeName; - } - - public void setOfficeName(String officeName) { - this.officeName = officeName; - } - - public String getOfficeType() { - return this.officeType; - } - - public void setOfficeType(String officeType) { - this.officeType = officeType; - } - - public String getParentCode() { - return this.parentCode; - } - - public void setParentCode(String parentCode) { - this.parentCode = parentCode; - } - - public String getParentCodes() { - return this.parentCodes; - } - - public void setParentCodes(String parentCodes) { - this.parentCodes = parentCodes; - } - - public String getPhone() { - return this.phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Boolean getTreeLeaf() { - return this.treeLeaf; - } - - public void setTreeLeaf(Boolean treeLeaf) { - this.treeLeaf = treeLeaf; - } - - public BigDecimal getTreeLevel() { - return this.treeLevel; - } - - public void setTreeLevel(BigDecimal treeLevel) { - this.treeLevel = treeLevel; - } - - public String getTreeNames() { - return this.treeNames; - } - - public void setTreeNames(String treeNames) { - this.treeNames = treeNames; - } - - public BigDecimal getTreeSort() { - return this.treeSort; - } - - public void setTreeSort(BigDecimal treeSort) { - this.treeSort = treeSort; - } - - public String getTreeSorts() { - return this.treeSorts; - } - - public void setTreeSorts(String treeSorts) { - this.treeSorts = treeSorts; - } - - public String getUpdateBy() { - return this.updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateDate() { - return this.updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - - public String getViewCode() { - return this.viewCode; - } - - public void setViewCode(String viewCode) { - this.viewCode = viewCode; - } - - public String getZipCode() { - return this.zipCode; - } - - public void setZipCode(String zipCode) { - this.zipCode = zipCode; - } - // grid tree public String getId() { return this.getOfficeCode(); diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java index 1905959..64a25de 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java @@ -12,12 +12,9 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.sys.model.enums.SysPostStatusEnum; +import lombok.Data; - -/** - * The persistent class for the sys_post database table. - * - */ +@Data @TableName(value="sys_post") public class SysPostEntity extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -42,105 +39,6 @@ public class SysPostEntity extends Model implements Serializable @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; - public SysPostEntity() { - } - - public String getPostCode() { - return this.postCode; - } - - public void setPostCode(String postCode) { - this.postCode = postCode; - } - - public String getCorpCode() { - return this.corpCode; - } - - public void setCorpCode(String corpCode) { - this.corpCode = corpCode; - } - - public String getCorpName() { - return this.corpName; - } - - public void setCorpName(String corpName) { - this.corpName = corpName; - } - - public String getCreateBy() { - return this.createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateDate() { - return this.createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public String getPostName() { - return this.postName; - } - - public void setPostName(String postName) { - this.postName = postName; - } - - public BigDecimal getPostSort() { - return this.postSort; - } - - public void setPostSort(BigDecimal postSort) { - this.postSort = postSort; - } - - public String getPostType() { - return this.postType; - } - - public void setPostType(String postType) { - this.postType = postType; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public SysPostStatusEnum getStatus() { - return this.status; - } - - public void setStatus(SysPostStatusEnum status) { - this.status = status; - } - - public String getUpdateBy() { - return this.updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateDate() { - return this.updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - @Override protected Serializable pkVal() { return getPostCode(); diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleDataScopeEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleDataScopeEntity.java index 56219d2..0ca9a42 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleDataScopeEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleDataScopeEntity.java @@ -1,7 +1,9 @@ package com.tamguo.modules.sys.model; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +@Data @TableName(value="sys_role_data_scope") public class SysRoleDataScopeEntity { @@ -9,30 +11,5 @@ public class SysRoleDataScopeEntity { private String ctrlType; private String ctrlData; private String ctrlPermi; - - public String getRoleCode() { - return roleCode; - } - public void setRoleCode(String roleCode) { - this.roleCode = roleCode; - } - public String getCtrlType() { - return ctrlType; - } - public void setCtrlType(String ctrlType) { - this.ctrlType = ctrlType; - } - public String getCtrlData() { - return ctrlData; - } - public void setCtrlData(String ctrlData) { - this.ctrlData = ctrlData; - } - public String getCtrlPermi() { - return ctrlPermi; - } - public void setCtrlPermi(String ctrlPermi) { - this.ctrlPermi = ctrlPermi; - } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java index b5a5ad8..384831f 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java @@ -8,12 +8,9 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; +import lombok.Data; - -/** - * The persistent class for the sys_role database table. - * - */ +@Data @TableName(value="sys_role") public class SysRoleEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -44,147 +41,4 @@ public class SysRoleEntity implements Serializable { @TableField(exist=false) private String roleDataScopeListJson; - public SysRoleEntity() { - } - - public String getRoleCode() { - return this.roleCode; - } - - public void setRoleCode(String roleCode) { - this.roleCode = roleCode; - } - - public String getCorpCode() { - return this.corpCode; - } - - public void setCorpCode(String corpCode) { - this.corpCode = corpCode; - } - - public String getCorpName() { - return this.corpName; - } - - public void setCorpName(String corpName) { - this.corpName = corpName; - } - - public String getCreateBy() { - return this.createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateDate() { - return this.createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public String getDataScope() { - return this.dataScope; - } - - public void setDataScope(String dataScope) { - this.dataScope = dataScope; - } - - public String getIsSys() { - return this.isSys; - } - - public void setIsSys(String isSys) { - this.isSys = isSys; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getRoleName() { - return this.roleName; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - public BigDecimal getRoleSort() { - return this.roleSort; - } - - public void setRoleSort(BigDecimal roleSort) { - this.roleSort = roleSort; - } - - public String getRoleType() { - return this.roleType; - } - - public void setRoleType(String roleType) { - this.roleType = roleType; - } - - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getUpdateBy() { - return this.updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateDate() { - return this.updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - - public String getUserType() { - return this.userType; - } - - public void setUserType(String userType) { - this.userType = userType; - } - - public String getId() { - return getRoleCode(); - } - - public String getRoleMenuListJson() { - return roleMenuListJson; - } - - public void setRoleMenuListJson(String roleMenuListJson) { - this.roleMenuListJson = roleMenuListJson; - } - - public String getRoleDataScopeListJson() { - return roleDataScopeListJson; - } - - public void setRoleDataScopeListJson(String roleDataScopeListJson) { - this.roleDataScopeListJson = roleDataScopeListJson; - } - } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleMenuEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleMenuEntity.java index f3cbabb..e3172aa 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleMenuEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleMenuEntity.java @@ -1,24 +1,13 @@ package com.tamguo.modules.sys.model; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +@Data @TableName(value="sys_role_menu") public class SysRoleMenuEntity { private String roleCode; private String menuCode; - - public String getRoleCode() { - return roleCode; - } - public void setRoleCode(String roleCode) { - this.roleCode = roleCode; - } - public String getMenuCode() { - return menuCode; - } - public void setMenuCode(String menuCode) { - this.menuCode = menuCode; - } - + } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserDataScopeEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserDataScopeEntity.java index 13e20b5..d46ea7b 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserDataScopeEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserDataScopeEntity.java @@ -1,7 +1,9 @@ package com.tamguo.modules.sys.model; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +@Data @TableName(value="sys_user_data_scope") public class SysUserDataScopeEntity { @@ -9,29 +11,5 @@ public class SysUserDataScopeEntity { private String ctrlType; private String ctrlData; private String ctrlPermi; - public String getUserCode() { - return userCode; - } - public void setUserCode(String userCode) { - this.userCode = userCode; - } - public String getCtrlType() { - return ctrlType; - } - public void setCtrlType(String ctrlType) { - this.ctrlType = ctrlType; - } - public String getCtrlData() { - return ctrlData; - } - public void setCtrlData(String ctrlData) { - this.ctrlData = ctrlData; - } - public String getCtrlPermi() { - return ctrlPermi; - } - public void setCtrlPermi(String ctrlPermi) { - this.ctrlPermi = ctrlPermi; - } - + } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java index 963b75f..2f7a4e4 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java @@ -15,12 +15,9 @@ import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; import com.tamguo.modules.sys.model.enums.SysUserTypeEnum; +import lombok.Data; - -/** - * The persistent class for the sys_user database table. - * - */ +@Data @TableName(value="sys_user") public class SysUserEntity extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -96,392 +93,6 @@ public class SysUserEntity extends Model implements Serializable @TableField(exist=false) private String userDataScopeListJson; - public SysUserEntity() { - } - - public String getUserCode() { - return this.userCode; - } - - public void setUserCode(String userCode) { - this.userCode = userCode; - } - - public String getAvatar() { - return this.avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getCorpCode() { - return this.corpCode; - } - - public void setCorpCode(String corpCode) { - this.corpCode = corpCode; - } - - public String getCorpName() { - return this.corpName; - } - - public void setCorpName(String corpName) { - this.corpName = corpName; - } - - public String getCreateBy() { - return this.createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateDate() { - return this.createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public String getEmail() { - return this.email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getFreezeCause() { - return this.freezeCause; - } - - public void setFreezeCause(String freezeCause) { - this.freezeCause = freezeCause; - } - - public Date getFreezeDate() { - return this.freezeDate; - } - - public void setFreezeDate(Date freezeDate) { - this.freezeDate = freezeDate; - } - - public Date getLastLoginDate() { - return this.lastLoginDate; - } - - public void setLastLoginDate(Date lastLoginDate) { - this.lastLoginDate = lastLoginDate; - } - - public String getLastLoginIp() { - return this.lastLoginIp; - } - - public void setLastLoginIp(String lastLoginIp) { - this.lastLoginIp = lastLoginIp; - } - - public String getLoginCode() { - return this.loginCode; - } - - public void setLoginCode(String loginCode) { - this.loginCode = loginCode; - } - - public String getMobile() { - return this.mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public String getMobileImei() { - return this.mobileImei; - } - - public void setMobileImei(String mobileImei) { - this.mobileImei = mobileImei; - } - - public String getPassword() { - return this.password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getPhone() { - return this.phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public Date getPwdQuestUpdateDate() { - return this.pwdQuestUpdateDate; - } - - public void setPwdQuestUpdateDate(Date pwdQuestUpdateDate) { - this.pwdQuestUpdateDate = pwdQuestUpdateDate; - } - - public String getPwdQuestion() { - return this.pwdQuestion; - } - - public void setPwdQuestion(String pwdQuestion) { - this.pwdQuestion = pwdQuestion; - } - - public String getPwdQuestion2() { - return this.pwdQuestion2; - } - - public void setPwdQuestion2(String pwdQuestion2) { - this.pwdQuestion2 = pwdQuestion2; - } - - public String getPwdQuestion3() { - return this.pwdQuestion3; - } - - public void setPwdQuestion3(String pwdQuestion3) { - this.pwdQuestion3 = pwdQuestion3; - } - - public String getPwdQuestionAnswer() { - return this.pwdQuestionAnswer; - } - - public void setPwdQuestionAnswer(String pwdQuestionAnswer) { - this.pwdQuestionAnswer = pwdQuestionAnswer; - } - - public String getPwdQuestionAnswer2() { - return this.pwdQuestionAnswer2; - } - - public void setPwdQuestionAnswer2(String pwdQuestionAnswer2) { - this.pwdQuestionAnswer2 = pwdQuestionAnswer2; - } - - public String getPwdQuestionAnswer3() { - return this.pwdQuestionAnswer3; - } - - public void setPwdQuestionAnswer3(String pwdQuestionAnswer3) { - this.pwdQuestionAnswer3 = pwdQuestionAnswer3; - } - - public BigDecimal getPwdSecurityLevel() { - return this.pwdSecurityLevel; - } - - public void setPwdSecurityLevel(BigDecimal pwdSecurityLevel) { - this.pwdSecurityLevel = pwdSecurityLevel; - } - - public Date getPwdUpdateDate() { - return this.pwdUpdateDate; - } - - public void setPwdUpdateDate(Date pwdUpdateDate) { - this.pwdUpdateDate = pwdUpdateDate; - } - - public String getPwdUpdateRecord() { - return this.pwdUpdateRecord; - } - - public void setPwdUpdateRecord(String pwdUpdateRecord) { - this.pwdUpdateRecord = pwdUpdateRecord; - } - - public String getRefCode() { - return this.refCode; - } - - public void setRefCode(String refCode) { - this.refCode = refCode; - } - - public String getRefName() { - return this.refName; - } - - public void setRefName(String refName) { - this.refName = refName; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getSex() { - return this.sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - public String getSign() { - return this.sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public SysUserStatusEnum getStatus() { - return this.status; - } - - public void setStatus(SysUserStatusEnum status) { - this.status = status; - } - - public String getUpdateBy() { - return this.updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateDate() { - return this.updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - - public String getUserName() { - return this.userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public BigDecimal getUserWeight() { - return this.userWeight; - } - - public void setUserWeight(BigDecimal userWeight) { - this.userWeight = userWeight; - } - - public String getWxOpenid() { - return this.wxOpenid; - } - - public void setWxOpenid(String wxOpenid) { - this.wxOpenid = wxOpenid; - } - - public String getOfficeCode() { - return officeCode; - } - - public void setOfficeCode(String officeCode) { - this.officeCode = officeCode; - } - - public String getOfficeName() { - return officeName; - } - - public void setOfficeName(String officeName) { - this.officeName = officeName; - } - - public String getCompanyCode() { - return companyCode; - } - - public void setCompanyCode(String companyCode) { - this.companyCode = companyCode; - } - - public String getCompanyName() { - return companyName; - } - - public void setCompanyName(String companyName) { - this.companyName = companyName; - } - - public SysUserMgrTypeEnum getMgrType() { - return mgrType; - } - - public void setMgrType(SysUserMgrTypeEnum mgrType) { - this.mgrType = mgrType; - } - - public String getUserNameEn() { - return userNameEn; - } - - public void setUserNameEn(String userNameEn) { - this.userNameEn = userNameEn; - } - - public List getEmployeePosts() { - return employeePosts; - } - - public void setEmployeePosts(List employeePosts) { - this.employeePosts = employeePosts; - } - - public String getEmpName() { - return empName; - } - - public void setEmpName(String empName) { - this.empName = empName; - } - - public String getUserRoleString() { - return userRoleString; - } - - public void setUserRoleString(String userRoleString) { - this.userRoleString = userRoleString; - } - - public SysUserTypeEnum getUserType() { - return userType; - } - - public void setUserType(SysUserTypeEnum userType) { - this.userType = userType; - } - - public String getUserDataScopeListJson() { - return userDataScopeListJson; - } - - public void setUserDataScopeListJson(String userDataScopeListJson) { - this.userDataScopeListJson = userDataScopeListJson; - } @Override protected Serializable pkVal() { diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserPostEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserPostEntity.java index 8b53c93..3906364 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserPostEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserPostEntity.java @@ -1,23 +1,12 @@ package com.tamguo.modules.sys.model; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +@Data @TableName(value="sys_user_post") public class SysUserPostEntity { private String userCode; private String postCode; - public String getUserCode() { - return userCode; - } - public void setUserCode(String userCode) { - this.userCode = userCode; - } - public String getPostCode() { - return postCode; - } - public void setPostCode(String postCode) { - this.postCode = postCode; - } - } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserRoleEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserRoleEntity.java index 0d515ef..a99210a 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserRoleEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserRoleEntity.java @@ -1,23 +1,13 @@ package com.tamguo.modules.sys.model; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +@Data @TableName(value="sys_user_role") public class SysUserRoleEntity { private String userCode; private String roleCode; - - public String getRoleCode() { - return roleCode; - } - public void setRoleCode(String roleCode) { - this.roleCode = roleCode; - } - public String getUserCode() { - return userCode; - } - public void setUserCode(String userCode) { - this.userCode = userCode; - } + } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/TeacherEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/TeacherEntity.java index a8b142c..96b6220 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/TeacherEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/TeacherEntity.java @@ -6,159 +6,27 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; import com.tamguo.modules.sys.model.enums.TeacherStatus; +import lombok.Data; - -/** - * The persistent class for the tiku_teacher database table. - * - */ +@Data @TableName(value="t_teacher") public class TeacherEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; private String mobile; - private String email; - private String name; - private String motto; - private String provinceId; - private String cityId; - private String subjectId; - private String courseId; - private String cardId; - private String cardPhoto; - private String occupationPapers; - private Long createTime; - @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private TeacherStatus status; - private String qq; - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getMotto() { - return motto; - } - - public void setMotto(String motto) { - this.motto = motto; - } - - public String getCourseId() { - return courseId; - } - - public void setCourseId(String courseId) { - this.courseId = courseId; - } - - public String getCardId() { - return cardId; - } - - public void setCardId(String cardId) { - this.cardId = cardId; - } - - public String getCardPhoto() { - return cardPhoto; - } - - public void setCardPhoto(String cardPhoto) { - this.cardPhoto = cardPhoto; - } - - public String getOccupationPapers() { - return occupationPapers; - } - - public void setOccupationPapers(String occupationPapers) { - this.occupationPapers = occupationPapers; - } - - public String getQq() { - return qq; - } - - public void setQq(String qq) { - this.qq = qq; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public String getSubjectId() { - return subjectId; - } - - public void setSubjectId(String subjectId) { - this.subjectId = subjectId; - } - - public String getProvinceId() { - return provinceId; - } - - public void setProvinceId(String provinceId) { - this.provinceId = provinceId; - } - - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { - this.createTime = createTime; - } - - public TeacherStatus getStatus() { - return status; - } - - public void setStatus(TeacherStatus status) { - this.status = status; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/QuestionOptionsMapper.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/QuestionOptionsMapper.java new file mode 100644 index 0000000..fb6b8fa --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/QuestionOptionsMapper.java @@ -0,0 +1,10 @@ +package com.tamguo.modules.tiku.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.tamguo.modules.tiku.model.QuestionOptionsEntity; + +/** + * Created by TanGuo on 2019/3/25. + */ +public interface QuestionOptionsMapper extends BaseMapper { +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/AdEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/AdEntity.java index 6879afa..a6ba454 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/AdEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/AdEntity.java @@ -1,59 +1,29 @@ package com.tamguo.modules.tiku.model; import java.io.Serializable; + +import lombok.Data; import org.apache.commons.lang3.StringUtils; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; -/** - * The persistent class for the t_ad database table. - * - */ +@Data @TableName(value="t_ad") public class AdEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; private String businessKey; - private String name; - private String adInfo; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public String getAdInfo() { - return adInfo; - } - - public void setAdInfo(String adInfo) { - this.adInfo = adInfo; - } - public JSONArray getAds(){ - if(StringUtils.isEmpty(getAdInfo())){ + if(StringUtils.isEmpty(adInfo)){ return null; } - return JSONArray.parseArray(getAdInfo()); + return JSONArray.parseArray(adInfo); } - public String getBusinessKey() { - return businessKey; - } - - public void setBusinessKey(String businessKey) { - this.businessKey = businessKey; - } } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java index de6befb..168e7c7 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; import com.tamguo.modules.tiku.model.enums.ChapterStatusEnum; +import lombok.Data; import java.util.List; @@ -17,6 +18,7 @@ import java.util.List; * */ @TableName(value="t_chapter") +@Data public class ChapterEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -41,127 +43,4 @@ public class ChapterEntity extends SuperEntity implements Seriali @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private ChapterStatusEnum status; - public ChapterEntity() { - } - - public String getCourseId() { - return this.courseId; - } - - public void setCourseId(String courseId) { - this.courseId = courseId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public List getChildChapterList() { - return childChapterList; - } - - public void setChildChapterList(List childChapterList) { - this.childChapterList = childChapterList; - } - - public Integer getQuestionNum() { - return questionNum; - } - - public void setQuestionNum(Integer questionNum) { - this.questionNum = questionNum; - } - - public Integer getPointNum() { - return pointNum; - } - - public void setPointNum(Integer pointNum) { - this.pointNum = pointNum; - } - - public Integer getOrders() { - return orders; - } - - public void setOrders(Integer orders) { - this.orders = orders; - } - - public String getParentCode() { - return parentCode; - } - - public void setParentCode(String parentCode) { - this.parentCode = parentCode; - } - - public String getParentCodes() { - return parentCodes; - } - - public void setParentCodes(String parentCodes) { - this.parentCodes = parentCodes; - } - - public Boolean getTreeLeaf() { - return treeLeaf; - } - - public void setTreeLeaf(Boolean treeLeaf) { - this.treeLeaf = treeLeaf; - } - - public Integer getTreeLevel() { - return treeLevel; - } - - public void setTreeLevel(Integer treeLevel) { - this.treeLevel = treeLevel; - } - - public ChapterStatusEnum getStatus() { - return status; - } - - public void setStatus(ChapterStatusEnum status) { - this.status = status; - } - - public String getBookId() { - return bookId; - } - - public void setBookId(String bookId) { - this.bookId = bookId; - } - - public String getSeoTitle() { - return seoTitle; - } - - public void setSeoTitle(String seoTitle) { - this.seoTitle = seoTitle; - } - - public String getSeoKeywords() { - return seoKeywords; - } - - public void setSeoKeywords(String seoKeywords) { - this.seoKeywords = seoKeywords; - } - - public String getSeoDescription() { - return seoDescription; - } - - public void setSeoDescription(String seoDescription) { - this.seoDescription = seoDescription; - } - } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java index 7b05b35..4f289cb 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.tiku.model.enums.CourseStatusEnum; +import lombok.Data; +@Data @TableName(value="t_course") public class CourseEntity { @@ -37,102 +39,5 @@ public class CourseEntity { @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private CourseStatusEnum status; - - public String getSubjectId() { - return subjectId; - } - public void setSubjectId(String subjectId) { - this.subjectId = subjectId; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public Integer getSort() { - return sort; - } - public void setSort(Integer sort) { - this.sort = sort; - } - public Integer getQuestionNum() { - return questionNum; - } - public void setQuestionNum(Integer questionNum) { - this.questionNum = questionNum; - } - public Integer getPointNum() { - return pointNum; - } - public void setPointNum(Integer pointNum) { - this.pointNum = pointNum; - } - public String getCreateBy() { - return createBy; - } - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - public String getUpdateBy() { - return updateBy; - } - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - public CourseStatusEnum getStatus() { - return status; - } - public void setStatus(CourseStatusEnum status) { - this.status = status; - } - public String getRemarks() { - return remarks; - } - public void setRemarks(String remarks) { - this.remarks = remarks; - } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getSeoTitle() { - return seoTitle; - } - public void setSeoTitle(String seoTitle) { - this.seoTitle = seoTitle; - } - public String getSeoKeywords() { - return seoKeywords; - } - public void setSeoKeywords(String seoKeywords) { - this.seoKeywords = seoKeywords; - } - public String getSeoDescription() { - return seoDescription; - } - public void setSeoDescription(String seoDescription) { - this.seoDescription = seoDescription; - } - public String getIcon() { - return icon; - } - public void setIcon(String icon) { - this.icon = icon; - } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/KnowPointEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/KnowPointEntity.java index d3ec257..163241a 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/KnowPointEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/KnowPointEntity.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.tiku.model.enums.BookStatusEnum; +import lombok.Data; +@Data @TableName(value="t_know_point") public class KnowPointEntity { @@ -40,133 +42,4 @@ public class KnowPointEntity { @TableField(exist=false) private String courseName; - - public String getSubjectId() { - return subjectId; - } - - public void setSubjectId(String subjectId) { - this.subjectId = subjectId; - } - - public String getCourseId() { - return courseId; - } - - public void setCourseId(String courseId) { - this.courseId = courseId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPublishingHouse() { - return publishingHouse; - } - - public void setPublishingHouse(String publishingHouse) { - this.publishingHouse = publishingHouse; - } - - public Integer getQuestionNum() { - return questionNum; - } - - public void setQuestionNum(Integer questionNum) { - this.questionNum = questionNum; - } - - public Integer getPointNum() { - return pointNum; - } - - public void setPointNum(Integer pointNum) { - this.pointNum = pointNum; - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getCreateDate() { - return createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public Date getUpdateDate() { - return updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - - public String getSubjectName() { - return subjectName; - } - - public void setSubjectName(String subjectName) { - this.subjectName = subjectName; - } - - public String getCourseName() { - return courseName; - } - - public void setCourseName(String courseName) { - this.courseName = courseName; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public BookStatusEnum getStatus() { - return status; - } - - public void setStatus(BookStatusEnum status) { - this.status = status; - } - } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/MenuEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/MenuEntity.java index 3e535dd..9a6153f 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/MenuEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/MenuEntity.java @@ -4,6 +4,7 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; +import lombok.Data; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * The persistent class for the t_subject database table. * */ +@Data @TableName(value="t_menu") public class MenuEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -29,71 +31,4 @@ public class MenuEntity extends SuperEntity implements Serializable @TableField(exist=false) private List childSubjects; - public MenuEntity() { - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getParentId() { - return this.parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public List getChildSubjects() { - return childSubjects; - } - - public void setChildSubjects(List childSubjects) { - this.childSubjects = childSubjects; - } - - public String getPinyin() { - return pinyin; - } - - public void setPinyin(String pinyin) { - this.pinyin = pinyin; - } - - public String getIsShow() { - return isShow; - } - - public void setIsShow(String isShow) { - this.isShow = isShow; - } - - public Integer getOrders() { - return orders; - } - - public void setOrders(Integer orders) { - this.orders = orders; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getReserve1() { - return reserve1; - } - - public void setReserve1(String reserve1) { - this.reserve1 = reserve1; - } - } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/PaperEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/PaperEntity.java index 45a0712..6b260c9 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/PaperEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/PaperEntity.java @@ -1,6 +1,8 @@ package com.tamguo.modules.tiku.model; import java.io.Serializable; + +import lombok.Data; import org.apache.commons.lang3.StringUtils; import com.alibaba.fastjson.JSONArray; @@ -13,234 +15,42 @@ import com.tamguo.config.dao.SuperEntity; * The persistent class for the t_chapter database table. * */ +@Data @TableName(value="t_paper") public class PaperEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; - private String subjectId; - private String courseId; - private String schoolId; - private String areaId; - private String createrId; - private String name; - private String questionInfo; - private String type; - private String year; - private Integer downHits; - private Integer openHits; - private String seoTitle; - private String seoKeywords; - private String seoDescription; - @TableField(value="free") private String free; - private String point; - private String money; - @TableField(exist=false) private String subjectName; - @TableField(exist=false) private String courseName; - @TableField(exist=false) private String areaName; - @TableField(exist=false) private String schoolName; public JSONArray getQueInfo(){ - if(StringUtils.isEmpty(getQuestionInfo())){ + if(StringUtils.isEmpty(questionInfo)){ return null; } - return JSONArray.parseArray(getQuestionInfo()); - } - - public String getCourseId() { - return courseId; - } - - public void setCourseId(String courseId) { - this.courseId = courseId; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getYear() { - return year; - } - - public void setYear(String year) { - this.year = year; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public String getSchoolId() { - return schoolId; - } - - public void setSchoolId(String schoolId) { - this.schoolId = schoolId; - } - - public Integer getDownHits() { - return downHits; - } - - public void setDownHits(Integer downHits) { - this.downHits = downHits; - } - - public Integer getOpenHits() { - return openHits; - } - - public void setOpenHits(Integer openHits) { - this.openHits = openHits; - } - - public String getQuestionInfo() { - return questionInfo; - } - - public void setQuestionInfo(String questionInfo) { - this.questionInfo = questionInfo; - } - - public String getCreaterId() { - return createrId; - } - - public void setCreaterId(String createrId) { - this.createrId = createrId; - } - - public String getSeoTitle() { - return seoTitle; - } - - public void setSeoTitle(String seoTitle) { - this.seoTitle = seoTitle; - } - - public String getSeoKeywords() { - return seoKeywords; - } - - public void setSeoKeywords(String seoKeywords) { - this.seoKeywords = seoKeywords; - } - - public String getSeoDescription() { - return seoDescription; - } - - public void setSeoDescription(String seoDescription) { - this.seoDescription = seoDescription; - } - - public String getCourseName() { - return courseName; - } - - public void setCourseName(String courseName) { - this.courseName = courseName; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getSchoolName() { - return schoolName; - } - - public void setSchoolName(String schoolName) { - this.schoolName = schoolName; - } - - public String getSubjectId() { - return subjectId; - } - - public void setSubjectId(String subjectId) { - this.subjectId = subjectId; - } - - public String getSubjectName() { - return subjectName; - } - - public void setSubjectName(String subjectName) { - this.subjectName = subjectName; - } - - public String getPoint() { - return point; - } - - public void setPoint(String point) { - this.point = point; - } - - public String getMoney() { - return money; - } - - public void setMoney(String money) { - this.money = money; - } - - public String getFree() { - return free; - } - - public void setFree(String free) { - this.free = free; + return JSONArray.parseArray(questionInfo); } } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java index df1ab6c..244a90e 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java @@ -4,7 +4,9 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; +import lombok.Data; +@Data @TableName(value="t_question_answer") public class QuestionAnswerEntity extends SuperEntity implements Serializable{ @@ -19,56 +21,4 @@ public class QuestionAnswerEntity extends SuperEntity implements Se private Integer disagreeNum; private Date createDate; - public String getQuestionId() { - return questionId; - } - public void setQuestionId(String questionId) { - this.questionId = questionId; - } - public String getMemberId() { - return memberId; - } - public void setMemberId(String memberId) { - this.memberId = memberId; - } - public String getMemberName() { - return memberName; - } - public void setMemberName(String memberName) { - this.memberName = memberName; - } - public String getAnswer() { - return answer; - } - public void setAnswer(String answer) { - this.answer = answer; - } - public Integer getAgreeNum() { - return agreeNum; - } - public void setAgreeNum(Integer agreeNum) { - this.agreeNum = agreeNum; - } - public Integer getDisagreeNum() { - return disagreeNum; - } - public void setDisagreeNum(Integer disagreeNum) { - this.disagreeNum = disagreeNum; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public static long getSerialversionuid() { - return serialVersionUID; - } - public String getMemberAvatar() { - return memberAvatar; - } - public void setMemberAvatar(String memberAvatar) { - this.memberAvatar = memberAvatar; - } - } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionEntity.java index 58fbe73..900c514 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionEntity.java @@ -1,14 +1,18 @@ package com.tamguo.modules.tiku.model; import java.io.Serializable; +import java.util.List; + import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; +import lombok.Data; /** * The persistent class for the t_question database table. * */ +@Data @TableName(value="t_question") public class QuestionEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -32,128 +36,7 @@ public class QuestionEntity extends SuperEntity implements Seria private String chapterName; @TableField(exist=false) private String subjectName; - - public QuestionEntity() { - } - - public String getAnalysis() { - return this.analysis; - } - - public void setAnalysis(String analysis) { - this.analysis = analysis; - } - - public String getAnswer() { - return this.answer; - } - - public void setAnswer(String answer) { - this.answer = answer; - } - - public String getChapterId() { - return this.chapterId; - } - - public void setChapterId(String chapterId) { - this.chapterId = chapterId; - } - - public String getQuestionType() { - return this.questionType; - } - - public void setQuestionType(String questionType) { - this.questionType = questionType; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getReviewPoint() { - return reviewPoint; - } - - public void setReviewPoint(String reviewPoint) { - this.reviewPoint = reviewPoint; - } - - public String getYear() { - return year; - } - - public void setYear(String year) { - this.year = year; - } - - public String getScore() { - return score; - } - - public void setScore(String score) { - this.score = score; - } - - public String getPaperId() { - return paperId; - } - - public void setPaperId(String paperId) { - this.paperId = paperId; - } - - public String getCourseId() { - return courseId; - } - - public void setCourseId(String courseId) { - this.courseId = courseId; - } - - public String getCourseName() { - return courseName; - } - - public void setCourseName(String courseName) { - this.courseName = courseName; - } - - public String getChapterName() { - return chapterName; - } - - public void setChapterName(String chapterName) { - this.chapterName = chapterName; - } - - public String getSubjectId() { - return subjectId; - } - - public void setSubjectId(String subjectId) { - this.subjectId = subjectId; - } - - public String getSubjectName() { - return subjectName; - } - - public void setSubjectName(String subjectName) { - this.subjectName = subjectName; - } - - public String getAuditStatus() { - return auditStatus; - } - - public void setAuditStatus(String auditStatus) { - this.auditStatus = auditStatus; - } + @TableField(exist = false) + private List questionOptions; } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionOptionsEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionOptionsEntity.java new file mode 100644 index 0000000..83efee5 --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionOptionsEntity.java @@ -0,0 +1,17 @@ +package com.tamguo.modules.tiku.model; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +@TableName(value="t_question_options") +@Data +public class QuestionOptionsEntity { + + @TableId + private String id; + private String questionId; + private String option; + private String optionNo; + private int order; +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SchoolEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SchoolEntity.java index a337344..af9a363 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SchoolEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SchoolEntity.java @@ -6,63 +6,18 @@ import java.util.List; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; +import lombok.Data; -/** - * The persistent class for the t_chapter database table. - * - */ +@Data @TableName(value="t_school") public class SchoolEntity extends SuperEntity implements Serializable { private static final long serialVersionUID = 1L; - private String areaId; - private String name; - private String image; - // 试卷 @TableField(exist=false) private List paperList; - public SchoolEntity() { - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getImage() { - return image; - } - - public void setImage(String image) { - this.image = image; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public List getPaperList() { - return paperList; - } - - public void setPaperList(List paperList) { - this.paperList = paperList; - } - } \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java index 804e902..d5defcd 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.tiku.model.enums.SubjectStatusEnum; +import lombok.Data; +@Data @TableName(value="t_subject") public class SubjectEntity { @@ -33,79 +35,4 @@ public class SubjectEntity { @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private SubjectStatusEnum status; - - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getSort() { - return sort; - } - public void setSort(String sort) { - this.sort = sort; - } - public String getCreateBy() { - return createBy; - } - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - public String getUpdateBy() { - return updateBy; - } - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - public SubjectStatusEnum getStatus() { - return status; - } - public void setStatus(SubjectStatusEnum status) { - this.status = status; - } - public String getRemarks() { - return remarks; - } - public void setRemarks(String remarks) { - this.remarks = remarks; - } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getSeoTitle() { - return seoTitle; - } - public void setSeoTitle(String seoTitle) { - this.seoTitle = seoTitle; - } - public String getSeoKeywords() { - return seoKeywords; - } - public void setSeoKeywords(String seoKeywords) { - this.seoKeywords = seoKeywords; - } - public String getSeoDescription() { - return seoDescription; - } - public void setSeoDescription(String seoDescription) { - this.seoDescription = seoDescription; - } - } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IPaperService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IPaperService.java index fe534d9..3c5231b 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IPaperService.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IPaperService.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.service.IService; import com.tamguo.common.utils.Result; import com.tamguo.modules.tiku.model.PaperEntity; +import com.tamguo.modules.tiku.model.QuestionEntity; public interface IPaperService extends IService{ @@ -25,4 +26,6 @@ public interface IPaperService extends IService{ void addPaper(PaperEntity paper); Result updatePaper(PaperEntity paper , String currMemberId); + + List findQuestionList(String paperId); } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IQuestionOptionsService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IQuestionOptionsService.java new file mode 100644 index 0000000..a22d83d --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IQuestionOptionsService.java @@ -0,0 +1,11 @@ +package com.tamguo.modules.tiku.service; + +import com.baomidou.mybatisplus.service.IService; +import com.tamguo.modules.tiku.model.QuestionOptionsEntity; + +/** + * Created by TanGuo on 2019/3/25. + */ +public interface IQuestionOptionsService extends IService { + +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java index 915f419..22c2077 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java @@ -4,6 +4,9 @@ import java.util.Arrays; import java.util.List; import java.util.UUID; +import com.tamguo.modules.tiku.dao.QuestionOptionsMapper; +import com.tamguo.modules.tiku.model.QuestionEntity; +import com.tamguo.modules.tiku.model.QuestionOptionsEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,6 +42,8 @@ public class PaperServiceImpl extends ServiceImpl impl private CacheService cacheService; @Autowired private QuestionMapper questionMapper; + @Autowired + private QuestionOptionsMapper questionOptionsMapper; @SuppressWarnings("unchecked") @Override @@ -187,12 +192,15 @@ public class PaperServiceImpl extends ServiceImpl impl return Result.result(Result.SUCCESS_CODE, paper, "修改成功"); } - public ISubjectService getiSubjectService() { - return iSubjectService; - } - - public void setiSubjectService(ISubjectService iSubjectService) { - this.iSubjectService = iSubjectService; + @Override + public List findQuestionList(String paperId) { + // 查询选项信息 + List questionList = questionMapper.selectList(Condition.create().eq("paper_id", paperId)); + questionList.forEach(question -> { + List questionOptions = questionOptionsMapper.selectList(Condition.create().eq("question_id" , question.getId())); + question.setQuestionOptions(questionOptions); + }); + return questionList; } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/QuestionOptionsServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/QuestionOptionsServiceImpl.java new file mode 100644 index 0000000..8156553 --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/QuestionOptionsServiceImpl.java @@ -0,0 +1,15 @@ +package com.tamguo.modules.tiku.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.tamguo.modules.tiku.dao.QuestionOptionsMapper; +import com.tamguo.modules.tiku.model.QuestionOptionsEntity; +import com.tamguo.modules.tiku.service.IQuestionOptionsService; +import org.springframework.stereotype.Service; + +/** + * Created by zhangshukang on 2019/3/25. + */ +@Service +public class QuestionOptionsServiceImpl extends ServiceImpl implements IQuestionOptionsService { + +} diff --git a/tamguo-oms/pom.xml b/tamguo-oms/pom.xml index 753a620..2706a5c 100644 --- a/tamguo-oms/pom.xml +++ b/tamguo-oms/pom.xml @@ -154,12 +154,22 @@ - oms + oms org.springframework.boot spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/Application.java b/tamguo-oms/src/main/java/com/tamguo/Application.java index d1d90b8..46b8e8a 100644 --- a/tamguo-oms/src/main/java/com/tamguo/Application.java +++ b/tamguo-oms/src/main/java/com/tamguo/Application.java @@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; @SpringBootApplication -@ComponentScan("com.tamguo") public class Application { public static void main(String[] args) { diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java index 706fab4..fdf576a 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java @@ -17,7 +17,7 @@ import com.tamguo.modules.tiku.service.IChapterService; @Controller @RequestMapping(path="tiku/chapter") -public class ChapterController { +public class { private final String ADD_CHAPTER_PAGE = "modules/tiku/chapter/add"; private final String UPDATE_CHAPTER_PAGE = "modules/tiku/chapter/update"; diff --git a/tamguo-tms/pom.xml b/tamguo-tms/pom.xml index c016675..57a825a 100644 --- a/tamguo-tms/pom.xml +++ b/tamguo-tms/pom.xml @@ -162,6 +162,16 @@ org.springframework.boot spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + \ No newline at end of file diff --git a/tamguo-tms/src/main/java/com/tamguo/Application.java b/tamguo-tms/src/main/java/com/tamguo/Application.java index d1d90b8..46b8e8a 100644 --- a/tamguo-tms/src/main/java/com/tamguo/Application.java +++ b/tamguo-tms/src/main/java/com/tamguo/Application.java @@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; @SpringBootApplication -@ComponentScan("com.tamguo") public class Application { public static void main(String[] args) { diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java index 1c984c0..2b7472f 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java @@ -7,6 +7,7 @@ import com.tamguo.modules.sys.model.SysAreaEntity; import com.tamguo.modules.sys.service.ISysAreaService; import com.tamguo.modules.tiku.model.CourseEntity; import com.tamguo.modules.tiku.model.PaperEntity; +import com.tamguo.modules.tiku.model.QuestionEntity; import com.tamguo.modules.tiku.model.SubjectEntity; import com.tamguo.modules.tiku.service.ICourseService; import com.tamguo.modules.tiku.service.IPaperService; @@ -115,8 +116,9 @@ public class PaperController { model.addObject("paper", paper); model.addObject("subject", StringUtils.isEmpty(paper.getSubjectId()) ? null : iSubjectService.selectById(paper.getSubjectId())); model.addObject("course", StringUtils.isEmpty(paper.getCourseId()) ? null : iCourseService.selectById(paper.getCourseId())); - model.addObject("questionList", iQuestionService.selectList(Condition.create().eq("paper_id", paperId))); + // 查询试卷题目 + model.addObject("questionList", iPaperService.findQuestionList(paperId)); // 获取推荐试卷 model.addObject("zhentiPaperList", iPaperService.selectPage(new Page(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.ZHENGTI_PAPER_ID)).getRecords()); model.addObject("moniPaperList", iPaperService.selectPage(new Page(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.MONI_PAPER_ID)).getRecords()); @@ -125,10 +127,10 @@ public class PaperController { if(BrowserUtils.isMobile(request.getHeader("user-agent"))) { - model.setViewName("mobile/paper"); - }else { - model.setViewName("paper"); - } + model.setViewName("mobile/paper"); + }else { + model.setViewName("paper"); + } return model; } catch (Exception e) { model.setViewName("404"); diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java index 4db0ed3..c6786fe 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java @@ -1,11 +1,14 @@ package com.tamguo.web.tiku; import java.util.Arrays; +import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import javax.servlet.http.HttpServletRequest; +import com.tamguo.modules.tiku.model.*; +import com.tamguo.modules.tiku.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,17 +22,8 @@ import org.springframework.web.servlet.ModelAndView; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; import com.tamguo.common.utils.Result; -import com.tamguo.modules.tiku.model.ChapterEntity; -import com.tamguo.modules.tiku.model.CourseEntity; -import com.tamguo.modules.tiku.model.QuestionEntity; -import com.tamguo.modules.tiku.model.SubjectEntity; import com.tamguo.modules.tiku.model.enums.QuestionTypeEnum; import com.tamguo.modules.tiku.model.queue.LearnChapterQueue; -import com.tamguo.modules.tiku.service.IChapterService; -import com.tamguo.modules.tiku.service.ICourseService; -import com.tamguo.modules.tiku.service.IQuestionAnswerService; -import com.tamguo.modules.tiku.service.IQuestionService; -import com.tamguo.modules.tiku.service.ISubjectService; import com.tamguo.utils.BrowserUtils; @Controller @@ -47,7 +41,9 @@ public class QuestionContrller { private ICourseService iCourseService; @Autowired private IQuestionAnswerService iQuestionAnswerService; - + @Autowired + private IQuestionOptionsService iQuestionOptionsService; + // 章节 BlockingQueue chapterQueue = new LinkedBlockingQueue(10); @@ -104,6 +100,8 @@ public class QuestionContrller { logger.info("request url :{}" , request.getRequestURI()); model.setViewName("question"); QuestionEntity question = iQuestionService.selectById(uid); + List questionOptions = iQuestionOptionsService.selectList(Condition.create().eq("question_id" , question.getId())); + question.setQuestionOptions(questionOptions); question.setQuestionType(QuestionTypeEnum.getQuestionType(question.getQuestionType()).getDesc()); model.addObject("question", question); model.addObject("course", iCourseService.selectById(question.getCourseId())); diff --git a/tamguo-tms/src/main/resources/application.properties b/tamguo-tms/src/main/resources/application.properties index 455c7ce..19d350f 100644 --- a/tamguo-tms/src/main/resources/application.properties +++ b/tamguo-tms/src/main/resources/application.properties @@ -1,7 +1,7 @@ -domain.name=https://www.tamguo.com/ +domain.name=http://localhost:8081/ admin.domain.name=https://admin.tamguo.com/ member.domain.name=https://member.tamguo.com/ -cookie.domian.name=tamguo.com +cookie.domian.name=localhost server.port=8081 jasypt.encryptor.password=tamguo @@ -14,29 +14,26 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 spring.datasource.maxWait=60000 spring.datasource.minEvictableIdleTimeMillis=300000 spring.datasource.minIdle=5 -spring.datasource.password=tanguo520pig +spring.datasource.password=boomauto spring.datasource.poolPreparedStatements=true spring.datasource.testOnBorrow=false spring.datasource.testOnReturn=false spring.datasource.testWhileIdle=true spring.datasource.timeBetweenEvictionRunsMillis=60000 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.url=jdbc:mysql://120.77.219.107:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false spring.datasource.username=root spring.datasource.validationQuery=SELECT 1 FROM DUAL mybatis-plus.mapper-locations=classpath:/mappers/*Mapper.xml mybatis-plus.typeAliasesPackage=com.tamguo.modules.*.model mybatis-plus.typeEnumsPackage=com.tamguo.modules.*.model.enums -mybatis-plus.global-config.id-type=5 +mybatis-plus.global-config.id-type=2 mybatis-plus.global-config.field-strategy=2 mybatis-plus.global-config.db-column-underline=true mybatis-plus.global-config.refresh-mapper=true -mybatis-plus.global-config.key-generator=com.baomidou.mybatisplus.incrementer.H2KeyGenerator mybatis-plus.global-config.logic-delete-value=0 mybatis-plus.global-config.logic-not-delete-value=1 -mybatis-plus.global-config.sql-injector=com.baomidou.mybatisplus.mapper.LogicSqlInjector -mybatis-plus.global-config.meta-object-handler=com.tamguo.config.dao.MyMetaObjectHandler mybatis-plus.global-config.sql-parser-cache=true mybatis-plus.configuration.map-underscore-to-camel-case=true mybatis-plus.configuration.cache-enabled=false @@ -45,10 +42,9 @@ spring.thymeleaf.prefix=classpath:/templates/ spring.thymeleaf.suffix=.html spring.thymeleaf.mode=LEGACYHTML5 spring.thymeleaf.encoding=UTF-8 -spring.thymeleaf.content-type=text/html spring.thymeleaf.cache=false -redis.hostname=127.0.0.1 +redis.hostname=120.77.219.107 redis.port=6379 redis.password= diff --git a/tamguo-tms/src/main/resources/static/css/paper.css b/tamguo-tms/src/main/resources/static/css/paper.css index 8e9693e..08c889c 100644 --- a/tamguo-tms/src/main/resources/static/css/paper.css +++ b/tamguo-tms/src/main/resources/static/css/paper.css @@ -679,4 +679,26 @@ line-height: 0; font-size: xx-large; content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x "; +} +.quelist-wrap .question-box .question-box-inner .que-options { + font-size: 16px; + color: #828386; + margin-top: 20px; + line-height: 1.5; +} +.quelist-wrap .question-box .question-box-inner .que-options .opt-item { + display: inline-block; + padding-right: 20px; +} +.quelist-wrap .question-box .question-box-inner .que-options .opt-item p { + display: inline-block; +} +.bdjson .ext_text-align_left { + text-align: left; +} +.quelist-wrap .question-box .question-box-inner .que-options .opt-item .prefix { + padding-right: 10px; +} +.quelist-wrap .question-box .question-box-inner .que-options .opt-item .prefix::after { + content: '. '; } \ No newline at end of file diff --git a/tamguo-tms/src/main/resources/templates/paper.html b/tamguo-tms/src/main/resources/templates/paper.html index 9ba79dd..cabbf83 100644 --- a/tamguo-tms/src/main/resources/templates/paper.html +++ b/tamguo-tms/src/main/resources/templates/paper.html @@ -2,7 +2,7 @@ - 探果网_聪明的学生都在这里 + 聪明的学生都在这里 - 探果网 @@ -88,23 +88,33 @@
-
+
单选题
-
-
- 1 - - 多选题 - -
-

社会工作专业化是在长期社会服务实践中形成，在实践中被接受的。在专业化过程中，社会工作发展的重要特点包括( )。

A．专业理论的完善
B．专业方法的发展
C．目标模式的变化
D．工作对象的拓展
E．理论派别的形成

-
-
- 查看题目解析 > + +
+
+ 1 + + 单选题· 2 分 + +
+
+

下列关于细胞中化合物及其化学键的叙述，正确的是(　　)

+
+
+
+
+
+

AtRNA分子中含有一定数量的氢键

+
-
+
+
+ 查看题目解析 > +
+
diff --git a/tamguo-tms/src/main/resources/templates/question.html b/tamguo-tms/src/main/resources/templates/question.html index a605112..17f2348 100644 --- a/tamguo-tms/src/main/resources/templates/question.html +++ b/tamguo-tms/src/main/resources/templates/question.html @@ -38,6 +38,13 @@

社会工作专业化是在长期社会服务实践中形成，在实践中被接受的。在专业化过程中，社会工作发展的重要特点包括( )。

A．专业理论的完善
B．专业方法的发展
C．目标模式的变化
D．工作对象的拓展
E．理论派别的形成

+
+
+
+

AtRNA分子中含有一定数量的氢键

+
+
+
diff --git a/tamguo-tms/src/main/resources/templates/questionList.html b/tamguo-tms/src/main/resources/templates/questionList.html index d7993fb..948d2c1 100644 --- a/tamguo-tms/src/main/resources/templates/questionList.html +++ b/tamguo-tms/src/main/resources/templates/questionList.html @@ -51,6 +51,13 @@

社会工作专业化是在长期社会服务实践中形成，在实践中被接受的。在专业化过程中，社会工作发展的重要特点包括( )。

A．专业理论的完善
B．专业方法的发展
C．目标模式的变化
D．工作对象的拓展
E．理论派别的形成

+
+
+
+

AtRNA分子中含有一定数量的氢键

+
+
+
查看题目解析 >
diff --git a/tamguo/.classpath b/tamguo/.classpath deleted file mode 100644 index 3553992..0000000 --- a/tamguo/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tamguo/.gitignore b/tamguo/.gitignore deleted file mode 100644 index e91d5c4..0000000 --- a/tamguo/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target/ -/target/ -/target/ diff --git a/tamguo/.project b/tamguo/.project deleted file mode 100644 index 7546e55..0000000 --- a/tamguo/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - tamguo - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/tamguo/.settings/org.eclipse.core.resources.prefs b/tamguo/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index bc5a40d..0000000 --- a/tamguo/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/main/resources/static/js/plugins/ueditor/jsp/config.json=UTF-8 -encoding//src/main/resources/static/libs/area.json=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/tamguo/.settings/org.eclipse.jdt.core.prefs b/tamguo/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index d59e09c..0000000 --- a/tamguo/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/tamguo/.settings/org.eclipse.m2e.core.prefs b/tamguo/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index 14b697b..0000000 --- a/tamguo/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/tamguo/pom.xml b/tamguo/pom.xml index 2c1cf08..a9e3a6e 100644 --- a/tamguo/pom.xml +++ b/tamguo/pom.xml @@ -5,7 +5,7 @@ com.tamguo tamguo V1.0.1 - 探果网 + tamguo org.springframework.boot diff --git a/tanmguo-config-server/pom.xml b/tanmguo-config-server/pom.xml deleted file mode 100644 index ba334e7..0000000 --- a/tanmguo-config-server/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - com.tamguo - tanmguo-config-server - 1.0.0 - - - org.springframework.boot - spring-boot-starter-parent - 2.0.1.RELEASE - - - - - - org.springframework.cloud - spring-cloud-dependencies - Finchley.RELEASE - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-config - - - - org.springframework.cloud - spring-cloud-config-server - - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.springframework.cloud - spring-cloud-starter-eureka - - - - org.projectlombok - lombok - - - - - - tamguo-config-server - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - \ No newline at end of file diff --git a/tanmguo-config-server/src/main/java/com.tamguo.config/ConfigServerApplication.java b/tanmguo-config-server/src/main/java/com.tamguo.config/ConfigServerApplication.java deleted file mode 100644 index 6536875..0000000 --- a/tanmguo-config-server/src/main/java/com.tamguo.config/ConfigServerApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.tamguo.config; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.config.server.EnableConfigServer; - -@SpringBootApplication -@EnableConfigServer -@Slf4j -public class ConfigServerApplication implements CommandLineRunner{ - - public static void main(String[] args) { - SpringApplication.run(ConfigServerApplication.class, args); - } - - @Override - public void run(String... args) throws Exception { - log.info(">>>>>>>>>>>>>>> tamguo-config-server 启动完成<<<<<<<<<<<<<"); - } -} diff --git a/tanmguo-config-server/src/main/resources/bootstrap.yml b/tanmguo-config-server/src/main/resources/bootstrap.yml deleted file mode 100644 index d2d1879..0000000 --- a/tanmguo-config-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,24 +0,0 @@ -server: - port: 9999 -spring: - application: - name: tamguo-config-server - cloud: - config: - allowOverride: true - server: - git: - uri: https://gitee.com/zhangshukang/tamguo-config-server-repo.git - username: 434329122@qq.com - password: - search-paths: tamguo - fail-fast: true - override-none: true #覆盖非系统属性　true不覆盖 - override-system-properties: true #覆盖系统属性 false不覆盖 - - - -logging: - level: - root: info - diff --git a/tanmguo-config-server/tanmguo-config-server.iml b/tanmguo-config-server/tanmguo-config-server.iml deleted file mode 100644 index 90d3fc7..0000000 --- a/tanmguo-config-server/tanmguo-config-server.iml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tanmguo-config-server/target/classes/bootstrap.yml b/tanmguo-config-server/target/classes/bootstrap.yml deleted file mode 100644 index 25bfd63..0000000 --- a/tanmguo-config-server/target/classes/bootstrap.yml +++ /dev/null @@ -1,24 +0,0 @@ -server: - port: 9999 -spring: - application: - name: tamguo-config-server - cloud: - config: - allowOverride: true - server: - git: - uri: https://gitee.com/zhangshukang/tamguo-config-server-repo.git - username: 434329122@qq.com - password: zklovecjj801122 - search-paths: tamguo - fail-fast: true - override-none: true #覆盖非系统属性　true不覆盖 - override-system-properties: true #覆盖系统属性 false不覆盖 - - - -logging: - level: - root: info -