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

common/src/main/java/com/diagbot/exception/CommonErrorCode.java

@@ -18,7 +18,8 @@ public enum CommonErrorCode implements ErrorCode {
     UPDATE_INFO_FAIL("00020003", "更新数据失败!"),
     PARAM_IS_NULL("00020004", "传入的参数为空!"),
     PARAM_IS_ERROR("00020005", "传入的参数为错误!"),
-    STATUS_IS_ERROR("00020006", "参数状态错误!");
+    STATUS_IS_ERROR("00020006", "参数状态错误!"),
+    SERVER_IS_ERROR("00020000", "各自业务错误!");
 
     private String code;
     private String msg;

uaa-service/src/main/java/com/diagbot/entity/Role.java

@@ -1,173 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统角色表
- * </p>
- *
- * @author gaodm
- * @since 2018-08-30
- */
-@TableName("sys_role")
-public class Role 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;
-
-    /**
-     * 角色等级
-     */
-    @TableField("roleLevel")
-    private Integer roleLevel;
-
-    /**
-     * 角色描述
-     */
-    private String descritpion;
-
-    /**
-     * 菜单ID：对应角色ID
-     */
-    @TableField("menuItems")
-    private String menuItems;
-
-
-    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;
-    }
-
-    public Integer getRoleLevel() {
-        return roleLevel;
-    }
-
-    public void setRoleLevel(Integer roleLevel) {
-        this.roleLevel = roleLevel;
-    }
-
-    public String getDescritpion() {
-        return descritpion;
-    }
-
-    public void setDescritpion(String descritpion) {
-        this.descritpion = descritpion;
-    }
-
-    public String getMenuItems() {
-        return menuItems;
-    }
-
-    public void setMenuItems(String menuItems) {
-        this.menuItems = menuItems;
-    }
-
-    @Override
-    public String toString() {
-        return "Role{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", roleLevel=" + roleLevel +
-        ", descritpion=" + descritpion +
-        ", menuItems=" + menuItems +
-        "}";
-    }
-}

uaa-service/src/main/resources/mapper/PermissionMapper.xml

@@ -19,10 +19,10 @@
     <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.Permission">
       select p.*
 		from sys_user u
-        LEFT JOIN sys_user_role sru on u.id= sru.user_id
-        LEFT JOIN sys_role r on sru.role_id=r.id
-        LEFT JOIN sys_role_permission srp on srp.role_id=r.id
-        LEFT JOIN sys_permission p on p.id =srp.permission_id
-        where u.id=#{userId}
+        LEFT JOIN sys_user_role sru on u.id= sru.user_id and sru.is_deleted = 'N'
+        LEFT JOIN sys_role_menu srp on srp.role_id=sru.role_id and srp.is_deleted = 'N'
+        LEFT JOIN sys_menu_permission mp on mp.menu_id =srp.menu_id and mp.is_deleted = 'N'
+				LEFT JOIN sys_permission p on p.id =mp.permission_id and p.is_deleted = 'N'
+        where u.id= #{userId} and u.is_deleted = 'N'
  </select>
 </mapper>

uaa-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -47,15 +47,15 @@ public class CodeGeneration {
         dsc.setDbType(DbType.MYSQL);
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-user?useUnicode=true&characterEncoding=utf-8");
+        dsc.setPassword("lantone");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf-8&useSSL=false");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "sys_user","sys_role","sys_permission" }); // 需要生成的表
+        strategy.setInclude(new String[] { "sys_user","sys_menu","sys_role","sys_permission" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

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

@@ -110,6 +110,14 @@ public class UserFacade extends UserServiceImpl {
             orgId = org.getId();
         } else {
             orgId = list.get(0).getId();
+            //查询机构下是否已存在用户信息，如已存在，就抛异常,需求待核实
+            Map paramMap1 = new HashMap();
+            paramMap1.put("organization_id", orgId);
+            paramMap1.put("is_deleted", "N");
+            List<UserOrganization> res1 = userOrganizationMapper.selectByMap(paramMap1);
+            if(ListUtil.isNotEmpty(res1)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户！");
+            }
         }
 
         UserOrganization userOrganization = new UserOrganization();

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.User;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.UserSaveVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,14 +21,14 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
-import java.util.Map;
 
 /**
- * @Description: 用户对外接口层
+ * @Description: 用户操作API
  * @author: gaodm
  * @time: 2018/8/2 13:56
  */
 @RestController
+@Api(value="用户操作API", tags={"用户操作API"})
 @RequestMapping("/user")
 public class UserController {
 

user-service/src/main/java/com/diagbot/web/VerController.java

@@ -7,6 +7,7 @@ import com.diagbot.facade.VerFacade;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.SmsVerCreatVO;
 import com.diagbot.vo.SmsVerVerVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +23,7 @@ import javax.validation.Valid;
  * @time: 2018/9/4 19:30
  */
 @RestController
+@Api(value="用户验证API", tags={"用户验证API"})
 @RequestMapping("/userver")
 public class VerController {
     @Autowired