Commit 3aca842e authored by liaoanyuan's avatar liaoanyuan

用户管理功能

parent 01dd112b
......@@ -28,4 +28,6 @@ public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
* @return 结果
*/
int delById(@Param("id") Integer id);
ScoreInfo getById(@Param("userId") Integer userId);
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.UserInfo;
import cn.wisenergy.model.dto.UserInfoDto;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
*@ Description:
*@ Author : 86187
......@@ -34,4 +38,6 @@ public interface UsersMapper extends BaseMapper<UserInfo> {
int delById(@Param("id") Integer id);
int countByPhoneAnsUserId(@Param("phone") String phone, @Param("userId") Integer userId);
List<UserInfo> getList(Map<String,Object> map);
}
......@@ -99,4 +99,11 @@
where id = #{id}
</delete>
<select id="getById" resultMap="userMap">
select <include refid="cols_all"/>
from <include refid="table"/>
<where>
user_id=#{userId}
</where>
</select>
</mapper>
......@@ -27,7 +27,7 @@
</sql>
<sql id="cols_exclude_id">
user_name,password, phone,head_image,sex,school, student_type,is_delete,source, create_time,update_time
user_name,password, phone,head_image,sex,school, student_type,is_delete,create_time,update_time
</sql>
<sql id="vals">
......@@ -96,4 +96,29 @@
WHERE phone=#{phone} and id !=#{userId} and is_delete=0
</select>
<select id="getList" resultMap="userMap" parameterType="map">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
<if test="userQueryVo.keyword != null">
(user_name LIKE CONCAT('%', #{keyword}, '%')) and
</if>
is_delete=0
<if test="userQueryVo.startTime != null">
and create_time
between #{userQueryVo.startTime} </if>
<if test="workDayList != null">and #{userQueryVo.endTime}</if>
</where>
<if test="userQueryVo.pageNo!= null">limit #{userQueryVo.pageNo} ,</if>
<if test="userQueryVo.pageSize!=null">#{userQueryVo.pageSize}</if>
</select>
</mapper>
......@@ -18,11 +18,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
......@@ -47,9 +49,31 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
return R.error("入参不能为空!");
}
pageHandle(queryVo);
//创建参数容器
HashMap<String, Object> map = new HashMap<>(4);
//将参数放入容器中
map.put("userQueryVo",queryVo);
//查询用户数据
List<UserInfo> list1 = usersMapper.getList(map);
int total = 0;
List<UserInfoDto> list = new ArrayList<>();
//将集合遍历拿出用户id查询成绩信息
for (UserInfo userInfo : list1) {
//创建UserInfoDto返回对象
UserInfoDto userInfoDto = new UserInfoDto();
//查询成绩信息
ScoreInfo scoreInfo = scoreInfoMapper.getById(userInfo.getId());
//将消息进行同步
BeanUtils.copyProperties(userInfo,userInfoDto);
userInfoDto.setCultureGrade(scoreInfo.getCultureGrade());
userInfoDto.setMajorGrade(scoreInfo.getMajorGrade());
userInfoDto.setRegisterTime(userInfo.getCreateTime());
//将userInfoDto装入集合中
list.add(userInfoDto);
//统计数据总量
total+=1;
}
System.out.println(total+" "+list1);
PageInfo<UserInfoDto> info = new PageInfo<>();
info.setPageSize(queryVo.getPageSize());
info.setPageNum(queryVo.getPageNo());
......
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.UserInfoDto;
import cn.wisenergy.model.vo.UserQueryVo;
import cn.wisenergy.service.app.UserService;
import com.github.pagehelper.PageInfo;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -17,6 +26,23 @@ import java.net.InetAddress;
@RequestMapping("/user")
@Slf4j
public class UserController {
@Autowired
private UserService userService;
@ApiOperation(value = "用户管理",notes = "用户管理",httpMethod = "POST")
@ApiImplicitParam(name ="queryVo" )
@PostMapping("/manage")
public R manageUser(UserQueryVo queryVo){
log.info("UserController[].manageUser[].input.param:queryV0:{}"+queryVo);
//查询用户信息
R<PageInfo<UserInfoDto>> userList = userService.getUserList(queryVo);
System.out.println(userList);
if (null==userList||userList.getData().getList().size()==0) {
return R.error("展时还没有用户");
}
//返回数据
return R.ok(userList);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment