Skip to content

S
shop-Mall
Commit a7d955c5 authored by m1991's avatar m1991
Browse files
Options

后台接口——用户与资讯后台接口

parent 05fc10ea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1793 additions and 312 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CultivatingPrizeInfoMapper.java
View file @ a7d955c5
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.CultivatingPrizeInfo;
import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* 培育奖详情记录
......@@ -15,4 +16,19 @@ public interface CultivatingPrizeInfoMapper extends BaseMapper<CultivatingPrizeI
CultivatingPrizeInfo getOneByUserId(String userId);
int add(CultivatingPrizeInfo cultivatingPrizeInfo);
/**
* 分页查询所有信息
* @param map
* @return
*/
List<CultivatingPrizeInfoVo> getCultivatingPrizeInfoList(Map<String, Object> map);
/**
* 统计总记录数
*
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CultivatingPrizeMapper.java
View file @ a7d955c5
......@@ -3,7 +3,7 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.CultivatingPrize;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.math.BigDecimal;
import java.util.List;
/**
* 培育奖金额对应表
......@@ -16,4 +16,11 @@ public interface CultivatingPrizeMapper extends BaseMapper<CultivatingPrize> {
* @return
*/
CultivatingPrize getcultivatingPrizeByUserLevel(int userLevel);
/**
* 查询所有信息
* @return
*/
List<CultivatingPrize> getCultivatingPrizeList();
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RecommendUserMapper.java
View file @ a7d955c5
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.vo.RecommendUserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* @author zw
......@@ -33,4 +37,19 @@ public interface RecommendUserMapper extends BaseMapper<RecommendUser> {
* @return
*/
int add(RecommendUser recommendUser);
/**
* 分页查询所有用户信息
* @param map
* @return
*/
List<RecommendUserVo> getRecommendUserList(Map<String, Object> map);
/**
* 统计总记录数
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
View file @ a7d955c5
......@@ -2,13 +2,13 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.model.app.zxUserDto;
import cn.wisenergy.model.app.zxUserVo;
import cn.wisenergy.model.vo.ShopZxUserVo;
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;
/**
......@@ -34,15 +34,15 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
/**
* 倒叙查询资讯与用户发布数据
*/
List<zxUserDto> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
/**
* 用于查询资讯单表全部信息
* @param pageNum
* @param pageSize
* @return
*/
List<zxUserVo> selectAll(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
List<ShopZxUserVo> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
//
// /**
// * 用于查询资讯单表全部信息
// * @param pageNum
// * @param pageSize
// * @return
// */
// List<zxUserVo> selectAll(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
/**
* 点赞接口专用
......@@ -58,4 +58,18 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
* @return
*/
int updateZxToExaminezxid(@Param("zxid")Integer zxid,@Param("ZxToExamine") Integer ZxToExamine);
/**
* 分页查询所有用户信息
* @param map
* @return
*/
List<ShopZxUserVo> getShopZxList(Map<String, Object> map);
/**
* 统计总记录数
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamPerformanceMapper.java
View file @ a7d955c5
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.TeamPerformance;
import cn.wisenergy.model.app.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
......
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamUserInfoMapper.java
View file @ a7d955c5
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.vo.TeamUserInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* 团队Mapper
* @author zw
......@@ -30,4 +33,19 @@ public interface TeamUserInfoMapper extends BaseMapper<TeamUserInfo> {
int add(TeamUserInfo teamUserInfo);
int edit(TeamUserInfo teamUserInfo);
/**
* 分页查询所有信息
* @param map
* @return
*/
List<TeamUserInfoVo> getTeamUserInfoList(Map<String, Object> map);
/**
* 统计总记录数
*
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @ a7d955c5
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
......@@ -49,7 +50,7 @@ public interface UsersMapper extends BaseMapper<User> {
*/
List<User> findAllNotZeroUser();
User findByName(String name);
User findByName(String name);
String findPswByName(String UserName);
......@@ -104,6 +105,7 @@ public interface UsersMapper extends BaseMapper<User> {
/**
* 查询用户
*
*
* @param param
* @return
*/
......@@ -127,7 +129,7 @@ public interface UsersMapper extends BaseMapper<User> {
Integer save(@Param("userId") String userId, @Param("beInvitedCode") String beInvitedCode);
User edit1(int userLevel, String intiveCode, String userId);
User edit1(int userLevel, String intiveCode, String userId);
Integer getuserIdById(@Param("userId") String userId);
......@@ -157,7 +159,7 @@ public interface UsersMapper extends BaseMapper<User> {
* @param userLevel 用户等级
* @return 等级用户列表
*/
List<User> getByLevel(@Param("userLevel") Integer userLevel);
List<cn.wisenergy.model.app.User> getByLevel(@Param("userLevel") Integer userLevel);
/**
* @param
......@@ -191,7 +193,7 @@ public interface UsersMapper extends BaseMapper<User> {
* @return
*/
List<User> getAerialDeliveryUserBeforOneMonth(@Param("before") String before,
@Param("now") String now);
@Param("now") String now);
/**
* 随机获取一条小于当前id的用户 即： 比当前用户早注册的用户
......@@ -249,7 +251,6 @@ public interface UsersMapper extends BaseMapper<User> {
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
int countUser( Map<String, Object> map);
}
wisenergy-mapper/src/main/resources/mapper/CultivatingPrizeInfoMapper.xml
View file @ a7d955c5
......@@ -76,4 +76,37 @@
(<include refid="vals"/>)
</insert>
<select id="getCultivatingPrizeInfoList" resultType="cn.wisenergy.model.vo.CultivatingPrizeInfoVo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
user_id=#{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and `create_time` = #{queryTime}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/CultivatingPrizeMapper.xml
View file @ a7d955c5
......@@ -50,4 +50,14 @@
</where>
</select>
<select id="getCultivatingPrizeList" resultType="cn.wisenergy.model.app.CultivatingPrize">
select
<include refid="cols_all"/>
from
<include refid="table"/>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/RecommendUserMapper.xml
View file @ a7d955c5
......@@ -107,4 +107,39 @@
value
(<include refid="vals"/>)
</insert>
<select id="getRecommendUserList" resultType="cn.wisenergy.model.app.RecommendUser">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
user_id=#{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and `create_time` = #{queryTime}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
View file @ a7d955c5
......@@ -55,7 +55,7 @@
<!--资讯内容倒叙查询-->
<select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserDto">
<select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.vo.UserVo">
select
b.zx_id as zxid,
b.zx_url as zxUrl,
......@@ -68,6 +68,7 @@
from shop_zx b left join user_info a ON a.invite_code=b.invite_code
WHERE zx_to_examine != 0
AND a.user_id !=0
and a.user_id !=null
order by zxid desc limit #{pageNum},#{pageSize}
</select>
<!--资讯总记录数查询-->
......@@ -106,7 +107,7 @@
</where>
</update>
<!--资讯内容与用户内容倒叙查询-->
<select id="selectAll" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserVo">
<select id="getShopZxList" resultType="cn.wisenergy.model.vo.ShopZxUserVo">
select
b.zx_id as zxid,
b.zx_url as zxUrl,
......@@ -115,9 +116,27 @@
b.zx_date as zxDate,
b.invite_code as inviteCode,
a.user_id as userId,
a.head_image as headImage
b.zx_to_examine as ZxToExamine
from shop_zx b left join user_info a ON a.invite_code=b.invite_code
order by zx_id desc limit #{pageNum},#{pageSize}
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
</where>
order by zx_id desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
zx_id = #{zxId}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/TeamUserInfoMapper.xml
View file @ a7d955c5
......@@ -112,4 +112,38 @@
value
(<include refid="vals"/>)
</insert>
<select id="getTeamUserInfoList" resultType="cn.wisenergy.model.app.TeamUserInfo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
user_id=#{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and `create_time` = #{queryTime}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
View file @ a7d955c5
......@@ -100,10 +100,10 @@
user_id=#{userId}
</if>
<if test="yearMonth != null">
AND(
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(create_time) = MONTH(#{yearMonth}))
</if>
AND(
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(create_time) = MONTH(#{yearMonth}))
</if>
</where>
</select>
......
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @ a7d955c5
......@@ -438,6 +438,7 @@
user_id = #{userId}
</select>
<select id="getUserList" resultType="cn.wisenergy.model.app.User">
select
<include refid="cols_all"/>
......@@ -458,21 +459,10 @@
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
<select id="countUser" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id=#{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
user_info
</select>
</mapper>
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @ a7d955c5
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -17,7 +16,7 @@ import java.util.Date;
* @ CreateDate : 2020/11/8 19:59
*/
@Data
@ApiModel(value = "User")
@ApiModel(value = "UserInfo")
@TableName("user_info")
public class User implements Serializable{
private static final long serialVersionUID = 2525339404301884673L;
......@@ -113,127 +112,5 @@ public class User implements Serializable{
@ApiModelProperty(name = "frozen", value = "账户冻结字段")
private Integer frozen;
public Integer getFrozen() {
return frozen;
}
public void setFrozen(Integer frozen) {
this.frozen = frozen;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getHeadImage() {
return headImage;
}
public void setHeadImage(String headImage) {
this.headImage = headImage;
}
public int getUserLevel() {
return userLevel;
}
public void setUserLevel(int userLevel) {
this.userLevel = userLevel;
}
public BigDecimal getCrossBorderLine() {
return crossBorderLine;
}
public void setCrossBorderLine(BigDecimal crossBorderLine) {
this.crossBorderLine = crossBorderLine;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getFansNickname() {
return fansNickname;
}
public void setFansNickname(String fansNickname) {
this.fansNickname = fansNickname;
}
public String getFansId() {
return fansId;
}
public void setFansId(String fansId) {
this.fansId = fansId;
}
public String getInviteCode() {
return inviteCode;
}
public void setInviteCode(String inviteCode) {
this.inviteCode = inviteCode;
}
public String getBeInvitedCode() {
return beInvitedCode;
}
public void setBeInvitedCode(String beInvitedCode) {
this.beInvitedCode = beInvitedCode;
}
public String getCustomerServiceId() {
return customerServiceId;
}
public void setCustomerServiceId(String customerServiceId) {
this.customerServiceId = customerServiceId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/zxUserDto.java deleted 100644 → 0
View file @ 05fc10ea
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Created by m1991 on 2021/3/10 20:29
*/
@Data
public class zxUserDto {
/**
* 手机号作为用户账号
*/
@TableField(exist = false)
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/*
* 用户头像
*/
@TableField(exist = false)
@ApiModelProperty(name = "headImage", value = "用户头像")
private String headImage;
/**
* 资讯主键id
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_id", value = "资讯主键id")
private Integer zxid;
/**
* 视频存放地址
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_url", value = "视频/图片存放地址")
private String zxUrl;
/**
* 用户本人邀请码
*/
@TableField(exist = false)
@ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
private String inviteCode;
/**
* 获赞数
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_likes", value = "获赞数")
private Integer zxLikes;
@ApiModelProperty(name = "liked_status", value = "点赞状态")
private Integer likedStatus;
/**
* 资讯文字输入字段
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
private String zxField;
/**
* 资讯数据创建时间
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
private Long zxDate;
@TableField(exist = false)
private List<String> askImgList;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/CultivatingPrizeDto.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/26 11:13
*/
@Data
@ApiModel("CultivatingPrizeDto")
public class CultivatingPrizeDto {
/**
* 用户id
*/
@ApiModelProperty(value = "主键id", name = "id")
private String id;
/**
* 页码
*/
@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/dto/CultivatingPrizeInfoDto.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/26 10:13
*/
@Data
@ApiModel("CultivatingPrizeInfoDto")
public class CultivatingPrizeInfoDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 查询时间 格式(yyyy-MM-dd)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", 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;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/RecommendUserDto.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/25 18:32
*/
@Data
@ApiModel("RecommendUserDto")
public class RecommendUserDto extends TeamQueryDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 查询时间 格式(yyyy-MM-dd)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", 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;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ShopZxUserDto.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Created by m1991 on 2021/3/10 20:29
*/
@Data
@ApiModel("ShopZxUserDto")
public class ShopZxUserDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String 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/dto/TeamUserInfoDto.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/26 9:34
*/
@Data
@ApiModel("TeamUserInfoDto")
public class TeamUserInfoDto extends TeamQueryDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 查询时间 格式(yyyy-MM-dd)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", 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;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserDto.java
View file @ a7d955c5
......@@ -21,7 +21,6 @@ public class UserDto {
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
......@@ -38,4 +37,5 @@ public class UserDto {
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/UsersDto.java → wisenergy-model/src/main/java/cn/wisenergy/model/dto/UsersDto.java
View file @ a7d955c5
package cn.wisenergy.model.app;
package cn.wisenergy.model.dto;
import cn.wisenergy.model.app.User;
import lombok.Data;
import java.io.Serializable;
......
wisenergy-model/src/main/java/cn/wisenergy/model/vo/CultivatingPrizeInfoVo.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.vo;
import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 10:14
*/
@ApiModel("CultivatingPrizeInfoVo")
@Data
public class CultivatingPrizeInfoVo extends CultivatingPrizeInfoDto {
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "主键id")
private int id;
/**
* 用户id
*/
@ApiModelProperty(name = "userId", value = "用户id")
private String userId;
/**
* 幼苗状态培育奖记录 0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "seedling", value = "幼苗等级培育奖记录")
private int seedling;
/**
* 青铜树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "bronze_tree", value = "青铜树等级培育奖记录")
private int bronzeTree;
/**
* 白银树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "silver_tree", value = "白银树等级培育奖记录")
private int silverTree;
/**
* 黄金树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "gold_tree", value = "黄金树等级培育奖记录")
private int goldTree;
/**
* 农场主等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "forest_start", value = "农场主等级培育奖记录")
private int farmer;
/**
* 森林之星等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "forest_start", value = "森林之星等级培育奖记录")
private int forestStart;
/**
* 西田森合伙人等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "partner", value = "西田森合伙人等级培育奖记录")
private int partner;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/CultivatingPrizeVo.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 12:34
*/
@Data
public class CultivatingPrizeVo {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id", name = "id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 年月
*/
@ApiModelProperty(value = "年月", name = "yearMonth")
private String yearMonth;
/**
* 本月增长率
*/
@ApiModelProperty(value = "本月增长率", name = "growthRate")
private Double growthRate;
/**
* 进步奖奖金
*/
@ApiModelProperty(value = "进步奖奖金", name = "awardMoney")
private Double awardMoney;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间", name = "updateTime")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/RecommendUserVo.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Created by m1991 on 2021/3/25 18:36
*/
@ApiModel("RecommendUserVo")
@Data
public class RecommendUserVo {
/**
* 直推用户主键id
*/
@ApiModelProperty(name = "id", value = "直推用户主键id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/**
* 普通用户数量
*/
@ApiModelProperty(name = "normal_user_num", value = "普通用户数量")
private Integer normalUserNum;
/**
* 幼苗数量
*/
@ApiModelProperty(name = "seedling_num", value = "幼苗数量")
private Integer seedlingNum;
/**
* 青铜树数量
*/
@ApiModelProperty(name = " bronze_tree_num", value = "青铜树数量")
private Integer bronzeTreeNum;
/**
* 白银树数量
*/
@ApiModelProperty(name = "silver_tree_num", value = "白银树数量")
private Integer silverTreeNum;
/**
* 黄金树数量
*/
@ApiModelProperty(name = "gold_tree_num", value = "黄金树数量")
private Integer goldTreeNum;
/**
* 农场主数量
*/
@ApiModelProperty(name = "farmer_num", value = "农场主数量")
private Integer farmerNum;
/**
* 森林之星数量
*/
@ApiModelProperty(name = "forest_start_num", value = "森林之星数量")
private Integer forestStartNum;
/**
* 西田森合伙人数量
*/
@ApiModelProperty(name = "partner_num", value = "西田森合伙人数量")
private Integer partnerNum;
/**
* 创建时间
*/
@ApiModelProperty(name = "create_time", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "update_time", value = "更新时间")
private Date updateTime;
/**
* 用户当月消费金额
*/
@ApiModelProperty(name = "monthy_count", value = "用户当月消费金额")
private BigDecimal monthyCount;
/**
* 用户当月消费金额
*/
@ApiModelProperty(name = "history_count", value = "用户累计消费金额")
private BigDecimal historyCount;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/zxUserVo.java → wisenergy-model/src/main/java/cn/wisenergy/model/vo/ShopZxUserVo.java
View file @ a7d955c5
package cn.wisenergy.model.app;
package cn.wisenergy.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
......@@ -11,7 +11,7 @@ import java.util.List;
* Created by m1991 on 2021/3/22 11:06
*/
@Data
public class zxUserVo {
public class ShopZxUserVo {
/**
* 手机号作为用户账号
*/
......@@ -61,7 +61,11 @@ public class zxUserVo {
@ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
private Long zxDate;
/**
* 资讯数据创建时间
*/
@TableField(exist = false)
@ApiModelProperty(name = "AskImgList", value = "资讯图片List集合")
private List AskImgList;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/TeamUserInfoVo.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 9:35
*/
@ApiModel("TeamUserInfoVo")
@Data
public class TeamUserInfoVo {
/**
* 团队用户主键id
*/
@ApiModelProperty(name = "id", value = "团队用户主键id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(name = "userId", value = "用户id")
private String userId;
/**
* 普通用户数量
*/
@ApiModelProperty(name = "normal_user_num", value = "普通用户数量")
private Integer normalUserNum;
/**
* 幼苗数量
*/
@ApiModelProperty(name = "seedling_num", value = "幼苗数量")
private Integer seedlingNum;
/**
* 青铜树数量
*/
@ApiModelProperty(name = " bronze_tree_num", value = "青铜树数量")
private Integer bronzeTreeNum;
/**
* 白银树数量
*/
@ApiModelProperty(name = "silver_tree_num", value = "白银树数量")
private Integer silverTreeNum;
/**
* 黄金树数量
*/
@ApiModelProperty(name = "gold_tree_num", value = "黄金树数量")
private Integer goldTreeNum;
/**
* 农场主数量
*/
@ApiModelProperty(name = "farmer_num", value = "农场主数量")
private Integer farmerNum;
/**
* 森林之星数量
*/
@ApiModelProperty(name = "forest_start_num", value = "森林之星数量")
private Integer forestStartNum;
/**
* 西田森合伙人数量
*/
@ApiModelProperty(name = "partner_num", value = "西田森合伙人数量")
private Integer partnerNum;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "updateTime", value = "更新时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserVo.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 11:26
*/
@Data
@ApiModel("UserVo")
public class UserVo {
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "用户主键id")
private Integer id;
/**
* 手机号作为用户账号
*/
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/**
* 密码
*/
@ApiModelProperty(name = "password", value = "用户密码")
private String password;
/**
* 用户头像
*/
@ApiModelProperty(name = "用户头像", value = "headImage")
private String headImage;
/**
* 用户会员等级
*/
@ApiModelProperty(name = "user_level", value = "用户会员等级")
private int userLevel;
/**
* 跨境额度
*/
@ApiModelProperty(name = "cross_border_line", value = "跨境额度")
private BigDecimal crossBorderLine;
/**
* 身份证号码
*/
@ApiModelProperty(name = "id_card_number", value = "身份证号码")
private String idCardNumber;
/**
* 粉丝昵称
*/
@ApiModelProperty(name = "fans_nickname", value = "粉丝昵称")
private String fansNickname;
/**
* 有赞粉丝id，有赞自动生成
*/
@ApiModelProperty(name = "fans_id", value = "有赞粉丝id，有赞自动生成")
private String fansId;
/**
* 用户本人邀请码
*/
@ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
private String inviteCode;
/**
* 推荐人邀请码
*/
@ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
private String beInvitedCode;
/**
* 专属客服id
*/
@ApiModelProperty(name = "customerServiceId", value ="专属客服id" )
private String customerServiceId;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime;
/**
* 账户冻结字段 0正常 1冻结
*/
@ApiModelProperty(name = "frozen", value = "账户冻结字段")
private Integer frozen;
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/CultivatingPrizeInfoService.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
import com.github.pagehelper.PageInfo;
/**
* Created by m1991 on 2021/3/26 10:22
*/
public interface CultivatingPrizeInfoService {
/**
* 分页查询所有信息
*
* @param cultivatingPrizeInfoDto 查询参数
* @return 列表
*/
R<PageInfo<CultivatingPrizeInfoVo>> getCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/CultivatingPrizeService.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.CultivatingPrize;
import cn.wisenergy.model.dto.CultivatingPrizeDto;
import com.github.pagehelper.PageInfo;
import java.util.List;
/**
* Created by m1991 on 2021/3/26 11:00
*/
public interface CultivatingPrizeService {
/**
* 分页查询所有用户信息
*
* @return 列表
*/
R<List<CultivatingPrize>> getCultivatingPrizeList();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/DayTaskService.java
View file @ a7d955c5
......@@ -3,6 +3,7 @@ package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.User;
import java.util.List;
/**
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/LoginService.java
View file @ a7d955c5
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.vo.UserLoginVo;
import cn.wisenergy.model.vo.UserRegisterVo;
/**
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/RecommendUserService.java
View file @ a7d955c5
......@@ -2,8 +2,10 @@ package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.RecommendUserDto;
import cn.wisenergy.model.vo.RecommendUserVo;
import cn.wisenergy.model.vo.UserAndRecommendVo;
import com.github.pagehelper.PageInfo;
import java.util.List;
......@@ -12,4 +14,12 @@ public interface RecommendUserService {
RecommendUser getMyRecommed(String userId);
List<UserAndRecommendVo> getMyRecommendInfo(String userId, Integer userLevel);
/**
* 分页查询所有用户信息
*
* @param recommendUserDto 查询参数
* @return 列表
*/
R<PageInfo<RecommendUserVo>> getRecommendUserList(RecommendUserDto recommendUserDto);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/TeamUserInfoService.java
View file @ a7d955c5
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.dto.TeamUserInfoDto;
import cn.wisenergy.model.vo.TeamUserInfoVo;
import com.github.pagehelper.PageInfo;
public interface TeamUserInfoService {
......@@ -11,4 +15,12 @@ public interface TeamUserInfoService {
* @return 用户团队总人数
*/
int getTeamUserCount(String userId);
/**
* 分页查询所有用户信息
*
* @param teamUserInfoDto 查询参数
* @return 列表
*/
R<PageInfo<TeamUserInfoVo>> getTeamUserInfoList(TeamUserInfoDto teamUserInfoDto);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java
View file @ a7d955c5
package cn.wisenergy.service.app;
import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.model.app.zxUserVo;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.ShopZxUserDto;
import cn.wisenergy.model.vo.ShopZxUserVo;
import com.github.pagehelper.PageInfo;
import org.springframework.core.io.Resource;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
......@@ -55,11 +56,10 @@ public interface UploadService {
/**
* TODO 资讯单表分页全部信息展示
* @param pageNum
* @param pageSize
* @param shopZxUserDto
* @return
*/
List<zxUserVo> selectAll(Integer pageNum, Integer pageSize);
R<PageInfo<ShopZxUserVo>> getShopZxUserList(ShopZxUserDto shopZxUserDto);
/**
* TODO 资讯点赞
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @ a7d955c5
......@@ -2,9 +2,11 @@ package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.model.dto.UsersDto;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.AerialDeliveryVo;
import com.github.pagehelper.PageInfo;
import java.util.Map;
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AerialDeliveryUserServiceImpl.java
View file @ a7d955c5
......@@ -7,10 +7,7 @@ import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
import org.bytedeco.javacpp.presets.opencv_core;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CultivatingPrizeInfoServiceImpl.java 0 → 100644
View file @ a7d955c5
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.CultivatingPrizeInfoMapper;
import cn.wisenergy.model.app.CultivatingPrizeInfo;
import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
import cn.wisenergy.service.app.CultivatingPrizeInfoService;
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;
/**
* Created by m1991 on 2021/3/26 10:22
*/
@Service
@Slf4j
public class CultivatingPrizeInfoServiceImpl implements CultivatingPrizeInfoService {
@Autowired
public CultivatingPrizeInfoMapper cultivatingPrizeInfoMapper;
@Override
public R<PageInfo<CultivatingPrizeInfoVo>> getCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto) {
log.info("shop-mall[]CultivatingPrizeInfoServiceImpl[]getCultivatingPrizeInfoList[]input.param.query:" + cultivatingPrizeInfoDto);
if (null == cultivatingPrizeInfoDto) {
return R.error("入参不能为空!");
}
pageHandle(cultivatingPrizeInfoDto);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(cultivatingPrizeInfoDto.getUserId())) {
map.put("userId", cultivatingPrizeInfoDto.getUserId());
}
if (!StringUtils.isBlank(cultivatingPrizeInfoDto.getQueryTime())) {
Date date = DateUtil.convertStrToDate(cultivatingPrizeInfoDto.getQueryTime(), "yyyy-MM-dd");
String queryTime = cultivatingPrizeInfoDto.getQueryTime();
map.put("queryTime", queryTime);
}
map.put("startNum", cultivatingPrizeInfoDto.getStartNum());
map.put("endNum", cultivatingPrizeInfoDto.getEndNum());
int total = cultivatingPrizeInfoMapper.count(map);
List<CultivatingPrizeInfoVo> list = cultivatingPrizeInfoMapper.getCultivatingPrizeInfoList(map);
PageInfo<CultivatingPrizeInfoVo> info = new PageInfo<>();
info.setPageSize(cultivatingPrizeInfoDto.getPageSize());
info.setPageNum(cultivatingPrizeInfoDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(CultivatingPrizeInfoDto 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);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CultivatingPrizeServiceImpl.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.CultivatingPrizeMapper;
import cn.wisenergy.model.app.CultivatingPrize;
import cn.wisenergy.model.vo.CultivatingPrizeVo;
import cn.wisenergy.service.app.CultivatingPrizeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by m1991 on 2021/3/26 11:06
*/
@Service
@Slf4j
public class CultivatingPrizeServiceImpl implements CultivatingPrizeService {
@Autowired
public CultivatingPrizeMapper cultivatingPrizeMapper;
@Override
public R<List<CultivatingPrize>> getCultivatingPrizeList() {
log.info("shop-mall[]CultivatingPrizeServiceImpl[]getCultivatingPrizeList[]input.param.query:" );
List<CultivatingPrize> cultivatingPrizeList = cultivatingPrizeMapper.getCultivatingPrizeList();
return R.ok(cultivatingPrizeList);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CustomerServiceServiceImpl.java
View file @ a7d955c5
......@@ -7,19 +7,17 @@ import cn.wisenergy.model.app.CustomerService;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.CustomerServiceService;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.yaml.snakeyaml.events.Event;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@Service
@Slf4j
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DayTaskServiceImpl.java
View file @ a7d955c5
......@@ -164,15 +164,15 @@ public class DayTaskServiceImpl implements DayTaskService {
continue;
}
for (User userInfo : userList) {
for (User user : userList) {
//3)、统计当前用户的上级用户团队绩效
//key 存在 当前用户团队绩效 + 上级用户团队绩效
if (tempMap.containsKey(userInfo.getUserId())) {
double teamMoney = userCount + tempMap.get(userInfo.getUserId());
tempMap.put(userInfo.getUserId(), teamMoney);
if (tempMap.containsKey(user.getUserId())) {
double teamMoney = userCount + tempMap.get(user.getUserId());
tempMap.put(user.getUserId(), teamMoney);
} else {
//key 不存在，加入集合 当前用户团队绩效
tempMap.put(userInfo.getUserId(), userCount);
tempMap.put(user.getUserId(), userCount);
}
}
}
......@@ -351,12 +351,12 @@ public class DayTaskServiceImpl implements DayTaskService {
User user = usersMapper.getByUserId(userId);
list.add(user);
if (null != user && !StringUtils.isBlank(user.getBeInvitedCode())) {
User userInfo = usersMapper.getByBeInvitedCode(user.getBeInvitedCode());
if (null != userInfo) {
if (userInfo.getBeInvitedCode().equals(userInfo.getInviteCode())) {
user = usersMapper.getByBeInvitedCode(user.getBeInvitedCode());
if (null != user) {
if (user.getBeInvitedCode().equals(user.getInviteCode())) {
return;
}
getUser(list, userInfo.getUserId());
getUser(list, user.getUserId());
}
}
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MonthTaskServiceImpl.java
View file @ a7d955c5
......@@ -3,6 +3,7 @@ package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.enums.MemberPercentEnum;
import cn.wisenergy.model.enums.TradeRecordEnum;
......@@ -132,15 +133,15 @@ public class MonthTaskServiceImpl implements MonthTaskService {
continue;
}
for (User userInfo : userList) {
for (User User : userList) {
//3)、统计当前用户的上级用户团队绩效
//key 存在 当前用户团队绩效 + 上级用户团队绩效
if (tempMap.containsKey(userInfo.getUserId())) {
double teamMoney = userCount + tempMap.get(userInfo.getUserId());
tempMap.put(userInfo.getUserId(), teamMoney);
if (tempMap.containsKey(User.getUserId())) {
double teamMoney = userCount + tempMap.get(User.getUserId());
tempMap.put(User.getUserId(), teamMoney);
} else {
//key 不存在，加入集合 当前用户团队绩效
tempMap.put(userInfo.getUserId(), userCount);
tempMap.put(User.getUserId(), userCount);
}
}
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RecommendUserServiceImpl.java
View file @ a7d955c5
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.RecommendUserMapper;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.RecommendUserDto;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.RecommendUserVo;
import cn.wisenergy.model.vo.UserAndRecommendVo;
import cn.wisenergy.service.app.RecommendUserService;
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.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service
@Slf4j
......@@ -63,4 +67,61 @@ public class RecommendUserServiceImpl implements RecommendUserService {
return userAndRecommendVos;
}
@Override
public R<PageInfo<RecommendUserVo>> getRecommendUserList(RecommendUserDto recommendUserDto) {
log.info("shop-mall[]RecommendUserServiceImpl[]getRecommendUserList[]input.param.query:" + recommendUserDto);
if (null == recommendUserDto) {
return R.error("入参不能为空!");
}
pageHandle(recommendUserDto);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(recommendUserDto.getUserId())) {
map.put("userId", recommendUserDto.getUserId());
}
if (!StringUtils.isBlank(recommendUserDto.getQueryTime())) {
Date date = DateUtil.convertStrToDate(recommendUserDto.getQueryTime(), "yyyy-MM-dd");
String queryTime = recommendUserDto.getQueryTime();
map.put("queryTime", queryTime);
}
int total = recommendUserMapper.count(map);
map.put("startNum", recommendUserDto.getStartNum());
map.put("endNum", recommendUserDto.getEndNum());
List<RecommendUserVo> list = recommendUserMapper.getRecommendUserList(map);
PageInfo<RecommendUserVo> info = new PageInfo<>();
info.setPageSize(recommendUserDto.getPageSize());
info.setPageNum(recommendUserDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(RecommendUserDto 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);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TeamUserInfoServiceImpl.java
View file @ a7d955c5
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.TeamUserInfoMapper;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.dto.TeamUserInfoDto;
import cn.wisenergy.model.vo.TeamUserInfoVo;
import cn.wisenergy.service.app.TeamUserInfoService;
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;
@Service
@Slf4j
public class TeamUserInfoServiceImpl implements TeamUserInfoService {
......@@ -36,4 +48,60 @@ public class TeamUserInfoServiceImpl implements TeamUserInfoService {
int teamUserCount = teamUserInfoMapper.getTeamUserCount(userId);
return teamUserCount;
}
@Override
public R<PageInfo<TeamUserInfoVo>> getTeamUserInfoList(TeamUserInfoDto teamUserInfoDto) {
log.info("shop-mall[]TeamUserInfoServiceImpl[]getTeamUserInfoList[]input.param.query:" + teamUserInfoDto);
if (null == teamUserInfoDto) {
return R.error("入参不能为空!");
}
pageHandle(teamUserInfoDto);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(teamUserInfoDto.getUserId())) {
map.put("userId", teamUserInfoDto.getUserId());
}
if (!StringUtils.isBlank(teamUserInfoDto.getQueryTime())) {
Date date = DateUtil.convertStrToDate(teamUserInfoDto.getQueryTime(), "yyyy-MM-dd");
String queryTime = teamUserInfoDto.getQueryTime();
map.put("queryTime", queryTime);
}
int total = teamUserInfoMapper.count(map);
map.put("startNum", teamUserInfoDto.getStartNum());
map.put("endNum", teamUserInfoDto.getEndNum());
List<TeamUserInfoVo> list = teamUserInfoMapper.getTeamUserInfoList(map);
PageInfo<TeamUserInfoVo> info = new PageInfo<>();
info.setPageSize(teamUserInfoDto.getPageSize());
info.setPageNum(teamUserInfoDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(TeamUserInfoDto 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);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
View file @ a7d955c5
......@@ -2,12 +2,16 @@ package cn.wisenergy.service.app.impl;
import cn.hutool.core.img.Img;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.expection.BaseException;
import cn.wisenergy.common.utils.*;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.mapper.userLikesMapper;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.dto.ShopZxUserDto;
import cn.wisenergy.model.vo.ShopZxUserVo;
import com.github.pagehelper.PageInfo;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.stereotype.Service;
......@@ -329,9 +333,9 @@ public class UploadServiceImpl implements UploadService {
public Map selectPage(Integer pageNum, Integer pageSize, String inviteCode) {
Map map = new HashMap();
pageNum = pageNum - 1;
List<zxUserDto> shopZxList = shopZxMapper.selectPage(pageNum, pageSize);
List<ShopZxUserVo> shopZxList = shopZxMapper.selectPage(pageNum, pageSize);
for (zxUserDto shopZx : shopZxList) {
for (ShopZxUserVo shopZx : shopZxList) {
String[] zxUrl = shopZx.getZxUrl().split(",");
ArrayList list = new ArrayList();
if (null != zxUrl) {
......@@ -371,11 +375,59 @@ public class UploadServiceImpl implements UploadService {
}
@Override
public List<zxUserVo> selectAll(Integer pageNum, Integer pageSize) {
public R<PageInfo<ShopZxUserVo>> getShopZxUserList(ShopZxUserDto shopZxUserDto) {
log.info("shop-mall[]TeamUserInfoServiceImpl[]getTeamUserInfoList[]input.param.query:" + shopZxUserDto);
if (null == shopZxUserDto) {
return R.error("入参不能为空!");
}
pageHandle(shopZxUserDto);
Map<String, Object> map = new HashMap<>(8);
if (!org.apache.commons.lang3.StringUtils.isBlank(shopZxUserDto.getUserId())) {
map.put("userId", shopZxUserDto.getUserId());
}
return shopZxMapper.selectAll(pageNum, pageSize);
int total = shopZxMapper.count(map);
map.put("startNum", shopZxUserDto.getStartNum());
map.put("endNum", shopZxUserDto.getEndNum());
List<ShopZxUserVo> list = shopZxMapper.getShopZxList(map);
PageInfo<ShopZxUserVo> info = new PageInfo<>();
info.setPageSize(shopZxUserDto.getPageSize());
info.setPageNum(shopZxUserDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(ShopZxUserDto 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);
}
/**
* 资讯点赞实现
*
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
View file @ a7d955c5
......@@ -6,7 +6,6 @@ import cn.wisenergy.model.enums.TradeRecordEnum;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import cn.wisenergy.service.app.UserLevelService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @ a7d955c5
......@@ -4,7 +4,7 @@ import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.*;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.model.dto.UsersDto;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.AerialDeliveryVo;
import cn.wisenergy.model.vo.UserPoolVo;
......@@ -394,7 +394,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
map.put("queryTime", date);
}
int total = usersMapper.count(map);
int total = usersMapper.countUser(map);
map.put("startNum", queryDto.getStartNum());
map.put("endNum", queryDto.getEndNum());
......@@ -430,4 +430,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
schemeVo.setPageSize(pageSize);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
View file @ a7d955c5
......@@ -7,7 +7,7 @@ import cn.wisenergy.common.enums.ResultEnum;
import cn.wisenergy.common.utils.*;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.model.dto.UsersDto;
import cn.wisenergy.model.vo.UserLoginVo;
import cn.wisenergy.model.vo.UserRegisterVo;
import cn.wisenergy.service.app.LoginService;
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TestController1.java 0 → 100644
View file @ a7d955c5
package cn.wisenergy.web.admin.controller.app;
import org.hyperic.sigar.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import lombok.extern.slf4j.Slf4j;
@RestController
@Slf4j
public class TestController1 {
@RequestMapping("/test")
public void test() {
try {
log.info("-----------------开始-----------------");
log.info("-----------------cpu信息-----------------");
// cpu信息
cpu();
log.info("-----------------内存信息-----------------");
// 内存信息
memory();
log.info("-----------------操作系统信息-----------------");
// 操作系统信息
os();
log.info("-----------------用户信息-----------------");
// 用户信息
who();
log.info("-----------------文件系统信息-----------------");
// 文件系统信息
file();
log.info("-----------------网络信息-----------------");
// 网络信息
net();
log.info("-----------------以太网信息-----------------");
// 以太网信息
ethernet();
log.info("-----------------结束-----------------");
} catch (Exception e1) {
e1.printStackTrace();
}
}
private static void memory() throws SigarException {
Sigar sigar = new Sigar();
Mem mem = sigar.getMem();
// 内存总量
log.info("内存总量: " + mem.getTotal() / 1024L + "K av");
// 当前内存使用量
log.info("当前内存使用量: " + mem.getUsed() / 1024L + "K used");
// 当前内存剩余量
log.info("当前内存剩余量: " + mem.getFree() / 1024L + "K free");
Swap swap = sigar.getSwap();
// 交换区总量
log.info("交换区总量: " + swap.getTotal() / 1024L + "K av");
// 当前交换区使用量
log.info("当前交换区使用量: " + swap.getUsed() / 1024L + "K used");
// 当前交换区剩余量
log.info("当前交换区剩余量: " + swap.getFree() / 1024L + "K free");
}
private static void cpu() throws SigarException {
Sigar sigar = new Sigar();
CpuInfo infos[] = sigar.getCpuInfoList();
CpuPerc cpuList[] = null;
cpuList = sigar.getCpuPercList();
for (int i = 0; i < infos.length; i++) {// 不管是单块CPU还是多CPU都适用
CpuInfo info = infos[i];
log.info("第" + (i + 1) + "块CPU信息");
log.info("CPU的总量MHz: " + info.getMhz());// CPU的总量MHz
log.info("CPU生产商: " + info.getVendor());// 获得CPU的卖主，如：Intel
log.info("CPU类别: " + info.getModel());// 获得CPU的类别，如：Celeron
log.info("CPU缓存数量: " + info.getCacheSize());// 缓冲存储器数量
printCpuPerc(cpuList[i]);
}
}
private static void printCpuPerc(CpuPerc cpu) {
log.info("CPU用户使用率: " + CpuPerc.format(cpu.getUser()));// 用户使用率
log.info("CPU系统使用率: " + CpuPerc.format(cpu.getSys()));// 系统使用率
log.info("CPU当前等待率: " + CpuPerc.format(cpu.getWait()));// 当前等待率
log.info("CPU当前错误率: " + CpuPerc.format(cpu.getNice()));//
log.info("CPU当前空闲率: " + CpuPerc.format(cpu.getIdle()));// 当前空闲率
log.info("CPU总的使用率: " + CpuPerc.format(cpu.getCombined()));// 总的使用率
}
private static void os() {
OperatingSystem OS = OperatingSystem.getInstance();
// 操作系统内核类型如： 386、486、586等x86
log.info("操作系统: " + OS.getArch());
log.info("操作系统CpuEndian(): " + OS.getCpuEndian());//
log.info("操作系统DataModel(): " + OS.getDataModel());//
// 系统描述
log.info("操作系统的描述: " + OS.getDescription());
// 操作系统类型
// log.info("OS.getName(): " + OS.getName());
// log.info("OS.getPatchLevel(): " + OS.getPatchLevel());//
// 操作系统的卖主
log.info("操作系统的卖主: " + OS.getVendor());
// 卖主名称
log.info("操作系统的卖主名: " + OS.getVendorCodeName());
// 操作系统名称
log.info("操作系统名称: " + OS.getVendorName());
// 操作系统卖主类型
log.info("操作系统卖主类型: " + OS.getVendorVersion());
// 操作系统的版本号
log.info("操作系统的版本号: " + OS.getVersion());
}
private static void who() throws SigarException {
Sigar sigar = new Sigar();
Who who[] = sigar.getWhoList();
if (who != null && who.length > 0) {
for (int i = 0; i < who.length; i++) {
// log.info("当前系统进程表中的用户名" + String.valueOf(i));
Who _who = who[i];
log.info("用户控制台: " + _who.getDevice());
log.info("用户host: " + _who.getHost());
// log.info("getTime(): " + _who.getTime());
// 当前系统进程表中的用户名
log.info("当前系统进程表中的用户名: " + _who.getUser());
}
}
}
private static void file() throws Exception {
Sigar sigar = new Sigar();
FileSystem fslist[] = sigar.getFileSystemList();
for (int i = 0; i < fslist.length; i++) {
log.info("分区的盘符名称" + i);
FileSystem fs = fslist[i];
// 分区的盘符名称
log.info("盘符名称: " + fs.getDevName());
// 分区的盘符名称
log.info("盘符路径: " + fs.getDirName());
log.info("盘符标志: " + fs.getFlags());//
// 文件系统类型，比如 FAT32、NTFS
log.info("盘符类型: " + fs.getSysTypeName());
// 文件系统类型名，比如本地硬盘、光驱、网络文件系统等
log.info("盘符类型名: " + fs.getTypeName());
// 文件系统类型
log.info("盘符文件系统类型: " + fs.getType());
FileSystemUsage usage = null;
usage = sigar.getFileSystemUsage(fs.getDirName());
switch (fs.getType()) {
case 0: // TYPE_UNKNOWN ：未知
break;
case 1: // TYPE_NONE
break;
case 2: // TYPE_LOCAL_DISK : 本地硬盘
// 文件系统总大小
log.info(fs.getDevName() + "总大小: " + usage.getTotal() + "KB");
// 文件系统剩余大小
log.info(fs.getDevName() + "剩余大小: " + usage.getFree() + "KB");
// 文件系统可用大小
log.info(fs.getDevName() + "可用大小: " + usage.getAvail() + "KB");
// 文件系统已经使用量
log.info(fs.getDevName() + "已经使用量: " + usage.getUsed() + "KB");
double usePercent = usage.getUsePercent() * 100D;
// 文件系统资源的利用率
log.info(fs.getDevName() + "资源的利用率: " + usePercent + "%");
break;
case 3:// TYPE_NETWORK ：网络
break;
case 4:// TYPE_RAM_DISK ：闪存
break;
case 5:// TYPE_CDROM ：光驱
break;
case 6:// TYPE_SWAP ：页面交换
break;
}
log.info(fs.getDevName() + "读出： " + usage.getDiskReads());
log.info(fs.getDevName() + "写入： " + usage.getDiskWrites());
}
return;
}
private static void net() throws Exception {
Sigar sigar = new Sigar();
String ifNames[] = sigar.getNetInterfaceList();
for (int i = 0; i < ifNames.length; i++) {
String name = ifNames[i];
NetInterfaceConfig ifconfig = sigar.getNetInterfaceConfig(name);
log.info("网络设备名: " + name);// 网络设备名
log.info("IP地址: " + ifconfig.getAddress());// IP地址
log.info("子网掩码: " + ifconfig.getNetmask());// 子网掩码
if ((ifconfig.getFlags() & 1L) <= 0L) {
log.info("!IFF_UP...skipping getNetInterfaceStat");
continue;
}
NetInterfaceStat ifstat = sigar.getNetInterfaceStat(name);
log.info(name + "接收的总包裹数:" + ifstat.getRxPackets());// 接收的总包裹数
log.info(name + "发送的总包裹数:" + ifstat.getTxPackets());// 发送的总包裹数
log.info(name + "接收到的总字节数:" + ifstat.getRxBytes());// 接收到的总字节数
log.info(name + "发送的总字节数:" + ifstat.getTxBytes());// 发送的总字节数
log.info(name + "接收到的错误包数:" + ifstat.getRxErrors());// 接收到的错误包数
log.info(name + "发送数据包时的错误数:" + ifstat.getTxErrors());// 发送数据包时的错误数
log.info(name + "接收时丢弃的包数:" + ifstat.getRxDropped());// 接收时丢弃的包数
log.info(name + "发送时丢弃的包数:" + ifstat.getTxDropped());// 发送时丢弃的包数
}
}
private static void ethernet() throws SigarException {
Sigar sigar = null;
sigar = new Sigar();
String[] ifaces = sigar.getNetInterfaceList();
for (int i = 0; i < ifaces.length; i++) {
NetInterfaceConfig cfg = sigar.getNetInterfaceConfig(ifaces[i]);
if (NetFlags.LOOPBACK_ADDRESS.equals(cfg.getAddress()) || (cfg.getFlags() & NetFlags.IFF_LOOPBACK) != 0
|| NetFlags.NULL_HWADDR.equals(cfg.getHwaddr())) {
continue;
}
log.info(cfg.getName() + "IP地址:" + cfg.getAddress());// IP地址
log.info(cfg.getName() + "网关广播地址:" + cfg.getBroadcast());// 网关广播地址
log.info(cfg.getName() + "网卡MAC地址:" + cfg.getHwaddr());// 网卡MAC地址
log.info(cfg.getName() + "子网掩码:" + cfg.getNetmask());// 子网掩码
log.info(cfg.getName() + "网卡描述信息:" + cfg.getDescription());// 网卡描述信息
log.info(cfg.getName() + "网卡类型" + cfg.getType());//
}
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java
View file @ a7d955c5
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.model.app.zxUserVo;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.ShopZxUserDto;
import cn.wisenergy.model.vo.CultivatingPrizeVo;
import cn.wisenergy.model.vo.ShopZxUserVo;
import cn.wisenergy.service.app.UploadService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
......@@ -119,7 +122,7 @@ public class UploadController {
*/
@ApiOperation(value = "用户发布资讯信息点赞接口", notes = "点赞接口", httpMethod = "POST", produces = "application/json; charset=UTF-8")
@ApiImplicitParams({
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true,dataType = "integer"),
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true, dataType = "int"),
@ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = true, dataType = "String")})
@RequestMapping(method = RequestMethod.POST, value = "/thumbUp")
public Map like(int zxid,String inviteCode){
......@@ -130,7 +133,7 @@ public class UploadController {
* TODO 审核接口
*/
@ApiOperation(value = "用户发布资讯信息审核接口", notes = "审核接口",produces = "application/json; charset=UTF-8")
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true,dataType = "integer")
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true, dataType = "int")
@RequestMapping(method = RequestMethod.POST, value = "/toExamine")
public Map ToExamine(int zxid){
......@@ -140,12 +143,10 @@ public class UploadController {
/**
* TODO 查询资讯单表全部数据的API
*/
@ApiOperation(value = "查询资讯单表全部数据的API", notes = "单表全部数据的API")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "int"),
@ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "int")})
@RequestMapping(method = RequestMethod.GET, value = "/shopzxAll")
public List<zxUserVo> shopzxAll(Integer pageNum, Integer pageSize){
return uploadService.selectAll(pageNum,pageSize);
@ApiOperation(value = "后台-资讯列表", notes = "资讯列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "CultivatingPrizeDto")
@GetMapping("/queryShopZxList")
public R<PageInfo<ShopZxUserVo>> queryShopZxList(ShopZxUserDto shopZxUserDto){
return uploadService.getShopZxUserList(shopZxUserDto);
}
}
\ No newline at end of file
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
View file @ a7d955c5
......@@ -3,16 +3,10 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.constant.RedisConsts;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.common.utils.RedisUtils;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.AerialDeliveryVo;
import cn.wisenergy.model.vo.UserAndRecommendVo;
import cn.wisenergy.service.app.RecommendUserService;
import cn.wisenergy.service.app.TeamUserInfoService;
import cn.wisenergy.service.app.UserForestStatusService;
import cn.wisenergy.service.app.UserService;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.dto.*;
import cn.wisenergy.model.vo.*;
import cn.wisenergy.service.app.*;
import cn.wisenergy.web.common.BaseController;
import cn.wisenergy.web.config.JwtConfig;
import cn.wisenergy.web.shiro.JwtUtil;
......@@ -41,6 +35,13 @@ public class UserController extends BaseController {
@Autowired
private UserService userService;
@Autowired
private CultivatingPrizeService cultivatingPrizeService;
@Autowired
private CultivatingPrizeInfoService cultivatingPrizeInfoService;
@Autowired
private UserForestStatusService userForestStatusService;
......@@ -172,11 +173,42 @@ public class UserController extends BaseController {
return userService.fillInInviteCode(userId, inviteCode);
}
@ApiOperation(value = "用户列表", notes = "用户列表", httpMethod = "GET")
@ApiOperation(value = "后台-用户列表", notes = "用户列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "TeamQueryDto")
@GetMapping("/queryUserList")
public R<PageInfo<User>> queryList(TeamQueryDto queryDto) {
log.info("shop-mall[]UserController[]queryList[]input.param.query:" + queryDto);
public R<PageInfo<User>> queryUserList(TeamQueryDto queryDto) {
log.info("shop-mall[]UserController[]queryUserList[]input.param.query:" + queryDto);
return userService.getUserList(queryDto);
}
@ApiOperation(value = "后台-直推用户列表", notes = "直推用户列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "RecommendUserDto")
@GetMapping("/queryRecommendUserList")
public R<PageInfo<RecommendUserVo>> queryRecommendUserList(RecommendUserDto recommendUserDto) {
log.info("shop-mall[]UserController[]queryRecommendUserList[]input.param.query:" + recommendUserDto);
return recommendUserService.getRecommendUserList(recommendUserDto);
}
@ApiOperation(value = "后台-团队用户列表", notes = "团队用户列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "TeamUserInfoDto")
@GetMapping("/queryTeamUserInfoList")
public R<PageInfo<TeamUserInfoVo>> queryTeamUserInfoList(TeamUserInfoDto teamUserInfoDto) {
log.info("shop-mall[]UserController[]queryTeamUserInfoList[]input.param.query:" + teamUserInfoDto);
return teamUserInfoService.getTeamUserInfoList(teamUserInfoDto);
}
@ApiOperation(value = "后台-培育奖记录表", notes = "培育奖记录表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "CultivatingPrizeInfoDto")
@GetMapping("/queryCultivatingInfo")
public R<PageInfo<CultivatingPrizeInfoVo>> queryCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto) {
log.info("shop-mall[]UserController[]queryCultivatingPrizeInfoList[]input.param.query:" + cultivatingPrizeInfoDto);
return cultivatingPrizeInfoService.getCultivatingPrizeInfoList(cultivatingPrizeInfoDto);
}
@ApiOperation(value = "后台-培育奖表列表", notes = "培育奖表列表", httpMethod = "GET")
@GetMapping("/queryCultivatingPrizeInfoList")
public R<List<CultivatingPrize>> queryCultivatingPrizeList() {
log.info("shop-mall[]UserController[]queryCultivatingPrizeList[]input.param.query:");
return cultivatingPrizeService.getCultivatingPrizeList();
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/common/BaseController.java
View file @ a7d955c5
package cn.wisenergy.web.common;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.UserService;
import cn.wisenergy.web.shiro.JwtUtil;
......
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