Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
volunteer_service
Commits
70ed07dd
Commit
70ed07dd
authored
Jan 13, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增专业实体类
parent
fe19ab49
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
736 additions
and
79 deletions
+736
-79
ProfessionMapper.java
...r/src/main/java/cn/wisenergy/mapper/ProfessionMapper.java
+15
-0
SchemeRecordMapper.java
...src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java
+28
-0
ScoreInfoMapper.java
...er/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java
+1
-1
ProfessionMapper.xml
...rgy-mapper/src/main/resources/mapper/ProfessionMapper.xml
+71
-0
SchemeRecordMapper.xml
...y-mapper/src/main/resources/mapper/SchemeRecordMapper.xml
+29
-5
PayRecord.java
...model/src/main/java/cn/wisenergy/model/app/PayRecord.java
+20
-13
Profession.java
...odel/src/main/java/cn/wisenergy/model/app/Profession.java
+62
-0
SchemeQueryRecord.java
...c/main/java/cn/wisenergy/model/app/SchemeQueryRecord.java
+2
-8
BaseEntity.java
...l/src/main/java/cn/wisenergy/model/common/BaseEntity.java
+1
-1
UserCommitDto.java
...l/src/main/java/cn/wisenergy/model/dto/UserCommitDto.java
+64
-0
UserInfoDto.java
...del/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java
+3
-0
SchemeRecordQueryVo.java
.../main/java/cn/wisenergy/model/vo/SchemeRecordQueryVo.java
+47
-0
UserInfoVo.java
...model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java
+0
-30
UserShowVo.java
...model/src/main/java/cn/wisenergy/model/vo/UserShowVo.java
+54
-0
ProfessionService.java
...main/java/cn/wisenergy/service/app/ProfessionService.java
+20
-0
SchemeRecordService.java
...in/java/cn/wisenergy/service/app/SchemeRecordService.java
+7
-4
UserLoginService.java
.../main/java/cn/wisenergy/service/app/UserLoginService.java
+3
-2
UserService.java
...e/src/main/java/cn/wisenergy/service/app/UserService.java
+5
-3
ProfessionServiceImpl.java
.../cn/wisenergy/service/app/impl/ProfessionServiceImpl.java
+76
-0
SchemeRecordServiceImpl.java
...n/wisenergy/service/app/impl/SchemeRecordServiceImpl.java
+65
-4
UserLoginServiceImpl.java
...a/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
+29
-2
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+98
-6
ProfessionController.java
...energy/web/admin/controller/app/ProfessionController.java
+36
-0
No files found.
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProfessionMapper.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
mapper
;
import
cn.wisenergy.model.app.Profession
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
public
interface
ProfessionMapper
extends
BaseMapper
<
Profession
>
{
Profession
add
(
Profession
profession
);
List
<
Profession
>
getList
();
Profession
getById
(
@Param
(
"id"
)
Integer
id
);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java
View file @
70ed07dd
...
@@ -4,13 +4,41 @@ import cn.wisenergy.model.app.SchemeQueryRecord;
...
@@ -4,13 +4,41 @@ import cn.wisenergy.model.app.SchemeQueryRecord;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* @author 86187
* @author 86187
*/
*/
public
interface
SchemeRecordMapper
extends
BaseMapper
<
SchemeQueryRecord
>
{
public
interface
SchemeRecordMapper
extends
BaseMapper
<
SchemeQueryRecord
>
{
/**
* 添加方案记录
* @param schemeQueryRecord 方案记录信息
* @return 方案记录信息
*/
SchemeQueryRecord
add
(
SchemeQueryRecord
schemeQueryRecord
);
SchemeQueryRecord
add
(
SchemeQueryRecord
schemeQueryRecord
);
/**
* 编辑方案记录
* @param schemeQueryRecord 方案记录信息
* @return 0 失败 1 成功
*/
int
edit
(
SchemeQueryRecord
schemeQueryRecord
);
int
edit
(
SchemeQueryRecord
schemeQueryRecord
);
/**
* 获取方案记录信息
* @param id 方案记录id
* @return
*/
int
delById
(
@Param
(
"id"
)
Integer
id
);
int
delById
(
@Param
(
"id"
)
Integer
id
);
/**
* 统计方案记录条数
* @param map 统计条件
* @return 记录条数
*/
int
count
(
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
List
<
SchemeQueryRecord
>
getList
(
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
}
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java
View file @
70ed07dd
...
@@ -11,7 +11,7 @@ public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
...
@@ -11,7 +11,7 @@ public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
* @param scoreInfo 成绩信息
* @param scoreInfo 成绩信息
* @return 成绩信息
* @return 成绩信息
*/
*/
ScoreInfo
add
(
ScoreInfo
scoreInfo
);
int
add
(
ScoreInfo
scoreInfo
);
/**
/**
* 编辑考生成绩
* 编辑考生成绩
...
...
wisenergy-mapper/src/main/resources/mapper/ProfessionMapper.xml
0 → 100644
View file @
70ed07dd
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.wisenergy.mapper.ProfessionMapper"
>
<resultMap
id=
"userMap"
type=
"cn.wisenergy.model.app.Profession"
>
<id
column=
"id"
property=
"id"
/>
<result
column=
"parent_id"
property=
"parentId"
/>
<result
column=
"level"
property=
"level"
/>
<result
column=
"name"
property=
"name"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
</resultMap>
<sql
id=
"table"
>
profession
</sql>
<sql
id=
"cols_all"
>
id,
<include
refid=
"cols_exclude_id"
/>
</sql>
<sql
id=
"cols_exclude_id"
>
parent_id,level, name,create_time,update_time
</sql>
<sql
id=
"vals"
>
#{parentId},#{level},#{name},now(),now()
</sql>
<sql
id=
"updateCondition"
>
<if
test=
"parentId != null"
>
parent_id = #{parentId},
</if>
<if
test=
"level != null"
>
level =#{level},
</if>
<if
test=
"name != null"
>
name =#{name},
</if>
update_time =now()
</sql>
<sql
id=
"criteria"
>
<if
test=
"id != null"
>
id = #{id}
</if>
<if
test=
"parentId != null"
>
and parent_id = #{parentId}
</if>
<if
test=
"level != null"
>
and level =#{level}
</if>
<if
test=
"name != null"
>
and name =#{name}
</if>
<if
test=
"createTime != null"
>
and create_time
>
= #{createTime}
</if>
<if
test=
"updateTime != null"
>
and #{updateTime}
>
= update_time
</if>
</sql>
<insert
id=
"add"
parameterType=
"cn.wisenergy.model.app.Profession"
keyProperty=
"id"
useGeneratedKeys=
"true"
>
insert into
<include
refid=
"table"
/>
(
<include
refid=
"cols_exclude_id"
/>
)
value(
<include
refid=
"vals"
/>
)
</insert>
<select
id=
"getList"
resultType=
"cn.wisenergy.model.app.Profession"
>
select
<include
refid=
"cols_all"
/>
from
<include
refid=
"table"
/>
</select>
<select
id=
"getById"
resultType=
"cn.wisenergy.model.app.Profession"
>
select
<include
refid=
"cols_all"
/>
from
<include
refid=
"table"
/>
where id=#{id}
</select>
</mapper>
wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml
View file @
70ed07dd
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
<result
column=
"user_id"
property=
"userId"
/>
<result
column=
"user_id"
property=
"userId"
/>
<result
column=
"major_name"
property=
"majorName"
/>
<result
column=
"major_name"
property=
"majorName"
/>
<result
column=
"student_type"
property=
"studentType"
/>
<result
column=
"student_type"
property=
"studentType"
/>
<result
column=
"volunteer_ids"
property=
"volunteerIds"
/>
<result
column=
"score"
property=
"score"
/>
<result
column=
"score"
property=
"score"
/>
<result
column=
"is_delete"
property=
"isDelete"
/>
<result
column=
"is_delete"
property=
"isDelete"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
...
@@ -24,18 +23,17 @@
...
@@ -24,18 +23,17 @@
</sql>
</sql>
<sql
id=
"cols_exclude_id"
>
<sql
id=
"cols_exclude_id"
>
user_id,major_name, student_type,
volunteer_ids,
score,is_delete,create_time,update_time
user_id,major_name, student_type,score,is_delete,create_time,update_time
</sql>
</sql>
<sql
id=
"vals"
>
<sql
id=
"vals"
>
#{userId},#{majorName},#{studentType},#{
volunteerIds},#{
score}, #{isDelete},now(),now()
#{userId},#{majorName},#{studentType},#{score}, #{isDelete},now(),now()
</sql>
</sql>
<sql
id=
"updateCondition"
>
<sql
id=
"updateCondition"
>
<if
test=
"userId != null"
>
user_id = #{userId},
</if>
<if
test=
"userId != null"
>
user_id = #{userId},
</if>
<if
test=
"majorName != null"
>
major_name =#{majorName},
</if>
<if
test=
"majorName != null"
>
major_name =#{majorName},
</if>
<if
test=
"studentType != null"
>
student_type =#{studentType},
</if>
<if
test=
"studentType != null"
>
student_type =#{studentType},
</if>
<if
test=
"volunteerIds != null"
>
volunteer_ids =#{volunteerIds},
</if>
<if
test=
"score != null"
>
score =#{score},
</if>
<if
test=
"score != null"
>
score =#{score},
</if>
<if
test=
"isDelete != null"
>
is_delete = #{isDelete},
</if>
<if
test=
"isDelete != null"
>
is_delete = #{isDelete},
</if>
update_time =now()
update_time =now()
...
@@ -46,7 +44,6 @@
...
@@ -46,7 +44,6 @@
<if
test=
"userId != null"
>
and user_id = #{userId}
</if>
<if
test=
"userId != null"
>
and user_id = #{userId}
</if>
<if
test=
"majorName != null"
>
and major_name =#{majorName}
</if>
<if
test=
"majorName != null"
>
and major_name =#{majorName}
</if>
<if
test=
"studentType != null"
>
and student_type =#{studentType}
</if>
<if
test=
"studentType != null"
>
and student_type =#{studentType}
</if>
<if
test=
"volunteerIds != null"
>
and volunteer_ids =#{volunteerIds}
</if>
<if
test=
"score != null"
>
and score =#{score}
</if>
<if
test=
"score != null"
>
and score =#{score}
</if>
<if
test=
"isDelete != null"
>
and is_delete = #{isDelete}
</if>
<if
test=
"isDelete != null"
>
and is_delete = #{isDelete}
</if>
<if
test=
"createTime != null"
>
and create_time
>
= #{createTime}
</if>
<if
test=
"createTime != null"
>
and create_time
>
= #{createTime}
</if>
...
@@ -79,4 +76,31 @@
...
@@ -79,4 +76,31 @@
where id = #{id}
where id = #{id}
</delete>
</delete>
<select
id=
"count"
resultType=
"java.lang.Integer"
>
select count(1)
from
<include
refid=
"table"
/>
<where>
is_delete=0
<if
test=
" userId != null"
>
and user_id=#{userId}
</if>
</where>
</select>
<select
id=
"getList"
parameterType=
"map"
resultType=
"cn.wisenergy.model.app.SchemeQueryRecord"
>
select
<include
refid=
"cols_all"
/>
from
<include
refid=
"table"
/>
<where>
is_delete=0
<if
test=
" userId != null"
>
user_id=#{userId}
</if>
limit #{startNum},#{endNum}
order by create_time desc
</where>
</select>
</mapper>
</mapper>
wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java
View file @
70ed07dd
...
@@ -7,41 +7,48 @@ import lombok.Data;
...
@@ -7,41 +7,48 @@ import lombok.Data;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
/**
*@ Description: 充值记录实体类
*@ Author : 86187
*@ Date : 2021/1/8 14:48
*/
@Data
@Data
@ApiModel
(
value
=
"PayRecord"
)
@ApiModel
(
value
=
"PayRecord"
)
public
class
PayRecord
implements
Serializable
{
public
class
PayRecord
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7865361068703566832L
;
/**
/**
* 充值记录
id
* 充值记录
*/
*/
@ApiModelProperty
(
value
=
"
充值记录id"
,
name
=
"id
"
)
@ApiModelProperty
(
value
=
"
"
,
name
=
"
"
)
private
Integer
id
;
private
Integer
id
;
/**
/**
* 充值类型
* 充值类型
1:支付宝 2:微信 3:充值卡
*/
*/
@ApiModelProperty
(
value
=
"
充值类型 1:支付宝 2:微信 3:充值卡"
,
name
=
"type
"
)
@ApiModelProperty
(
value
=
"
"
,
name
=
"
"
)
private
Integer
type
;
private
Integer
type
;
/**
/**
* 充值卡
卡号
* 充值卡
id
*/
*/
@ApiModelProperty
(
value
=
"充值卡
卡号"
,
name
=
"cardCode
"
)
@ApiModelProperty
(
value
=
"充值卡
id"
,
name
=
"cardId
"
)
private
String
card
Code
;
private
String
card
Id
;
/**
/**
* 充值用户
* 充值用户
id
*/
*/
@ApiModelProperty
(
value
=
"充值用户"
,
name
=
"userId"
)
@ApiModelProperty
(
value
=
"充值用户
id
"
,
name
=
"userId"
)
private
Integer
userId
;
private
Integer
userId
;
/**
/**
* 充值金额
* 充值
所花
金额
*/
*/
@ApiModelProperty
(
value
=
"充值
金额
"
,
name
=
"money"
)
@ApiModelProperty
(
value
=
"充值
所花金额
"
,
name
=
"money"
)
private
String
money
;
private
String
money
;
/**
/**
* 充值结果
* 充值结果
0:成功 1:失败
*/
*/
@ApiModelProperty
(
value
=
"充值结果 0:成功 1:失败"
,
name
=
"result"
)
@ApiModelProperty
(
value
=
"充值结果 0:成功 1:失败"
,
name
=
"result"
)
private
Integer
result
;
private
Integer
result
;
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/Profession.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
model
.
app
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
/**
*@ Description: 专业实体类
*@ Author : 86187
*@ Date : 2021/1/13 10:37
*/
@Data
@ApiModel
(
value
=
"profession"
)
public
class
Profession
implements
Serializable
{
private
static
final
long
serialVersionUID
=
4215915155490456186L
;
/**
* 专业id
*/
@ApiModelProperty
(
value
=
"专业id"
,
name
=
"id"
)
private
Integer
id
;
/**
* 父id
*/
@ApiModelProperty
(
value
=
"专业id"
,
name
=
"id"
)
private
Integer
parentId
;
/**
* 等级
*/
@ApiModelProperty
(
value
=
"等级"
,
name
=
"level"
)
private
Integer
level
;
/**
* 专业名称
*/
@ApiModelProperty
(
value
=
"专业名称"
,
name
=
"name"
)
private
String
name
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
,
name
=
"createTime"
)
private
Date
createTime
;
/**
* 更新时间
*/
@ApiModelProperty
(
value
=
"更新时间"
,
name
=
"updateTime"
)
private
Date
updateTime
;
/**
* 子专业
*/
@ApiModelProperty
(
value
=
"子专业"
,
name
=
"updateTime"
)
private
List
<
Profession
>
children
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeQueryRecord.java
View file @
70ed07dd
...
@@ -43,14 +43,8 @@ public class SchemeQueryRecord extends BaseEntity implements Serializable {
...
@@ -43,14 +43,8 @@ public class SchemeQueryRecord extends BaseEntity implements Serializable {
private
Integer
studentType
;
private
Integer
studentType
;
/**
/**
*
方案下的志愿id 如:“1,2,3...”
*
考生分数
*/
*/
@ApiModelProperty
(
value
=
"方案下的志愿id 如:“1,2,3...”"
,
name
=
"volunteerIds"
)
@ApiModelProperty
(
value
=
"考生分数"
,
name
=
"score"
)
private
String
volunteerIds
;
/**
* 分页
*/
@ApiModelProperty
(
value
=
"分页"
,
name
=
"score"
)
private
String
score
;
private
String
score
;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/common/BaseEntity.java
View file @
70ed07dd
...
@@ -30,6 +30,6 @@ public abstract class BaseEntity implements Serializable {
...
@@ -30,6 +30,6 @@ public abstract class BaseEntity implements Serializable {
* 删除标记
* 删除标记
*/
*/
@ApiModelProperty
(
"是否删除 1,删除;0,未删除"
)
@ApiModelProperty
(
"是否删除 1,删除;0,未删除"
)
private
String
isDelete
;
private
Integer
isDelete
;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserCommitDto.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
model
.
dto
;
import
cn.wisenergy.model.app.ScoreInfo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
*@ Description: 用户提交Dto
*@ Author : 86187
*@ Date : 2021/1/12 15:39
*/
@Data
@ApiModel
(
value
=
"UserCommitDto"
)
public
class
UserCommitDto
implements
Serializable
{
private
static
final
long
serialVersionUID
=
361307736335983629L
;
/**
* 用户id
*/
@ApiModelProperty
(
value
=
"用户id"
,
name
=
"id"
)
private
Integer
id
;
/**
* 用户名称
*/
@ApiModelProperty
(
value
=
"用户名称"
,
name
=
"userName"
)
private
String
userName
;
/**
* 性别
*/
@ApiModelProperty
(
value
=
"学校"
,
name
=
"school"
)
private
Integer
sex
;
/**
* 学校
*/
@ApiModelProperty
(
value
=
"学校"
,
name
=
"school"
)
private
String
school
;
/**
* 考生类型 1:文化课考生 2:美术生 3:体育生 4:文学编导考生
*/
@ApiModelProperty
(
value
=
"考生类型 1:文化课考生 2:美术生 3:体育生 4:文学编导考生"
,
name
=
"studentType"
)
private
Integer
studentType
;
/**
* 用户来源 1:移动端 2:pc端
*/
@ApiModelProperty
(
value
=
"用户来源 1:移动端 2:pc端"
,
name
=
"source"
)
private
Integer
source
;
/**
* 学生成绩信息
*/
@ApiModelProperty
(
value
=
"学生成绩信息"
,
name
=
"scoreInfo"
)
private
ScoreInfo
scoreInfo
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java
View file @
70ed07dd
package
cn
.
wisenergy
.
model
.
dto
;
package
cn
.
wisenergy
.
model
.
dto
;
import
cn.wisenergy.model.app.ScoreInfo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -91,4 +92,6 @@ public class UserInfoDto implements Serializable {
...
@@ -91,4 +92,6 @@ public class UserInfoDto implements Serializable {
private
Date
lastLoginTime
;
private
Date
lastLoginTime
;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeRecordQueryVo.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
model
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
*@ Description: 方案查询记录分页Vo
*@ Author : 86187
*@ Date : 2021/1/13 9:34
*/
@Data
@ApiModel
(
value
=
"SchemeRecordQueryVo"
)
public
class
SchemeRecordQueryVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
6962244667676123937L
;
/**
* 关键词
*/
@ApiModelProperty
(
value
=
"关键词"
,
name
=
"keyword"
)
private
String
keyword
;
/**
* 用户id
*/
@ApiModelProperty
(
value
=
"用户id"
,
name
=
"userId"
)
private
Integer
userId
;
/**
* 起始页
*/
@ApiModelProperty
(
value
=
"起始页"
,
name
=
"pageNo"
)
private
Integer
pageNo
;
/**
* 页大小
*/
@ApiModelProperty
(
value
=
"页大小"
,
name
=
"pageSize"
)
private
Integer
pageSize
;
private
Integer
startNum
;
private
Integer
endNum
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java
View file @
70ed07dd
...
@@ -45,34 +45,4 @@ public class UserInfoVo implements Serializable {
...
@@ -45,34 +45,4 @@ public class UserInfoVo implements Serializable {
*/
*/
@ApiModelProperty
(
value
=
"手机号"
,
name
=
"phone"
)
@ApiModelProperty
(
value
=
"手机号"
,
name
=
"phone"
)
private
String
phone
;
private
String
phone
;
/**
* 头像
*/
@ApiModelProperty
(
value
=
"头像"
,
name
=
"headImage"
)
private
String
headImage
;
/**
* 文化成绩
*/
@ApiModelProperty
(
value
=
"文化成绩"
,
name
=
"cultureGrade"
)
private
String
cultureGrade
;
/**
* 专业成绩
*/
@ApiModelProperty
(
value
=
"专业成绩"
,
name
=
"majorGrade"
)
private
String
majorGrade
;
/**
* 用户剩余查询次数
*/
@ApiModelProperty
(
value
=
"用户剩余查询次数"
,
name
=
"queryLimit"
)
private
Integer
queryLimit
;
/**
* 用户充值总金额
*/
@ApiModelProperty
(
value
=
"用户充值总金额"
,
name
=
"moneyAmount"
)
private
String
moneyAmount
;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserShowVo.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
model
.
vo
;
import
cn.wisenergy.model.app.ScoreInfo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
*@ Description: 用户对外展示信息Vo
*@ Author : 86187
*@ Date : 2021/1/12 15:29
*/
@Data
@ApiModel
(
value
=
"UserShowVo"
)
public
class
UserShowVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
2451826421351862268L
;
/**
* 用户id
*/
@ApiModelProperty
(
value
=
"用户id"
,
name
=
"id"
)
private
Integer
id
;
/**
* 用户名称
*/
@ApiModelProperty
(
value
=
"用户名称"
,
name
=
"userName"
)
private
String
userName
;
/**
* 性别
*/
@ApiModelProperty
(
value
=
"性别"
,
name
=
"sex"
)
private
Integer
sex
;
/**
* 毕业高中学校
*/
@ApiModelProperty
(
value
=
"毕业高中学校"
,
name
=
"school"
)
private
String
school
;
/**
* 考生类型 1:文化课考生 2:美术生 3:体育生 4:文学编导考生
*/
@ApiModelProperty
(
value
=
"考生类型 1:文化课考生 2:美术生 3:体育生 4:文学编导考生"
,
name
=
"studentType"
)
private
Integer
studentType
;
/**
* 学生成绩信息
*/
@ApiModelProperty
(
value
=
"学生成绩信息"
,
name
=
"scoreInfo"
)
private
ScoreInfo
scoreInfo
;
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/ProfessionService.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
service
.
app
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.app.Profession
;
import
java.util.List
;
/**
*@ Description: 专业接口定义
*@ Author : 86187
*@ Date : 2021/1/13 10:54
*/
public
interface
ProfessionService
{
/**
* 获取专业树结构
* @return 树列表
*/
R
<
List
<
Profession
>>
getTree
();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeRecordService.java
View file @
70ed07dd
package
cn
.
wisenergy
.
service
.
app
;
package
cn
.
wisenergy
.
service
.
app
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.app.SchemeQueryRecord
;
import
cn.wisenergy.model.app.SchemeQueryRecord
;
import
cn.wisenergy.model.vo.SchemeRecordQueryVo
;
import
com.github.pagehelper.PageInfo
;
import
java.util.List
;
import
java.util.List
;
...
@@ -8,18 +11,18 @@ public interface SchemeRecordService {
...
@@ -8,18 +11,18 @@ public interface SchemeRecordService {
/**
/**
* 添加方案查询记录
* 添加方案查询记录
*
*
* @param scheme
RecordService
方案信息
* @param scheme
QueryRecord
方案信息
* @return 方案信息
* @return 方案信息
*/
*/
SchemeQueryRecord
add
(
SchemeRecordService
schemeRecordService
);
R
<
SchemeQueryRecord
>
add
(
SchemeQueryRecord
schemeQueryRecord
);
/**
/**
* 获取方案查询列表
* 获取方案查询列表
*
*
* @param
userId 用户id
* @param
schemeRecordQueryVo 查询条件
* @return 方案查询列表
* @return 方案查询列表
*/
*/
List
<
SchemeRecordService
>
getList
(
Integer
userId
);
R
<
PageInfo
<
SchemeQueryRecord
>>
getList
(
SchemeRecordQueryVo
schemeRecordQueryVo
);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLoginService.java
View file @
70ed07dd
package
cn
.
wisenergy
.
service
.
app
;
package
cn
.
wisenergy
.
service
.
app
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.vo.UserInfoVo
;
/**
/**
* @ Description: 用户登录
* @ Description: 用户登录
...
@@ -27,13 +28,13 @@ public interface UserLoginService {
...
@@ -27,13 +28,13 @@ public interface UserLoginService {
R
<
Boolean
>
loginCode
(
String
code
,
String
phone
);
R
<
Boolean
>
loginCode
(
String
code
,
String
phone
);
/**
/**
* 手机密码登录
* 手机
-
密码登录
*
*
* @param phone 手机号
* @param phone 手机号
* @param password 密码
* @param password 密码
* @return true 成功 false 失败
* @return true 成功 false 失败
*/
*/
R
<
Boolean
>
login
(
String
phone
,
String
password
);
R
<
UserInfoVo
>
login
(
String
phone
,
String
password
);
/**
/**
* 退出登录
* 退出登录
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @
70ed07dd
...
@@ -3,9 +3,11 @@ package cn.wisenergy.service.app;
...
@@ -3,9 +3,11 @@ package cn.wisenergy.service.app;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.app.UserInfo
;
import
cn.wisenergy.model.app.UserInfo
;
import
cn.wisenergy.model.dto.UserCommitDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.vo.UserInfoVo
;
import
cn.wisenergy.model.vo.UserInfoVo
;
import
cn.wisenergy.model.vo.UserQueryVo
;
import
cn.wisenergy.model.vo.UserQueryVo
;
import
cn.wisenergy.model.vo.UserShowVo
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
/**
/**
...
@@ -25,12 +27,12 @@ public interface UserService {
...
@@ -25,12 +27,12 @@ public interface UserService {
R
<
PageInfo
<
UserInfoDto
>>
getUserList
(
UserQueryVo
queryVo
);
R
<
PageInfo
<
UserInfoDto
>>
getUserList
(
UserQueryVo
queryVo
);
/**
/**
*
添加用户
信息
*
提交个人
信息
*
*
* @param userInfo 用户信息
* @param userInfo 用户信息
* @return 用户信息
* @return 用户信息
*/
*/
R
<
UserInfoVo
>
add
(
UserInf
o
userInfo
);
R
<
UserInfoVo
>
commitUserInfo
(
UserCommitDt
o
userInfo
);
/**
/**
* 编辑用户信息
* 编辑用户信息
...
@@ -54,6 +56,6 @@ public interface UserService {
...
@@ -54,6 +56,6 @@ public interface UserService {
* @param id 用户id
* @param id 用户id
* @return 用户信息
* @return 用户信息
*/
*/
R
<
User
Info
Vo
>
getById
(
Integer
id
);
R
<
User
Show
Vo
>
getById
(
Integer
id
);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
service
.
app
.
impl
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.mapper.ProfessionMapper
;
import
cn.wisenergy.model.app.Profession
;
import
cn.wisenergy.service.app.ProfessionService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* @ Description: 专业接口实现
* @ Author : 86187
* @ Date : 2021/1/13 10:52
*/
@Service
@Slf4j
public
class
ProfessionServiceImpl
extends
ServiceImpl
<
ProfessionMapper
,
Profession
>
implements
ProfessionService
{
@Autowired
private
ProfessionMapper
professionMapper
;
@Override
public
R
<
List
<
Profession
>>
getTree
()
{
log
.
info
(
"volunteer-service[]ProfessionServiceImpl[]getTree[]input.method"
);
//获取所有专业
List
<
Profession
>
rootList
=
professionMapper
.
getList
();
//构造树形接口:递归
List
<
Profession
>
streetList
=
getStreetList
(
rootList
);
return
R
.
ok
(
streetList
);
}
private
List
<
Profession
>
getStreetList
(
List
<
Profession
>
list
)
{
List
<
Profession
>
rootList
=
new
ArrayList
<>();
List
<
Profession
>
childrenList
=
new
ArrayList
<>();
//1|遍历出根节点和子节点
for
(
Profession
profession
:
list
)
{
if
(
profession
.
getLevel
()
==
1
)
{
rootList
.
add
(
profession
);
}
else
{
childrenList
.
add
(
profession
);
}
}
//2.遍历集合,获取根节点下的子节点
for
(
Profession
profession
:
rootList
)
{
List
<
Profession
>
children
=
setChildren
(
profession
.
getId
(),
childrenList
);
profession
.
setChildren
(
children
);
}
return
rootList
;
}
private
List
<
Profession
>
setChildren
(
Integer
id
,
List
<
Profession
>
list
)
{
List
<
Profession
>
children
=
new
ArrayList
<>();
for
(
Profession
profession
:
list
)
{
if
(
id
.
equals
(
profession
.
getParentId
()))
{
children
.
add
(
profession
);
}
}
for
(
int
i
=
0
;
i
<
children
.
size
();
i
++)
{
Integer
autoId
=
children
.
get
(
i
).
getId
();
List
<
Profession
>
childrenList
=
setChildren
(
autoId
,
list
);
children
.
get
(
i
).
setChildren
(
childrenList
);
}
return
children
;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeRecordServiceImpl.java
View file @
70ed07dd
package
cn
.
wisenergy
.
service
.
app
.
impl
;
package
cn
.
wisenergy
.
service
.
app
.
impl
;
import
cn.wisenergy.common.constant.CommonAttributes
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.mapper.SchemeRecordMapper
;
import
cn.wisenergy.mapper.SchemeRecordMapper
;
import
cn.wisenergy.model.app.SchemeQueryRecord
;
import
cn.wisenergy.model.app.SchemeQueryRecord
;
import
cn.wisenergy.model.vo.SchemeRecordQueryVo
;
import
cn.wisenergy.service.app.SchemeRecordService
;
import
cn.wisenergy.service.app.SchemeRecordService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageInfo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
*@ Description: 方案查询记录接口实现
*@ Description: 方案查询记录接口实现
...
@@ -17,13 +25,66 @@ import java.util.List;
...
@@ -17,13 +25,66 @@ import java.util.List;
@Slf4j
@Slf4j
@Service
@Service
public
class
SchemeRecordServiceImpl
extends
ServiceImpl
<
SchemeRecordMapper
,
SchemeQueryRecord
>
implements
SchemeRecordService
{
public
class
SchemeRecordServiceImpl
extends
ServiceImpl
<
SchemeRecordMapper
,
SchemeQueryRecord
>
implements
SchemeRecordService
{
@Autowired
private
SchemeRecordMapper
schemeRecordMapper
;
@Override
@Override
public
SchemeQueryRecord
add
(
SchemeRecordService
schemeRecordService
)
{
public
R
<
SchemeQueryRecord
>
add
(
SchemeQueryRecord
scheme
)
{
return
null
;
log
.
info
(
"volunteer-service[]SchemeRecordServiceImpl[]getById[]input.param.scheme:"
+
scheme
);
if
(
null
==
scheme
)
{
return
R
.
error
(
"入参为空!"
);
}
//保存记录信息
SchemeQueryRecord
schemeQueryRecord
=
schemeRecordMapper
.
add
(
scheme
);
if
(
null
==
schemeQueryRecord
){
return
R
.
error
(
"添加方案记录失败"
);
}
return
R
.
ok
(
schemeQueryRecord
);
}
}
@Override
@Override
public
List
<
SchemeRecordService
>
getList
(
Integer
userId
)
{
public
R
<
PageInfo
<
SchemeQueryRecord
>>
getList
(
SchemeRecordQueryVo
queryVo
)
{
return
null
;
log
.
info
(
"volunteer-service[]SchemeRecordServiceImpl[]getList[]input.param.queryVo:"
+
queryVo
);
if
(
null
==
queryVo
||
null
==
queryVo
.
getUserId
())
{
return
R
.
error
(
"入参为空!"
);
}
pageHandle
(
queryVo
);
//统计数据总条数
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
8
);
map
.
put
(
"user_id"
,
queryVo
.
getUserId
());
int
total
=
schemeRecordMapper
.
count
(
map
);
//根据用户id,查询方案记录列表
map
.
put
(
"startNum"
,
queryVo
.
getPageSize
());
map
.
put
(
"endNUm"
,
queryVo
.
getEndNum
());
List
<
SchemeQueryRecord
>
list
=
schemeRecordMapper
.
getList
(
map
);
PageInfo
<
SchemeQueryRecord
>
info
=
new
PageInfo
<>();
info
.
setPageSize
(
queryVo
.
getPageSize
());
info
.
setPageNum
(
queryVo
.
getPageNo
());
info
.
setTotal
(
total
);
info
.
setList
(
list
);
return
R
.
ok
(
info
);
}
/**
* 分页处理
* @param cameraQueryVo 参数
*/
private
void
pageHandle
(
SchemeRecordQueryVo
cameraQueryVo
)
{
Integer
pageNum
=
cameraQueryVo
.
getPageNo
();
Integer
pageSize
=
cameraQueryVo
.
getPageSize
();
if
(
null
==
pageSize
||
pageSize
==
0
)
{
pageSize
=
10
;}
if
(
null
==
pageNum
||
pageNum
==
0
)
{
pageNum
=
1
;}
Integer
endNum
=
pageSize
;
Integer
startNum
=
(
pageNum
-
CommonAttributes
.
NUM_ONE
)
*
pageSize
;
cameraQueryVo
.
setEndNum
(
endNum
);
cameraQueryVo
.
setStartNum
(
startNum
);
cameraQueryVo
.
setPageNo
(
pageNum
);
cameraQueryVo
.
setPageSize
(
pageSize
);
}
}
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
View file @
70ed07dd
...
@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.Md5Util;
...
@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.Md5Util;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.mapper.UsersMapper
;
import
cn.wisenergy.mapper.UsersMapper
;
import
cn.wisenergy.model.app.UserInfo
;
import
cn.wisenergy.model.app.UserInfo
;
import
cn.wisenergy.model.vo.UserInfoVo
;
import
cn.wisenergy.service.app.UserLoginService
;
import
cn.wisenergy.service.app.UserLoginService
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
@@ -60,9 +61,35 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
...
@@ -60,9 +61,35 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
}
}
@Override
@Override
public
R
<
Boolean
>
login
(
String
code
,
String
phone
)
{
public
R
<
UserInfoVo
>
login
(
String
phone
,
String
password
)
{
log
.
info
(
"volunteer-service[]UserLoginServiceImpl[]login[]input.param.phone,password:"
+
phone
,
password
);
if
(
StringUtils
.
isBlank
(
phone
)
||
StringUtils
.
isBlank
(
password
))
{
return
R
.
error
(
"入参为空!"
);
}
return
null
;
//1、根据手机号,获取用户信息
QueryWrapper
<
UserInfo
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"phone"
,
phone
);
queryWrapper
.
eq
(
"is_delete"
,
0
);
UserInfo
userInfo
=
usersMapper
.
selectOne
(
queryWrapper
);
if
(
null
==
userInfo
)
{
return
R
.
error
(
"该用户不存在,请您注册账号!"
);
}
//2、判断密码是否正确
//MD5加密
String
secret
=
Md5Util
.
digestMD5
(
phone
+
password
);
if
(!
userInfo
.
getPassword
().
equals
(
secret
))
{
return
R
.
error
(
"密码错误,请您输入正确密码!"
);
}
//3、构造返回参数
UserInfoVo
userInfoVo
=
new
UserInfoVo
();
userInfoVo
.
setUserId
(
userInfo
.
getId
());
userInfoVo
.
setUserName
(
userInfo
.
getUserName
());
userInfoVo
.
setPhone
(
userInfo
.
getPhone
());
return
R
.
ok
(
userInfoVo
);
}
}
@Override
@Override
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
70ed07dd
...
@@ -3,16 +3,24 @@ package cn.wisenergy.service.app.impl;
...
@@ -3,16 +3,24 @@ package cn.wisenergy.service.app.impl;
import
cn.wisenergy.common.constant.CommonAttributes
;
import
cn.wisenergy.common.constant.CommonAttributes
;
import
cn.wisenergy.common.utils.Md5Util
;
import
cn.wisenergy.common.utils.Md5Util
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.mapper.ScoreInfoMapper
;
import
cn.wisenergy.mapper.UsersMapper
;
import
cn.wisenergy.mapper.UsersMapper
;
import
cn.wisenergy.model.app.ScoreInfo
;
import
cn.wisenergy.model.app.UserInfo
;
import
cn.wisenergy.model.app.UserInfo
;
import
cn.wisenergy.model.dto.UserCommitDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.vo.UserInfoVo
;
import
cn.wisenergy.model.vo.UserInfoVo
;
import
cn.wisenergy.model.vo.UserQueryVo
;
import
cn.wisenergy.model.vo.UserQueryVo
;
import
cn.wisenergy.model.vo.UserShowVo
;
import
cn.wisenergy.service.app.UserService
;
import
cn.wisenergy.service.app.UserService
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -26,6 +34,12 @@ import java.util.List;
...
@@ -26,6 +34,12 @@ import java.util.List;
@Slf4j
@Slf4j
public
class
UserServiceImpl
extends
ServiceImpl
<
UsersMapper
,
UserInfo
>
implements
UserService
{
public
class
UserServiceImpl
extends
ServiceImpl
<
UsersMapper
,
UserInfo
>
implements
UserService
{
@Autowired
private
UsersMapper
usersMapper
;
@Autowired
private
ScoreInfoMapper
scoreInfoMapper
;
@Override
@Override
public
R
<
PageInfo
<
UserInfoDto
>>
getUserList
(
UserQueryVo
queryVo
)
{
public
R
<
PageInfo
<
UserInfoDto
>>
getUserList
(
UserQueryVo
queryVo
)
{
log
.
info
(
"volunteer_service[]UserServiceImpl[]getUserList[]input.param.queryVo:"
+
queryVo
);
log
.
info
(
"volunteer_service[]UserServiceImpl[]getUserList[]input.param.queryVo:"
+
queryVo
);
...
@@ -34,8 +48,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
...
@@ -34,8 +48,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
}
}
pageHandle
(
queryVo
);
pageHandle
(
queryVo
);
int
total
=
0
;
int
total
=
0
;
List
<
UserInfoDto
>
list
=
new
ArrayList
<>();
List
<
UserInfoDto
>
list
=
new
ArrayList
<>();
PageInfo
<
UserInfoDto
>
info
=
new
PageInfo
<>();
PageInfo
<
UserInfoDto
>
info
=
new
PageInfo
<>();
info
.
setPageSize
(
queryVo
.
getPageSize
());
info
.
setPageSize
(
queryVo
.
getPageSize
());
info
.
setPageNum
(
queryVo
.
getPageNo
());
info
.
setPageNum
(
queryVo
.
getPageNo
());
...
@@ -45,8 +59,43 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
...
@@ -45,8 +59,43 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
}
}
@Override
@Override
public
R
<
UserInfoVo
>
add
(
UserInfo
userInfo
)
{
public
R
<
UserInfoVo
>
commitUserInfo
(
UserCommitDto
userInfo
)
{
return
null
;
log
.
info
(
"volunteer-service[]UserServiceImpl[]commitUserInfo[]input.param.userInfo:"
+
userInfo
);
if
(
null
==
userInfo
)
{
return
R
.
error
(
"入参为空!"
);
}
//1、根据用户id,获取用户信息
UserInfo
user
=
usersMapper
.
selectById
(
userInfo
.
getId
());
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在!"
);
}
//2、要提交的用户信息
user
.
setSchool
(
userInfo
.
getSchool
());
user
.
setSex
(
userInfo
.
getSex
());
user
.
setStudentType
(
userInfo
.
getStudentType
());
user
.
setUserName
(
userInfo
.
getUserName
());
user
.
setIsDelete
(
0
);
//3、要提交的用户的成绩信息
ScoreInfo
scoreInfo
=
userInfo
.
getScoreInfo
();
//4、更新用户信息和保存用户成绩
boolean
bool
=
updateAndSaveUserInfo
(
user
,
scoreInfo
);
if
(!
bool
)
{
return
R
.
error
(
"添加用户信息失败!"
);
}
//返回信息
UserInfoVo
userInfoVo
=
new
UserInfoVo
();
userInfoVo
.
setUserId
(
userInfo
.
getId
());
userInfoVo
.
setUserName
(
userInfo
.
getUserName
());
userInfoVo
.
setPhone
(
user
.
getPhone
());
userInfoVo
.
setSex
(
userInfo
.
getSex
());
userInfoVo
.
setStudentType
(
userInfo
.
getStudentType
());
userInfoVo
.
setUserName
(
userInfo
.
getUserName
());
return
R
.
ok
(
userInfoVo
);
}
}
@Override
@Override
...
@@ -60,12 +109,38 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
...
@@ -60,12 +109,38 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
}
}
@Override
@Override
public
R
<
UserInfoVo
>
getById
(
Integer
id
)
{
public
R
<
UserShowVo
>
getById
(
Integer
id
)
{
return
null
;
log
.
info
(
"volunteer-service[]UserServiceImpl[]getById[]input.param.id:"
+
id
);
if
(
null
==
id
)
{
return
R
.
error
(
"入参为空!"
);
}
//根据id,获取用户信息
UserInfo
userInfo
=
usersMapper
.
selectById
(
id
);
if
(
null
==
userInfo
)
{
return
R
.
error
(
"用户信息不存在!"
);
}
UserShowVo
userShowVo
=
new
UserShowVo
();
userShowVo
.
setId
(
userInfo
.
getId
());
userShowVo
.
setSchool
(
userInfo
.
getSchool
());
userShowVo
.
setSex
(
userInfo
.
getSex
());
userShowVo
.
setStudentType
(
userInfo
.
getStudentType
());
userShowVo
.
setUserName
(
userInfo
.
getUserName
());
//获取成绩信息
QueryWrapper
<
ScoreInfo
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"user_id"
,
userInfo
.
getId
());
ScoreInfo
scoreInfo
=
scoreInfoMapper
.
selectOne
(
queryWrapper
);
if
(
null
!=
scoreInfo
)
{
userShowVo
.
setScoreInfo
(
scoreInfo
);
}
return
R
.
ok
(
userShowVo
);
}
}
/**
/**
* 分页处理方法
* 分页处理方法
*
* @param orderQueryVo 参数
* @param orderQueryVo 参数
*/
*/
private
void
pageHandle
(
UserQueryVo
orderQueryVo
)
{
private
void
pageHandle
(
UserQueryVo
orderQueryVo
)
{
...
@@ -84,4 +159,21 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
...
@@ -84,4 +159,21 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
orderQueryVo
.
setPageNo
(
pageNum
);
orderQueryVo
.
setPageNo
(
pageNum
);
orderQueryVo
.
setPageSize
(
pageSize
);
orderQueryVo
.
setPageSize
(
pageSize
);
}
}
@Transactional
public
boolean
updateAndSaveUserInfo
(
UserInfo
userInfo
,
ScoreInfo
scoreInfo
)
{
//1、更新用户信息
int
count
=
usersMapper
.
edit
(
userInfo
);
if
(
count
==
0
)
{
return
false
;
}
//2、保存用户成绩信息
int
save
=
scoreInfoMapper
.
add
(
scoreInfo
);
if
(
save
==
0
)
{
return
false
;
}
return
true
;
}
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProfessionController.java
0 → 100644
View file @
70ed07dd
package
cn
.
wisenergy
.
web
.
admin
.
controller
.
app
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.app.Profession
;
import
cn.wisenergy.service.app.ProfessionService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @ Description: 用户管理模
* @ Author : 86187
* @ Date : 2021/1/13 10:29
*/
@RestController
@Api
(
tags
=
"专业管理"
)
@RequestMapping
(
"/profession"
)
@Slf4j
public
class
ProfessionController
{
@Autowired
private
ProfessionService
professionService
;
@ApiOperation
(
value
=
"获取专业树结构"
,
notes
=
"获取专业树结构"
,
httpMethod
=
"GET"
)
@GetMapping
(
"/getTree"
)
public
R
<
List
<
Profession
>>
getTree
(){
return
professionService
.
getTree
();
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment