From 01c793483a5983f89fc54e85826318e783610c39 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 14:56:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]=E8=BF=94=E5=9B=9E=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/HomeController.java | 2 +- .../controller/MallUserInfoController.java | 9 ++++-- .../WxCUserBasicInfoController.java | 5 ++- .../com/simple/domain/po/MallUserInfo.java | 32 ++++++++++++++++--- .../resources/mapper/MallUserInfoMapper.xml | 8 ++++- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index 121052a49..5639ede1e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -72,7 +72,7 @@ public class HomeController { if(page.getSize()>0) { Long roleId = page.getList().get(0).getRoleId(); MallRolePermission p = new MallRolePermission(); - p.setRoleId(p.getRoleId()); + p.setRoleId(roleId); p.setTenantId(info.getTenantId()); PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); String menus = ""; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index c8d354e52..7ecc627d0 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -14,8 +14,10 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; +import com.simple.domain.po.MallRole; import com.simple.domain.po.MallUserInfo; import com.simple.domain.po.MallUserRole; +import com.simple.service.MallRoleService; import com.simple.service.MallUserInfoService; import com.simple.service.MallUserRoleService; import com.simple.shiro.PasswordHelper; @@ -38,6 +40,9 @@ public class MallUserInfoController { @Autowired MallUserRoleService userRoleService; + + @Autowired + MallRoleService mallRoleService; @ApiOperation(value = "用户分页接口", response = String.class) @GetMapping("lists") @@ -48,11 +53,11 @@ public class MallUserInfoController { r.setUid(u.getId()); PageInfo ur = userRoleService.listAsPage(r, 1, 1); if(ur.getSize()>0) { - u.setRoleId(ur.getList().get(0).getRoleId()); + MallRole role = mallRoleService.getById(ur.getList().get(0).getRoleId()); + u.setRoleName(role.getName()); } u.setPassword(null);//不返回密码 } - return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 645ad14e3..eed3b4a2e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -226,8 +226,10 @@ public class WxCUserBasicInfoController extends BaseController @ApiOperation("查询会员年龄结构") @GetMapping("/findUserAgeStructure") public ResultData findUserAgeStructure() { - Calendar c = Calendar.getInstance(); + long all =wxCUserBasicInfoService.findCountByAge(new WxCuerBasicInfoDto()); + List vos = new ArrayList<>(); + Calendar c = Calendar.getInstance(); for(EnumAgeInfo a:EnumAgeInfo.values()) { c.clear(); c.setTime(new Date()); @@ -235,6 +237,7 @@ public class WxCUserBasicInfoController extends BaseController c.set(Calendar.MINUTE,0); c.set(Calendar.SECOND,0); long count = getCountByAge(a, c); + vos.add(getVo(count, all, a.getDesc())); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java index 9cf5b37cd..dd3d26f4d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -65,8 +65,14 @@ public class MallUserInfo implements Serializable { /*0 不是超管 1是超管**/ @io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin") private Integer isAdmin; + @io.swagger.annotations.ApiModelProperty(value="昵称",name="nickName") + private String nickName; + @Transient private Long roleId; + + @Transient + private String roleName; //该用户所有的角色 @Transient private List role; @@ -85,12 +91,12 @@ public class MallUserInfo implements Serializable { this.menus = menus; } - public Long getRoleId() { - return roleId; + public String getRoleName() { + return roleName; } - public void setRoleId(Long roleId) { - this.roleId = roleId; + public void setRoleName(String roleName) { + this.roleName = roleName; } public String getTenantId() { @@ -157,6 +163,24 @@ public class MallUserInfo implements Serializable { this.permission = permission; } + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + + public static enum Field diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 6589b4083..8b52d214c 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -14,7 +14,7 @@ - `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin` + `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name` @@ -33,6 +33,11 @@ and `username` like concat('%', #{username},'%') + + + + and `nick_name` like concat('%', #{nickName},'%') + @@ -64,6 +69,7 @@ and `is_admin` = #{isAdmin} + and id in