Commit a91bd0a8 authored by m1991's avatar m1991

Merge remote-tracking branch 'origin/master'

parents 61831272 8f8e9e4e
......@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -41,4 +43,19 @@ public interface MonthAwardMapper extends BaseMapper<MonthAward> {
* @return 月度奖金
*/
MonthAward getByTime(@Param("yearMonth") String yearMonth);
/**
* 统计数据条数
* @param map 条件
* @return 条数
*/
int count(Map<String,Object> map);
/**
* 获取列表
* @param map 条件
* @return 列表
*/
List<MonthAward> getList(Map<String,Object> map);
}
......@@ -5,8 +5,8 @@ import cn.wisenergy.model.vo.ProgressPrizeVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -38,10 +38,25 @@ public interface ProgressPrizeMapper extends BaseMapper<ProgressPrize> {
/**
* 根据 userId 年月 获取月的最大进步奖用户
*
* @param userId 用户id
* @param yearMonth 年月
* @return 最大进步奖用户列表
*/
ProgressPrize getByUserIdYearMonth(@Param("userId") String userId,@Param("yearMonth") String yearMonth);
/**
* 统计最大进步奖总记录数
*
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
/**
* 获取最大进步奖列表
* @param map 入参
* @return 结果集
*/
List<ProgressPrize> getList(Map<String, Object> map);
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.SysUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @author 86187
*/
public interface SysUserMapper extends BaseMapper<SysUser> {
/**
* 获取后台账户信息
*
* @param id 用户主键id
* @return 后台账户信息
*/
SysUser getById(@Param("id") Integer id);
/**
* 更据账户,获取后台用户信息
*
* @param account 账户
* @return 后台用户信息
*/
SysUser getByAccount(@Param("account") String account);
}
......@@ -103,4 +103,29 @@
limit 1
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
</select>
<select id="getList" resultType="cn.wisenergy.model.app.MonthAward">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
</mapper>
\ No newline at end of file
......@@ -109,4 +109,29 @@
</where>
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
</select>
<select id="getList" resultType="cn.wisenergy.model.app.ProgressPrize">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
</mapper>
\ No newline at end of file
<?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.SysUserMapper">
<resultMap id="sysMap" type="cn.wisenergy.model.app.SysUser">
<id column="id" property="id"/>
<result column="account" property="account"/>
<result column="password" property="password"/>
<result column="user_name" property="userName"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
sys_user
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
account,password,user_name,create_time,update_time
</sql>
<sql id="vals">
#{account},#{password},#{userName},now(),now()
</sql>
<sql id="updateCondition">
<if test="account != null">account = #{account},</if>
<if test="password != null">password = #{password},</if>
<if test="userName != null">user_name = #{userName},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="account != null">and account = #{account}</if>
<if test="password != null">and password = #{password}</if>
<if test="userName != null">and user_name = #{userName}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<select id="getById" resultType="cn.wisenergy.model.app.SysUser">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
id=#{id}
</where>
</select>
<select id="getByAccount" resultType="cn.wisenergy.model.app.SysUser">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
account=#{account}
</where>
</select>
</mapper>
\ No newline at end of file
package cn.wisenergy.model.app;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author 86187
* @ Description: 后台用户实体类
* @ Author : 86187
* @ Date : 2021/3/25 11:21
*/
@Data
@ApiModel(value = "SysUsers")
public class SysUser {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id", name = "id")
private Integer id;
/**
* 账户
*/
@ApiModelProperty(value = "账户", name = "account")
private String account;
/**
* 密码
*/
@ApiModelProperty(value = "密码", name = "password")
private String password;
/**
* 账户名称
*/
@ApiModelProperty(value = "账户名称", name = "userName")
private String userName;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间", name = "updateTime")
private Date updateTime;
}
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 月度奖励列表查询条件Dto
* @author 86187
*/
@Data
@ApiModel("MonthAwardQuery")
public class MonthAwardQuery {
/**
* 查询时间 格式(yyyy-MM)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*@ Description: 每月进步奖查询参数
*@ Author : 86187
*@ Date : 2021/3/25 10:50
* @author 86187
*/
@Data
@ApiModel("ProgressPrizeQuery")
public class ProgressPrizeQuery {
/**
* 查询时间 格式(yyyy-MM)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 86187
*/
@Data
@ApiModel("SysLoginDto")
public class SysLoginDto {
/**
* 账户
*/
@ApiModelProperty(value = "账户", name = "account")
private String account;
/**
* 密码
*/
@ApiModelProperty(value = "密码", name = "password")
private String password;
}
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.vo.MonthAwardVo;
import com.github.pagehelper.PageInfo;
/**
* @author 86187
......@@ -16,4 +19,11 @@ public interface MonthAwardService {
* @return 月度奖金
*/
R<MonthAwardVo> queryMonthAward(String userId);
/**
* 获取月度奖励列表
* @param monthAwardQuery 查询参数
* @return 月度奖励列表
*/
R<PageInfo<MonthAward>> getList(MonthAwardQuery monthAwardQuery);
}
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.ProgressPrize;
import cn.wisenergy.model.dto.ProgressPrizeQuery;
import cn.wisenergy.model.vo.PrizeShowVo;
import cn.wisenergy.model.vo.ProgressPrizeVo;
import com.github.pagehelper.PageInfo;
import java.util.List;
......@@ -20,4 +23,11 @@ public interface ProgressPrizeService {
* @return 进步奖列表
*/
R<PrizeShowVo> getProgressPrizes();
/**
* 获取最大进步奖列表
* @param query 查询参数
* @return 最大进步奖列表
*/
R<PageInfo<ProgressPrize>> getList(ProgressPrizeQuery query);
}
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.MonthAwardMapper;
import cn.wisenergy.mapper.TradeRecordMapper;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.app.TradeRecord;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.dto.TradeRecordQuery;
import cn.wisenergy.model.vo.MonthAwardVo;
import cn.wisenergy.service.app.MonthAwardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -60,4 +68,52 @@ public class MonthAwardServiceImpl extends ServiceImpl<MonthAwardMapper, MonthAw
}
return R.ok(monthAwardVo);
}
@Override
public R<PageInfo<MonthAward>> getList(MonthAwardQuery query) {
log.info("shop-mall[]MonthAwardServiceImpl[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参为空!");
}
pageHandle(query);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(query.getQueryTime())) {
map.put("queryTime", query.getQueryTime());
}
int total = baseMapper.count(map);
map.put("startNum", query.getStartNum());
map.put("endNum", query.getEndNum());
List<MonthAward> list = baseMapper.getList(map);
PageInfo<MonthAward> info = new PageInfo<>();
info.setPageSize(query.getPageSize());
info.setPageNum(query.getPageNo());
info.setTotal(total);
info.setList(list);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(MonthAwardQuery schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.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;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.ProgressPrizeMapper;
import cn.wisenergy.model.app.ProgressPrize;
import cn.wisenergy.model.app.TeamPerformance;
import cn.wisenergy.model.dto.ProgressPrizeQuery;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.PrizeShowVo;
import cn.wisenergy.model.vo.ProgressPrizeVo;
import cn.wisenergy.service.app.ProgressPrizeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -42,4 +50,54 @@ public class ProgressPrizeServiceImpl extends ServiceImpl<ProgressPrizeMapper, P
prizeShowVo.setPrizeVos(list);
return R.ok(prizeShowVo);
}
@Override
public R<PageInfo<ProgressPrize>> getList(ProgressPrizeQuery query) {
log.info("shop-mall[]ProgressPrizeServiceImpl[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参不能为空!");
}
pageHandle(query);
Map<String, Object> map = new HashMap<>(8);
map.put("queryTime", query.getQueryTime());
if (!StringUtils.isBlank(query.getQueryTime())) {
Date date = DateUtil.convertStrToDate(query.getQueryTime(), "yyyy-MM-dd");
map.put("queryTime", date);
}
int total = baseMapper.count(map);
map.put("startNum", query.getStartNum());
map.put("endNum", query.getEndNum());
List<ProgressPrize> list = baseMapper.getList(map);
PageInfo<ProgressPrize> info = new PageInfo<>();
info.setPageSize(query.getPageSize());
info.setPageNum(query.getPageNo());
info.setTotal(total);
info.setList(list);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(ProgressPrizeQuery schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.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;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
......@@ -14,6 +14,7 @@ import cn.wisenergy.model.enums.UserLevelEnum;
import cn.wisenergy.service.app.TradeRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -38,6 +39,7 @@ public class TradeRecordServiceImpl extends ServiceImpl<TradeRecordMapper, Trade
@Autowired
private TradeRecordMapper tradeRecordMapper;
@XxlJob(value = "monthAwardCountTask")
@Override
public R<Boolean> monthAwardCount() {
MonthAward result = new MonthAward();
......
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.vo.MonthAwardVo;
import cn.wisenergy.service.app.MonthAwardService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
......@@ -37,4 +40,16 @@ public class MonthAwardController {
}
return monthAwardService.queryMonthAward(userId);
}
@ApiOperation(value = "获取月度奖金列表", notes = "获取月度奖金列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "MonthAwardQuery")
@GetMapping("/getList")
public R<PageInfo<MonthAward>> getList(MonthAwardQuery query) {
log.info("shop-mall[]MonthAwardController[]monthAwardQuery[]input.param.query:" + query);
if (null == query) {
return R.error("入参为空!");
}
return monthAwardService.getList(query);
}
}
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.app.ProgressPrize;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.dto.ProgressPrizeQuery;
import cn.wisenergy.service.app.ProgressPrizeService;
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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 86187
*/
@Api(tags = "后台管理--进步奖")
@RestController
@RequestMapping("/prize")
@Slf4j
public class PrizeController {
@Autowired
private ProgressPrizeService prizeService;
@ApiOperation(value = "获取最大进步奖列表", notes = "获取最大进步奖列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "ProgressPrizeQuery")
@GetMapping("/getList")
public R<PageInfo<ProgressPrize>> getList(ProgressPrizeQuery query) {
log.info("shop-mall[]MonthAwardController[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参为空!");
}
return prizeService.getList(query);
}
}
package cn.wisenergy.web.admin.controller.app;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 86187
*/
@Api(tags = "后台管理 -- 应用设置")
@RestController
@RequestMapping("/account")
@Slf4j
public class SettingController {
}
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.SysUserMapper;
import cn.wisenergy.model.app.ProgressPrize;
import cn.wisenergy.model.app.SysUser;
import cn.wisenergy.model.dto.ProgressPrizeQuery;
import cn.wisenergy.model.dto.SysLoginDto;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author 86187
*/
@Api(tags = "后台管理--用户登录")
@RestController
@RequestMapping("/sysUser")
@Slf4j
public class SysUserController {
@Autowired
private SysUserMapper sysUserMapper;
@ApiOperation(value = "登录", notes = "登录", httpMethod = "POST")
@ApiImplicitParam(name = "query", value = "登录信息", dataType = "SysLoginDto")
@PostMapping("/login")
public R<Boolean> login(@RequestBody SysLoginDto query) {
log.info("shop-mall[]SysUserController[]login[]input.param.query:" + query);
if (null == query || StringUtils.isBlank(query.getAccount()) || StringUtils.isBlank(query.getPassword())) {
return R.error("入参为空!");
}
//获取账户信息
SysUser sysUser = sysUserMapper.getByAccount(query.getAccount());
if (null == sysUser) {
return R.error("用户信息不存在!");
}
//判断账户密码是否正确
if (!query.getPassword().equals(sysUser.getPassword())) {
return R.error("密码输入错误,请从新输入!");
}
return R.ok(0, true);
}
}
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