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

diagbotman-service/src/main/java/com/diagbot/facade/EnumsDataFacade.java

@@ -18,6 +18,10 @@ public class EnumsDataFacade {
     @Autowired
     private EnumsDataService enumsDataService;
 
+    /**
+     * 用户枚举数据获取
+     * @return 用户枚举类map
+     */
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData(){
         return enumsDataService.getEnumsData();
     }

diagbotman-service/src/main/java/com/diagbot/service/EnumsDataService.java

@@ -11,5 +11,9 @@ import java.util.Map;
  * @time: 2018/9/19 14:25
  */
 public interface EnumsDataService {
+    /**
+     * 用户枚举数据获取
+     * @return 用户枚举类map
+     */
     Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData();
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -16,6 +16,10 @@ import java.util.Map;
  */
 @Service
 public class EnumsDataServiceImpl implements EnumsDataService {
+    /**
+     * 用户枚举数据获取
+     * @return 用户枚举类map
+     */
     @Override
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData(){
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()

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

@@ -18,6 +18,10 @@ public class EnumsDataFacade {
     @Autowired
     private EnumsDataService enumsDataService;
 
+    /**
+     * 用户枚举数据获取
+     * @return 用户枚举类map
+     */
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData(){
         return enumsDataService.getEnumsData();
     }

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

@@ -303,7 +303,12 @@ public class UserFacade extends UserServiceImpl {
     }
 
 
-    //缓存演示
+    //---------------缓存演示开始-------------------------------------
+    /**
+     * 新建用户
+     * @param user 新建用户信息输入参数
+     * @return 用户信息
+     */
     @CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User saveUser(User user){
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
@@ -315,6 +320,11 @@ public class UserFacade extends UserServiceImpl {
         return user;
     }
 
+    /**
+     * 更新用户信息
+     * @param user  更新用户信息输入参数
+     * @return 用户信息
+     */
     @CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User updateUser(User user){
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
@@ -326,12 +336,22 @@ public class UserFacade extends UserServiceImpl {
         return user;
     }
 
+    /**
+     * 根据用户ID获取用户信息
+     * @param id 用户ID
+     * @return 用户信息
+     */
     @Override
     @Cacheable(value = CACHE_NAME, key = "'user:'+#p0")
     public User getById(Serializable id){
         return super.getById(id);
     }
 
+    /**
+     * 根据用户ID删除用户(物理删除)
+     * @param id 用户ID
+     * @return 是否成功
+     */
     @Override
     @CacheEvict(value = CACHE_NAME, key = "'user:'+#p0")
     public boolean removeById(Serializable id){
@@ -351,6 +371,7 @@ public class UserFacade extends UserServiceImpl {
 	      
 	    return getConsoleUserInfoDTO;
 	}
+    //---------------缓存演示结束-------------------------------------
 
 
     /**

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

@@ -11,5 +11,9 @@ import java.util.Map;
  * @time: 2018/9/19 14:25
  */
 public interface EnumsDataService {
+    /**
+     * 用户枚举数据获取
+     * @return 用户枚举类map
+     */
     Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData();
 }

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

@@ -1,6 +1,5 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.dto.RespDTO;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.service.EnumsDataService;
@@ -17,6 +16,11 @@ import java.util.Map;
  */
 @Service
 public class EnumsDataServiceImpl implements EnumsDataService {
+
+    /**
+     * 用户枚举数据获取
+     * @return 用户枚举类map
+     */
     @Override
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData(){
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()