结构优化

main
tamguo 7 years ago
parent 0e5c1cd691
commit 5edb7a30d1

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.admin.config.dao.SuperEntity; import com.tamguo.admin.config.dao.SuperEntity;
import java.math.BigInteger;
import java.util.List; import java.util.List;

@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.admin.config.dao.SuperEntity; import com.tamguo.admin.config.dao.SuperEntity;
import java.math.BigInteger;
/** /**
* The persistent class for the tiku_question database table. * The persistent class for the tiku_question database table.
* *

@ -14,10 +14,6 @@ public class SubjectEntity extends SuperEntity<SubjectEntity> implements Seriali
private String name; private String name;
private String courseId;
private String courseName;
@TableField(exist=false) @TableField(exist=false)
private List<CourseEntity> courseList; private List<CourseEntity> courseList;
@ -29,22 +25,6 @@ public class SubjectEntity extends SuperEntity<SubjectEntity> implements Seriali
this.name = name; this.name = name;
} }
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 List<CourseEntity> getCourseList() { public List<CourseEntity> getCourseList() {
return courseList; return courseList;
} }

@ -46,21 +46,11 @@ public class SubjectService implements ISubjectService{
public void update(SubjectEntity subject) { public void update(SubjectEntity subject) {
SubjectEntity entity = subjectMapper.selectById(subject.getUid()); SubjectEntity entity = subjectMapper.selectById(subject.getUid());
entity.setName(subject.getName()); entity.setName(subject.getName());
if(!StringUtils.isEmpty(subject.getCourseId())){
CourseEntity course = courseMapper.selectById(subject.getCourseId());
entity.setCourseId(course.getUid());
entity.setCourseName(course.getName());
}
subjectMapper.updateById(entity); subjectMapper.updateById(entity);
} }
@Override @Override
public void save(SubjectEntity subject) { public void save(SubjectEntity subject) {
if(!StringUtils.isEmpty(subject.getCourseId())){
CourseEntity course = courseMapper.selectById(subject.getCourseId());
subject.setCourseId(course.getUid());
subject.setCourseName(course.getName());
}
subjectMapper.insert(subject); subjectMapper.insert(subject);
} }

@ -1,5 +1,5 @@
domain.name=http://admin.tamguo.com/ domain.name=http://localhost/
server.port=8082 server.port=80
jasypt.encryptor.password=tamguo jasypt.encryptor.password=tamguo
spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
@ -11,14 +11,14 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
spring.datasource.maxWait=60000 spring.datasource.maxWait=60000
spring.datasource.minEvictableIdleTimeMillis=300000 spring.datasource.minEvictableIdleTimeMillis=300000
spring.datasource.minIdle=5 spring.datasource.minIdle=5
spring.datasource.password= spring.datasource.password=Tanguo
spring.datasource.poolPreparedStatements=true spring.datasource.poolPreparedStatements=true
spring.datasource.testOnBorrow=false spring.datasource.testOnBorrow=false
spring.datasource.testOnReturn=false spring.datasource.testOnReturn=false
spring.datasource.testWhileIdle=true spring.datasource.testWhileIdle=true
spring.datasource.timeBetweenEvictionRunsMillis=60000 spring.datasource.timeBetweenEvictionRunsMillis=60000
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tiku?useUnicode=true&characterEncoding=UTF-8&useSSL=false spring.datasource.url=jdbc:mysql://47.100.175.14:3306/tiku?useUnicode=true&characterEncoding=UTF-8&useSSL=false
spring.datasource.username=root spring.datasource.username=root
spring.datasource.validationQuery=SELECT 1 FROM DUAL spring.datasource.validationQuery=SELECT 1 FROM DUAL
@ -46,7 +46,7 @@ spring.thymeleaf.encoding=UTF-8
spring.thymeleaf.content-type=text/html spring.thymeleaf.content-type=text/html
spring.thymeleaf.cache=false spring.thymeleaf.cache=false
redis.hostname=127.0.0.1 redis.hostname=47.100.175.14
redis.port=6379 redis.port=6379
redis.password= redis.password=

@ -4,7 +4,7 @@
<select id="queryPage" resultType="SubjectEntity"> <select id="queryPage" resultType="SubjectEntity">
SELECT SELECT
s.uid , s.name , s.course_id , s.course_name s.uid , s.name
FROM FROM
tiku_subject s tiku_subject s
<where> <where>

@ -4,6 +4,6 @@
<pool maxActive="50" maxIdle="20" maxWait="1000" /> <pool maxActive="50" maxIdle="20" maxWait="1000" />
<servers> <servers>
<!-- test --> <!-- test -->
<server ip="127.0.0.1" port="6379"/> <server ip="47.100.175.14" port="6379"/>
</servers> </servers>
</redis> </redis>

Loading…
Cancel
Save