Merge remote-tracking branch 'origin/dev/one' into dev/one

docs/002.数据库设计/sys-user.sql

@@ -74,6 +74,34 @@ CREATE TABLE `sys_permission` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT '系统资源表';
 
+
+DROP TABLE IF EXISTS `sys_organization`;
+CREATE TABLE `sys_organization` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '机构名称',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT '机构表';
+
+
+DROP TABLE IF EXISTS `sys_user_organization`;
+CREATE TABLE `sys_user_organization` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `user_id`  bigint(20) NOT NULL DEFAULT 0 COMMENT '用户主键',
+	`organization_id`  bigint(20) NOT NULL DEFAULT 0 COMMENT '机构主键',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT '用户-机构表映射表';
+
+
 -- ----------------------------
 -- Table structure for sys_role_permission
 -- ----------------------------

user-service/src/main/java/com/diagbot/dto/LoginDTO.java

@@ -1,29 +1,19 @@
 package com.diagbot.dto;
 
+import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @Description: 登录输出类
  * @author: gaodm
  * @time: 2018/8/2 14:22
  */
+@Getter
+@Setter
 public class LoginDTO {
     private User user;
     private String token;
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
+    private Organization organization;
 }

user-service/src/main/java/com/diagbot/entity/Organization.java

@@ -0,0 +1,125 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 机构信息
+ * @Author: ztg
+ * @Date: 2018/9/13 16:52
+ */
+@TableName("sys_organization")
+public class Organization implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 机构名称
+     */
+    private String name;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Organization{" +
+                "id=" + id +
+                ", isDeleted='" + isDeleted + '\'' +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator='" + creator + '\'' +
+                ", modifier='" + modifier + '\'' +
+                ", name='" + name + '\'' +
+                '}';
+    }
+}

user-service/src/main/java/com/diagbot/entity/UserOrganization.java

@@ -0,0 +1,139 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 机构信息
+ * @Author: ztg
+ * @Date: 2018/9/13 16:52
+ */
+@TableName("sys_user_organization")
+public class UserOrganization implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户主键
+     */
+    private Long userId;
+
+    /**
+     * 机构主键
+     */
+    private Long organizationId;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(Long organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    @Override
+    public String toString() {
+        return "UserOrganization{" +
+                "id=" + id +
+                ", isDeleted='" + isDeleted + '\'' +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator='" + creator + '\'' +
+                ", modifier='" + modifier + '\'' +
+                ", userId=" + userId +
+                ", organizationId=" + organizationId +
+                '}';
+    }
+}

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -4,12 +4,17 @@ import com.diagbot.client.AuthServiceClient;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.JWT;
+import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserOrganization;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
+import com.diagbot.mapper.OrganizationMapper;
+import com.diagbot.mapper.UserOrganizationMapper;
 import com.diagbot.service.impl.UserServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ImgVerVerVO;
@@ -24,6 +29,9 @@ import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 用户业务层
@@ -39,6 +47,10 @@ public class UserFacade extends UserServiceImpl {
     AuthServiceClient authServiceClient;
     @Autowired
     VerFacade verFacade;
+    @Autowired
+    OrganizationMapper organizationMapper;
+    @Autowired
+    UserOrganizationMapper userOrganizationMapper;
 
     public User createUser(UserSaveVO userSaveVO){
         User user = new User();
@@ -56,7 +68,25 @@ public class UserFacade extends UserServiceImpl {
         String entryPassword= passwordEncoder.encode(user.getPassword());
         user.setPassword(entryPassword);
         this.save(user);
-        //TODO 添加机构信息
+        Map<String, Object> paramMap = new HashMap<>();
+        String name = userSaveVO.getOrganization();
+        paramMap.put("name", name);
+        Long orgId = 0L;
+        List<Organization> list = organizationMapper.selectByMap(paramMap);
+        if(ListUtil.isEmpty(list)) {
+            Organization org = new Organization();
+            org.setName(name);
+            org.setGmtCreate(new Date());
+            organizationMapper.insert(org);
+            orgId = org.getId();
+        } else {
+            orgId = list.get(0).getId();
+        }
+        UserOrganization userOrganization = new UserOrganization();
+        userOrganization.setUserId(user.getId());
+        userOrganization.setOrganizationId(orgId);
+        userOrganization.setGmtCreate(new Date());
+        userOrganizationMapper.insert(userOrganization);
         return  user;
     }
 
@@ -82,6 +112,8 @@ public class UserFacade extends UserServiceImpl {
         LoginDTO loginDTO=new LoginDTO();
         loginDTO.setUser(user);
         loginDTO.setToken(jwt.getAccess_token());
+        Organization org = organizationMapper.getByUserId(user.getId());
+        loginDTO.setOrganization(org);
         return RespDTO.onSuc(loginDTO);
     }
 

user-service/src/main/java/com/diagbot/mapper/OrganizationMapper.java

@@ -0,0 +1,20 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.Organization;
+
+/**
+ * @Description: 机构
+ * @Author: ztg
+ * @Date: 2018/9/13 17:19
+ */
+public interface OrganizationMapper extends BaseMapper<Organization> {
+
+    /**
+     * @Description: 通过用户id获取组织结构
+     * @Author: ztg
+     * @Date: 2018/9/13 19:24
+     */
+    public Organization getByUserId(Long userId);
+
+}

user-service/src/main/java/com/diagbot/mapper/UserOrganizationMapper.java

@@ -0,0 +1,13 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.UserOrganization;
+
+/**
+ * @Description: 机构
+ * @Author: ztg
+ * @Date: 2018/9/13 17:19
+ */
+public interface UserOrganizationMapper extends BaseMapper<UserOrganization> {
+
+}

user-service/src/main/java/com/diagbot/service/OrganizationService.java

@@ -0,0 +1,13 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.Organization;
+
+/**
+ * @Description: 机构service
+ * @Author: ztg
+ * @Date: 2018/9/13 16:55
+ */
+public interface OrganizationService extends IService<Organization> {
+
+}

user-service/src/main/java/com/diagbot/service/UserOrganizationService.java

@@ -0,0 +1,13 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.UserOrganization;
+
+/**
+ * @Description: 用户-组织机构service
+ * @Author: ztg
+ * @Date: 2018/9/13 19:00
+ */
+public interface UserOrganizationService extends IService<UserOrganization> {
+
+}

user-service/src/main/java/com/diagbot/service/impl/OrganizationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.Organization;
+import com.diagbot.mapper.OrganizationMapper;
+import com.diagbot.service.OrganizationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 机构Service实现类
+ * @Author: ztg
+ * @Date: 2018/9/13 16:56
+ */
+@Service
+@Slf4j
+public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService {
+
+
+}

user-service/src/main/java/com/diagbot/service/impl/UserOrganizationServiceImpl.java

@@ -0,0 +1,17 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.UserOrganization;
+import com.diagbot.mapper.UserOrganizationMapper;
+import com.diagbot.service.UserOrganizationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 用户-组织机构serviceImpl
+ * @Author: ztg
+ * @Date: 2018/9/13 19:01
+ */
+@Service
+public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMapper, UserOrganization> implements UserOrganizationService {
+
+}

user-service/src/main/resources/mapper/OrganizationMapper.xml

@@ -0,0 +1,20 @@
+<?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.diagbot.mapper.OrganizationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Organization">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+    </resultMap>
+
+    <select id="getByUserId" resultMap="BaseResultMap">
+        SELECT a.* FROM `sys_organization` a, sys_user_organization b
+        where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
+    </select>
+</mapper>

user-service/src/main/resources/mapper/UserOrganizationMapper.xml

@@ -0,0 +1,17 @@
+<?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.diagbot.mapper.UserOrganizationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.UserOrganization">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="user_id" property="userId" />
+        <result column="organization_id" property="organizationId" />
+    </resultMap>
+
+</mapper>