From 923510deed8c991823db60dbd430bf18d78b98cb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 07 Apr 2021 17:27:24 +0800
Subject: [PATCH] 登陆用户信息返回修改，用户组查询修改
---
screen-api/src/main/resources/mapper/UserMapper.xml | 13
screen-api/src/main/java/com/moral/api/controller/MenuController.java | 8
screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java | 3
screen-api/src/main/resources/mapper/OrganizationMapper.xml | 11
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 20 +-
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 3
screen-api/src/main/java/com/moral/api/service/SysAreaService.java | 16 ++
screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java | 6
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 171 ++++++++++++---------
screen-api/src/main/java/com/moral/api/service/UserGroupService.java | 3
screen-api/src/main/java/com/moral/api/mapper/SysAreaMapper.java | 16 ++
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 32 ++-
screen-api/src/main/java/com/moral/api/service/OrganizationService.java | 2
screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java | 20 ++
screen-api/src/main/resources/application-dev.yml | 2
screen-api/src/main/java/com/moral/api/service/UserService.java | 3
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 2
screen-api/src/main/java/com/moral/api/entity/Organization.java | 26 ++-
screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java | 6
screen-api/src/main/java/com/moral/api/mapper/UserMapper.java | 2
screen-api/src/main/resources/mapper/SysAreaMapper.xml | 12 +
screen-api/src/main/java/com/moral/api/entity/User.java | 9 +
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java | 13 +
screen-api/src/main/java/com/moral/api/entity/SysArea.java | 43 +++++
24 files changed, 309 insertions(+), 133 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/GroupController.java b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
index 9e9faab..fa8b0df 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GroupController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -42,8 +43,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "addGroup", method = RequestMethod.POST)
- private ResultMessage addGroup(@RequestBody Group group, HttpServletRequest request) {
+ @RequestMapping(value = "insert", method = RequestMethod.POST)
+ private ResultMessage insert(@RequestBody Group group, HttpServletRequest request) {
if (group.getGroupName().isEmpty()) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -64,8 +65,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "deleteGroup", method = RequestMethod.POST)
- public ResultMessage deleteGroup(@RequestBody Group group, HttpServletRequest request) {
+ @RequestMapping(value = "delete", method = RequestMethod.POST)
+ public ResultMessage delete(@RequestBody Group group, HttpServletRequest request) {
if (group.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -88,8 +89,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "updateGroup", method = RequestMethod.POST)
- public ResultMessage updateUser(@RequestBody Group group, HttpServletRequest request) {
+ @RequestMapping(value = "update", method = RequestMethod.POST)
+ public ResultMessage update(@RequestBody Group group, HttpServletRequest request) {
String token = request.getHeader("token");
Map<String, Object> result = groupService.updateGroup(group, token);
if (!result.isEmpty()) {
@@ -107,11 +108,12 @@
@ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", defaultValue = "0", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "groupName", value = "������������������", required = false, paramType = "query", dataType = "String")
})
- @RequestMapping(value = "selectGroups", method = RequestMethod.POST)
- public ResultMessage selectGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ @RequestMapping(value = "select", method = RequestMethod.POST)
+ public ResultMessage select(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
parameters.put("token", request.getHeader("token"));
Page<Group> userPage = groupService.selectGroups(parameters);
PageResult<Group> pageResult = new PageResult<>(
@@ -120,12 +122,22 @@
return ResultMessage.ok(pageResult);
}
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "get-group-ids", method = RequestMethod.GET)
+ public ResultMessage getGroupIds(Integer userId){
+ List<Integer> groupIds = userGroupService.getGroupIds(userId);
+ return ResultMessage.ok(groupIds);
+ }
+
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "allotGroups", method = RequestMethod.POST)
- public ResultMessage allotGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ @RequestMapping(value = "allot", method = RequestMethod.POST)
+ public ResultMessage allot(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
if (!parameters.containsKey("userId")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
diff --git a/screen-api/src/main/java/com/moral/api/controller/LoginController.java b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
index 7fe1193..444fa13 100644
--- a/screen-api/src/main/java/com/moral/api/controller/LoginController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
@@ -64,7 +64,8 @@
String ip = WebUtils.getIpAddr(request);
userLog.setIp(ip);
userLog.setOperateId((Integer) userInfo.get("userId"));
- userLog.setOrganizationId((Integer) userInfo.get("organizationId"));
+ Map<String, Object> organization = (Map<String, Object>) userInfo.get("organization");
+ userLog.setOrganizationId((Integer) organization.get("id"));
userLog.setContent(userInfo.get("account") + "���������");
userLogService.save(userLog);
return ResultMessage.ok(data);
diff --git a/screen-api/src/main/java/com/moral/api/controller/MenuController.java b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
index 1ee1f1a..258a122 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MenuController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
@@ -38,8 +38,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "allotMenus", method = RequestMethod.POST)
- public ResultMessage allotMenus(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ @RequestMapping(value = "allot", method = RequestMethod.POST)
+ public ResultMessage allot(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
if (!parameters.containsKey("groupId")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -53,8 +53,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
})
- @RequestMapping(value = "selectGroups", method = RequestMethod.POST)
- public ResultMessage selectGroups(HttpServletRequest request) {
+ @RequestMapping(value = "select", method = RequestMethod.POST)
+ public ResultMessage select(HttpServletRequest request) {
String token = request.getHeader("token");
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
Map<String, Object> result = menuService.selectMenusByOrgId((Integer) currentUserInfo.get("organizationId"));
diff --git a/screen-api/src/main/java/com/moral/api/entity/Organization.java b/screen-api/src/main/java/com/moral/api/entity/Organization.java
index 6121b58..d204a71 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Organization.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Organization.java
@@ -15,7 +15,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -50,29 +50,39 @@
private Integer provinceCode;
/**
+ * ������������
+ */
+ private String provinceName;
+
+ /**
* ������������
*/
private Integer cityCode;
/**
- * ���������
+ * ������������
+ */
+ private String cityName;
+
+ /**
+ * ���������
*/
private Integer areaCode;
/**
- * ���������
+ * ���������
*/
- private Long townCode;
+ private String areaName;
/**
- * ������������
+ * ���������������������
*/
- private Long villageCode;
+ private Integer locationLevelCode;
/**
- * ������������������ provincd_code city_code ......
+ * ������������������������
*/
- private String locationLevel;
+ private String locationLevelName;
/**
* ������
diff --git a/screen-api/src/main/java/com/moral/api/entity/SysArea.java b/screen-api/src/main/java/com/moral/api/entity/SysArea.java
new file mode 100644
index 0000000..09fa8be
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/SysArea.java
@@ -0,0 +1,43 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-04-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SysArea extends Model<SysArea> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������������
+ */
+ private Integer areaCode;
+
+ /**
+ * ������������
+ */
+ private String areaName;
+
+ /**
+ * ������������
+ */
+ private Integer parentCode;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.areaCode;
+ }
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java
index 38f7b34..ebc1066 100644
--- a/screen-api/src/main/java/com/moral/api/entity/User.java
+++ b/screen-api/src/main/java/com/moral/api/entity/User.java
@@ -4,6 +4,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
@@ -49,6 +53,7 @@
/**
* ������
*/
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String password;
/**
@@ -79,16 +84,19 @@
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expireTime;
/**
@@ -96,6 +104,7 @@
*/
private String isDelete;
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java b/screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java
index bf0bfe6..96f6f50 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java
@@ -1,7 +1,5 @@
package com.moral.api.mapper;
-import java.util.Map;
-
import com.moral.api.entity.Organization;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -11,10 +9,8 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
*/
public interface OrganizationMapper extends BaseMapper<Organization> {
-
- Map<String, Object> selectOrganizationById(int id);
}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/SysAreaMapper.java b/screen-api/src/main/java/com/moral/api/mapper/SysAreaMapper.java
new file mode 100644
index 0000000..81aaca8
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/SysAreaMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.SysArea;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ��������������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-04-07
+ */
+public interface SysAreaMapper extends BaseMapper<SysArea> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java b/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
index e906e2c..3798fc1 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
@@ -4,7 +4,7 @@
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.moral.api.pojo.UserBO;
+import com.moral.api.pojo.bo.UserBO;
/**
* <p>
diff --git a/screen-api/src/main/java/com/moral/api/pojo/UserBO.java b/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
similarity index 87%
rename from screen-api/src/main/java/com/moral/api/pojo/UserBO.java
rename to screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
index f642a34..e78948a 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/UserBO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo;
+package com.moral.api.pojo.bo;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,10 +16,10 @@
@EqualsAndHashCode(callSuper = false)
public class UserBO extends User {
- @Transient
+
private Organization organization;
- @Transient
+
private List<Group> groups;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
index 07b4434..ce292e1 100644
--- a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
@@ -9,7 +9,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
*/
public interface OrganizationService extends IService<Organization> {
diff --git a/screen-api/src/main/java/com/moral/api/service/SysAreaService.java b/screen-api/src/main/java/com/moral/api/service/SysAreaService.java
new file mode 100644
index 0000000..0cb05dd
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/SysAreaService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.SysArea;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ��������������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-04-07
+ */
+public interface SysAreaService extends IService<SysArea> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/UserGroupService.java b/screen-api/src/main/java/com/moral/api/service/UserGroupService.java
index f031485..e17e7bb 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserGroupService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserGroupService.java
@@ -1,5 +1,6 @@
package com.moral.api.service;
+import java.util.List;
import java.util.Map;
import com.moral.api.entity.UserGroup;
@@ -16,4 +17,6 @@
public interface UserGroupService extends IService<UserGroup> {
void allotGroups(Map<String, Object> parameters, String token);
+
+ List<Integer> getGroupIds(Integer userId);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 1b2961c..d57b212 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -7,7 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.UserBO;
+
+import com.moral.api.pojo.bo.UserBO;
/**
* <p>
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index ce249a6..49a9833 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -1,28 +1,24 @@
package com.moral.api.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Group;
import com.moral.api.entity.GroupMenu;
-import com.moral.api.entity.User;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.GroupMenuMapper;
import com.moral.api.mapper.UserGroupMapper;
-import com.moral.api.mapper.UserMapper;
import com.moral.api.service.GroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
-import com.moral.util.RegexUtils;
+import com.moral.util.ConvertUtils;
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +106,7 @@
queryWrapper.eq("organization_id", organizationId)
.eq("is_delete", Constants.NOT_DELETE);
Object order = parameters.get("order");
+ Object orderType = parameters.get("orderType");
Object groupName = parameters.get("groupName");
//������������������
if (groupName != null) {
@@ -128,10 +125,15 @@
int size = Integer.parseInt(parameters.get("size").toString());
Page<Group> pageData = new Page<>(page, size);
//������������,������id������
- if (order == null) {
- queryWrapper.orderByAsc("id");
+ //������������,������create_time������
+ if (order != null && orderType != null) {
+ if (Constants.ORDER_ASC.equals(orderType)) {
+ queryWrapper.orderByAsc(ConvertUtils.toLine(order.toString()));
+ } else {
+ queryWrapper.orderByDesc(ConvertUtils.toLine(order.toString()));
+ }
} else {
- queryWrapper.orderByAsc(order.toString(), "id");
+ queryWrapper.orderByDesc("create_time");
}
groupMapper.selectPage(pageData, queryWrapper);
return pageData;
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 827683d..d612dff 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -12,7 +12,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
*/
@Service
public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService {
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
new file mode 100644
index 0000000..2c755cb
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.SysArea;
+import com.moral.api.mapper.SysAreaMapper;
+import com.moral.api.service.SysAreaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ��������������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-04-07
+ */
+@Service
+public class SysAreaServiceImpl extends ServiceImpl<SysAreaMapper, SysArea> implements SysAreaService {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
index 230e3f4..1bf3af4 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.UserGroupMapper;
@@ -47,4 +48,16 @@
}
}
}
+
+ @Override
+ public List<Integer> getGroupIds(Integer userId) {
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_id", userId).eq("is_delete", Constants.NOT_DELETE);
+ List<UserGroup> userGroups = userGroupMapper.selectList(queryWrapper);
+ List<Integer> groupIds = new ArrayList<>();
+ for (UserGroup userGroup : userGroups) {
+ groupIds.add(userGroup.getGroupId());
+ }
+ return groupIds;
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 755f741..70b8a57 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -9,32 +9,34 @@
import java.util.Map;
import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.moral.api.entity.Group;
-import com.moral.api.entity.Menu;
-import com.moral.api.entity.Organization;
-import com.moral.api.entity.User;
-
-import com.moral.api.entity.UserGroup;
-import com.moral.api.mapper.MenuMapper;
-import com.moral.api.mapper.UserGroupMapper;
-import com.moral.api.mapper.UserMapper;
-import com.moral.api.pojo.UserBO;
-import com.moral.api.service.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.constant.Constants;
-import com.moral.constant.ResponseCodeEnum;
-import com.moral.util.AESUtils;
-import com.moral.util.MD5Utils;
-import com.moral.util.RegexUtils;
-import com.moral.util.TokenUtils;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.entity.Group;
+import com.moral.api.entity.Menu;
+import com.moral.api.entity.Organization;
+import com.moral.api.entity.User;
+import com.moral.api.entity.UserGroup;
+
+import com.moral.api.mapper.MenuMapper;
+import com.moral.api.mapper.UserGroupMapper;
+import com.moral.api.mapper.UserMapper;
+import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.service.UserService;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.AESUtils;
+import com.moral.util.ConvertUtils;
+import com.moral.util.DateUtils;
+import com.moral.util.MD5Utils;
+import com.moral.util.RegexUtils;
+import com.moral.util.TokenUtils;
/**
* <p>
@@ -97,25 +99,39 @@
}
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
- List<Map<String, Object>> groups = new ArrayList<>();
- for (Group group : userBo.getGroups()) {
- HashMap<String, Object> groupMap = new HashMap<>();
- groupMap.put("groupId", group.getId());
- groupMap.put("groupName", group.getGroupName());
- groups.add(groupMap);
- }
- Organization organization = userBo.getOrganization();
+
+ //������in���
userInfo.put("userId", userBo.getId());
userInfo.put("account", userBo.getAccount());
userInfo.put("userName", userBo.getUserName());
- userInfo.put("expireTime", userBo.getExpireTime());
+ userInfo.put("email", userBo.getEmail());
+ userInfo.put("mobile", userBo.getMobile());
+ userInfo.put("wechat", userBo.getWechat());
+ userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
- userInfo.put("organizationId", userBo.getOrganizationId());
- userInfo.put("organizationName", organization.getName());
- userInfo.put("locationLevel", organization.getLocationLevel());
+
+ //������������������
+ Organization organization = userBo.getOrganization();
+ Map<String, Object> orgInfo = new LinkedHashMap<>();
+ orgInfo.put("id", userBo.getOrganizationId());
+ orgInfo.put("name", organization.getName());
+ orgInfo.put("locationLevelCode", organization.getLocationLevelCode());
+ orgInfo.put("expireTime", DateUtils.dateToDateString(organization.getExpireTime()));
+ userInfo.put("organization", orgInfo);
+
+ //���������������
+ List<Map<String, Object>> groups = new ArrayList<>();
+ for (Group group : userBo.getGroups()) {
+ HashMap<String, Object> groupMap = new LinkedHashMap<>();
+ groupMap.put("id", group.getId());
+ groupMap.put("groupName", group.getGroupName());
+ groups.add(groupMap);
+ }
userInfo.put("groups", groups);
+
Map<String, Object> map = new HashMap<>();
map.put("userId", userBo.getId());
+ //������������������
userInfo.putAll(getMenus(map));
try {
//������token������������redis
@@ -156,7 +172,7 @@
menuMap.put("name", o.getName());
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
- menuMap.put("menus", getMenusByRecursion(o, allMenus));
+ menuMap.put("child", getMenusByRecursion(o, allMenus));
newList.add(menuMap);
});
resultMap.put("menus", newList);
@@ -181,7 +197,7 @@
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
//���������������
- menuMap.put("menus", getMenusByRecursion(o, menus));
+ menuMap.put("child", getMenusByRecursion(o, menus));
list.add(menuMap);
});
}
@@ -217,7 +233,7 @@
//������������������
String password = user.getPassword();
//������������
- //password = AESUtils.decrypt(password, AESKey);
+ password = AESUtils.decrypt(password, AESKey);
if (!RegexUtils.checkPassword(password)) {
result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
@@ -231,14 +247,20 @@
}
//������������
user.setPassword(MD5Utils.saltMD5(password));
- user.setOrganizationId((int) currentUserInfo.get("organizationId"));
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+ user.setOrganizationId(orgId);
user.setIsAdmin(false);
//���������������������������
Date userExpireTime = user.getExpireTime();
- //���������������������������
- Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
- if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
- user.setExpireTime(currentUserExpireTime);
+ //���������������������������
+ Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (userExpireTime != null) {
+ if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
+ user.setExpireTime(orgExpireTime);
+ } else {
+ user.setExpireTime(userExpireTime);
+ }
}
userMapper.insert(user);
return result;
@@ -267,33 +289,20 @@
public Map<String, Object> updateUser(User user, String token) {
Map<String, Object> result = new HashMap<>();
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("id", user.getId())
- .eq("account", user.getAccount())
- .eq("is_delete", Constants.NOT_DELETE);
- //���������������������������
- if (userMapper.selectOne(queryWrapper) != null) {
- result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
- result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
- return result;
- }
- //������������������
- if (!RegexUtils.checkAccount(user.getAccount())) {
- result.put("code", ResponseCodeEnum.ACCOUNT_INVALID.getCode());
- result.put("msg", ResponseCodeEnum.ACCOUNT_INVALID.getMsg());
- return result;
- }
- //������������������
+ String account = userMapper.selectById(user.getId()).getAccount();
+ //account������������
+ user.setAccount(account);
+
+ //������������
if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) {
result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
return result;
}
- //������������������
+ //������������
String password = user.getPassword();
-
//������������
- //password = AESUtils.decrypt(password, AESKey);
+ password = AESUtils.decrypt(password, AESKey);
if (!RegexUtils.checkPassword(password)) {
result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
@@ -308,20 +317,26 @@
}
//������MD5������
user.setPassword(MD5Utils.saltMD5(password));
- user.setOrganizationId((int) currentUserInfo.get("organizationId"));
+ //������������
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ user.setOrganizationId((int) orgInfo.get("id"));
user.setIsAdmin(false);
//������������������������������
Date userExpireTime = user.getExpireTime();
- //���������������������������
- Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
- if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
- user.setExpireTime(currentUserExpireTime);
+ //���������������������������
+ Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (userExpireTime != null) {
+ if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
+ user.setExpireTime(orgExpireTime);
+ } else {
+ user.setExpireTime(userExpireTime);
+ }
}
//������redis
String userId = user.getId().toString();
if (TokenUtils.hHasKey(userId)) {
- String deleterToken = TokenUtils.hget(userId).toString();
- TokenUtils.destoryToken(userId, deleterToken);
+ String deleteToken = TokenUtils.hget(userId).toString();
+ TokenUtils.destoryToken(userId, deleteToken);
}
userMapper.updateById(user);
return result;
@@ -330,11 +345,12 @@
@Override
public Page<User> selectUsers(Map<String, Object> parameters) {
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
- Object organizationId = currentUserInfo.get("organizationId");
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("organization_id", organizationId)
+ queryWrapper.eq("organization_id", orgInfo.get("id"))
.eq("is_delete", Constants.NOT_DELETE);
Object order = parameters.get("order");
+ Object orderType = parameters.get("orderType");
Object account = parameters.get("account");
Object userName = parameters.get("userName");
Object mobile = parameters.get("mobile");
@@ -360,13 +376,18 @@
Integer page = (Integer) parameters.get("page");
Integer size = (Integer) parameters.get("size");
Page<User> pageData = new Page<>(page, size);
- //������������,������id������
- if (order == null) {
- queryWrapper.orderByAsc("id");
+ //������������,������create_time������
+ if (order != null && orderType != null) {
+ if (Constants.ORDER_ASC.equals(orderType)) {
+ queryWrapper.orderByAsc(ConvertUtils.toLine(order.toString()));
+ } else {
+ queryWrapper.orderByDesc(ConvertUtils.toLine(order.toString()));
+ }
} else {
- queryWrapper.orderByAsc(order.toString(), "id");
+ queryWrapper.orderByDesc("create_time");
}
userMapper.selectPage(pageData, queryWrapper);
+
return pageData;
}
diff --git a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
index c217379..88afde3 100644
--- a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
@@ -31,7 +31,8 @@
UserLog userLog = new UserLog();
userLog.setIp(WebUtils.getIpAddr(request));
userLog.setOperateId((Integer) currentUserInfo.get("userId"));
- userLog.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ userLog.setOrganizationId((Integer) orgInfo.get("id"));
userLog.setContent(content);
userLogService.save(userLog);
}
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index b0a5c75..968569c 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -57,7 +57,7 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: chenkaiyu111
test-on-borrow: false
diff --git a/screen-api/src/main/resources/mapper/OrganizationMapper.xml b/screen-api/src/main/resources/mapper/OrganizationMapper.xml
index 9f4ec9b..e6490b9 100644
--- a/screen-api/src/main/resources/mapper/OrganizationMapper.xml
+++ b/screen-api/src/main/resources/mapper/OrganizationMapper.xml
@@ -9,11 +9,13 @@
<result column="admin_user_id" property="adminUserId"/>
<result column="name" property="name"/>
<result column="province_code" property="provinceCode"/>
+ <result column="province_name" property="provinceName"/>
<result column="city_code" property="cityCode"/>
+ <result column="city_name" property="cityName"/>
<result column="area_code" property="areaCode"/>
- <result column="town_code" property="townCode"/>
- <result column="village_code" property="villageCode"/>
- <result column="location_level" property="locationLevel"/>
+ <result column="area_name" property="areaName"/>
+ <result column="location_level_code" property="locationLevelCode"/>
+ <result column="location_level_name" property="locationLevelName"/>
<result column="address" property="address"/>
<result column="phone" property="phone"/>
<result column="email" property="email"/>
@@ -24,7 +26,4 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <select id="selectOrganizationById" resultType="java.util.Map">
- SELECT * FROM organization WHERE id= #{orgId}
- </select>
</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/SysAreaMapper.xml b/screen-api/src/main/resources/mapper/SysAreaMapper.xml
new file mode 100644
index 0000000..97e12e8
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/SysAreaMapper.xml
@@ -0,0 +1,12 @@
+<?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="com.moral.api.mapper.SysAreaMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.SysArea">
+ <id column="area_code" property="areaCode" />
+ <result column="area_name" property="areaName" />
+ <result column="parent_code" property="parentCode" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index 532a523..bf95aac 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -19,25 +19,26 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBO" extends="BaseResultMap">
+ <resultMap id="userInfoMap" type="com.moral.api.pojo.bo.UserBO" extends="BaseResultMap">
<!--������������-->
<association property="organization" javaType="com.moral.api.entity.Organization">
<result column="id" property="id" jdbcType="INTEGER"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
- <result column="location_level" property="locationLevel"/>
+ <result column="location_level_code" property="locationLevelCode"/>
+ <result column="org_expire_ime" property="expireTime"/>
</association>
<!--���������-->
<collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
- <id column="groupId" property="id" jdbcType="INTEGER"/>
+ <id column="group_id" property="id" jdbcType="INTEGER"/>
<result column="group_name" property="groupName" jdbcType="VARCHAR"/>
</collection>
</resultMap>
<!--������������������������������������������-->
<select id="selectUserInfo" resultMap="userInfoMap">
- SELECT u.id, u.account, u.password, u.user_name, u.organization_id, u.expire_time, u.is_delete,u.is_Admin,
- o.name, o.location_level,
- a.id groupId , a.group_name
+ SELECT u.id, u.account, u.password, u.user_name, u.email, u.mobile, u.wechat ,u.organization_id, u.expire_time, u.is_delete,u.is_Admin,
+ o.name, o.location_level_code, o.expire_time org_expire_ime,
+ a.id group_id , a.group_name
FROM `user` u
LEFT JOIN
(SELECT ug.user_id,g.id,g.group_name FROM `user_group` ug ,`group` g WHERE ug.group_id=g.id AND g.is_delete = 0
--
Gitblit v1.8.0