优化代码， 删除文件

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

@@ -1,137 +0,0 @@
-package com.diagbot.dto;
-
-import java.io.Serializable;
-
-/**
- * 数据服务接口
- * 返回结果实体类
- *
- * @author wangfeng
- * @version 0.0.1
- * @since 2018-09-19
- */
-public final class ResultModelDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-    public static final ResultModelDTO resultModel = new ResultModelDTO(true);
-    /**
-     * true表示处理成功
-     **/
-    private boolean result;
-    /**
-     * 消息体
-     **/
-    private String message;
-    /**
-     * 返回结果
-     **/
-    private Object data;
-    /**
-     * 扩展数据
-     **/
-    private Object extendData;
-
-    /**
-     * 构造
-     *
-     * @param boolean
-     * @return ResultModel
-     */
-    public ResultModelDTO(final boolean success) {
-        this(success, null, null, null);
-    }
-
-    /**
-     * 构造
-     *
-     * @return ResultModel
-     */
-    public ResultModelDTO() {
-        super();
-    }
-
-    /**
-     * 构造
-     *
-     * @param success
-     * @param msg
-     * @param data
-     * @param extendData
-     * @return ResultModel
-     */
-    public ResultModelDTO(final boolean success, final String msg, final Object data, final Object extendData) {
-        super();
-        this.result = success;
-        this.message = msg;
-        this.data = data;
-        this.extendData = extendData;
-    }
-
-    /**
-     * createSuccess 方法
-     *
-     * @param msg
-     * @param data
-     * @param extendData
-     * @return ResultModel
-     */
-    public static ResultModelDTO createSuccess(final String msg, final Object data, final Object extendData) {
-        return new ResultModelDTO(true, msg, data, extendData);
-    }
-
-    /**
-     * create 方法
-     *
-     * @param success
-     * @param msg
-     * @param data
-     * @param extendData
-     * @return ResultModel
-     */
-    public static ResultModelDTO create(final boolean success, final String msg, final Object data, final Object extendData) {
-        return new ResultModelDTO(success, msg, data, extendData);
-    }
-
-    /**
-     * create 方法
-     *
-     * @param success
-     * @param msg
-     * @param data
-     * @return create
-     */
-    public static ResultModelDTO create(final boolean success, final String msg, final Object data) {
-        return new ResultModelDTO(success, msg, data, null);
-    }
-
-    public boolean isResult() {
-        return result;
-    }
-
-    public void setResult(boolean result) {
-        this.result = result;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Object getData() {
-        return data;
-    }
-
-    public void setData(Object data) {
-        this.data = data;
-    }
-
-    public Object getExtendData() {
-        return extendData;
-    }
-
-    public void setExtendData(Object extendData) {
-        this.extendData = extendData;
-    }
-}

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

@@ -2,6 +2,10 @@ package com.diagbot.dto;
 
 import java.util.Date;
 
+import com.diagbot.enums.AccessTypeEnum;
+import com.diagbot.enums.ChargeTypeEnum;
+import com.diagbot.enums.OrganizationTypeEnum;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,7 +26,16 @@ public class UserAndProdutUDTO {
 	private Date endTime;//结束时间
 	private Integer serviceStatus;//启用状态
 	private Integer accessType;//接入方式
+	private String accessTypeStr;
 	private Integer chargeType;//结算方式
+	private String chargeTypeStr;
 	private String  productName;//产品名称
+	
+	public  String getAccessTypeStr(){
+        return AccessTypeEnum.getName(this.accessType);
+    }
+	public  String getChargeTypeStr(){
+		return ChargeTypeEnum.getName(this.accessType);
+	}
 
 }

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

@@ -1,167 +0,0 @@
-package com.diagbot.dto;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.diagbot.enums.AuthStatusEnum;
-import com.diagbot.enums.OrganizationTypeEnum;
-
-/**
- * 
- * @Description: 用户信息机构信息开通产品
- * @author wangfeng
- * @date 2018年9月26日 下午2:17:57
- */
-public class UserOrganProductDTO implements Serializable{
-	
-	 private static final long serialVersionUID = 1L;
-
-	    @TableId(value = "id", type = IdType.AUTO)
-	    private Long userId;//用户ID
-	    private Date userGmtCreate;//记录创建时间
-	    private String userName;// 用户名
-	    private String linKman;//联系人
-	    private String email;// 邮箱
-	    @TableId(value = "id", type = IdType.AUTO)
-	    private Long orgId;//机构ID
-	    private Date orgGmtCreate;//记录创建时间
-	    private String orgName;//机构名称
-	    private Integer orgType;//机构属性
-	    private String  orgTypeStr;//机构属性String
-	    private String orgPrincipal;//负责人
-	    private String orgAddress;//机构地址
-	    private Long orgParentId;//上级机构id
-	    private Integer orgSubNum;//下属机构数量
-	    private String autPosition;//岗位信息
-	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
-	    private Integer autStatus;//认证状态
-	    private String autStatusStr;//认证状态String
-	    private List<UserAndProdutUDTO> userAndProdutUDTO;
-		public Long getUserId() {
-			return userId;
-		}
-		public void setUserId(Long userId) {
-			this.userId = userId;
-		}
-		public Date getUserGmtCreate() {
-			return userGmtCreate;
-		}
-		public void setUserGmtCreate(Date userGmtCreate) {
-			this.userGmtCreate = userGmtCreate;
-		}
-		public String getUserName() {
-			return userName;
-		}
-		public void setUserName(String userName) {
-			this.userName = userName;
-		}
-		public String getLinKman() {
-			return linKman;
-		}
-		public void setLinKman(String linKman) {
-			this.linKman = linKman;
-		}
-		public String getEmail() {
-			return email;
-		}
-		public void setEmail(String email) {
-			this.email = email;
-		}
-		public Long getOrgId() {
-			return orgId;
-		}
-		public void setOrgId(Long orgId) {
-			this.orgId = orgId;
-		}
-		public Date getOrgGmtCreate() {
-			return orgGmtCreate;
-		}
-		public void setOrgGmtCreate(Date orgGmtCreate) {
-			this.orgGmtCreate = orgGmtCreate;
-		}
-		public String getOrgName() {
-			return orgName;
-		}
-		public void setOrgName(String orgName) {
-			this.orgName = orgName;
-		}
-		public Integer getOrgType() {
-			return orgType;
-		}
-		public void setOrgType(Integer orgType) {
-			if(orgType!=null){
-				setOrgTypeStr(OrganizationTypeEnum.getName(orgType));	
-			}
-			this.orgType = orgType;
-		}
-		public String getOrgTypeStr() {
-			return orgTypeStr;
-		}
-		public void setOrgTypeStr(String orgTypeStr) {
-			this.orgTypeStr = orgTypeStr;
-		}
-		public String getOrgPrincipal() {
-			return orgPrincipal;
-		}
-		public void setOrgPrincipal(String orgPrincipal) {
-			this.orgPrincipal = orgPrincipal;
-		}
-		public String getOrgAddress() {
-			return orgAddress;
-		}
-		public void setOrgAddress(String orgAddress) {
-			this.orgAddress = orgAddress;
-		}
-		public Long getOrgParentId() {
-			return orgParentId;
-		}
-		public void setOrgParentId(Long orgParentId) {
-			this.orgParentId = orgParentId;
-		}
-		public Integer getOrgSubNum() {
-			return orgSubNum;
-		}
-		public void setOrgSubNum(Integer orgSubNum) {
-			this.orgSubNum = orgSubNum;
-		}
-		public String getAutPosition() {
-			return autPosition;
-		}
-		public void setAutPosition(String autPosition) {
-			this.autPosition = autPosition;
-		}
-		public Integer getAutIsReject() {
-			return autIsReject;
-		}
-		public void setAutIsReject(Integer autIsReject) {
-			this.autIsReject = autIsReject;
-		}
-		public Integer getAutStatus() {
-			return autStatus;
-		}
-		public void setAutStatus(Integer autStatus) {
-			if(autStatus!=null){
-				setAutStatusStr(AuthStatusEnum.getName(autStatus));
-			}
-			this.autStatus = autStatus;
-		}
-		public static long getSerialversionuid() {
-			return serialVersionUID;
-		}
-		public String getAutStatusStr() {
-			return autStatusStr;
-		}
-		public void setAutStatusStr(String autStatusStr) {
-			this.autStatusStr = autStatusStr;
-		}
-		public List<UserAndProdutUDTO> getUserAndProdutUDTO() {
-			return userAndProdutUDTO;
-		}
-		public void setUserAndProdutUDTO(List<UserAndProdutUDTO> userAndProdutUDTO) {
-			this.userAndProdutUDTO = userAndProdutUDTO;
-		}
-
-}

user-service/src/main/java/com/diagbot/enums/AccessTypeEnum.java

@@ -0,0 +1,52 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 接入方式枚举
+ * @author wangfeng
+ * @date 2018年9月27日 下午4:21:29
+ */
+public enum AccessTypeEnum implements KeyedNamed {
+    Embedded(1, "嵌入式"),
+    InterfaceType(2, "接口方式"),
+    Online(3,"线上模式");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    AccessTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static AccessTypeEnum getEnum(Integer key) {
+        for (AccessTypeEnum item : AccessTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        AccessTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

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

@@ -682,7 +682,7 @@ public class UserFacade extends UserServiceImpl {
      * @param userId
      * @return 删除用户信息和机构信息
      */
-    public RespDTO updateDeleteds(String userId) {
+    public RespDTO<Boolean> updateDeleteds(String userId) {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("userId", userId);
         map.put("modifier", UserUtils.getCurrentPrincipleID());

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

@@ -1,43 +1,34 @@
 package com.diagbot.web;
 
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserOrganProductDTO;
 import com.diagbot.entity.Organization;
-import com.diagbot.entity.User;
-import com.diagbot.entity.UserAuthentication;
-import com.diagbot.entity.UserOrganization;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.facade.UserOrganizationFacade;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 外部用户信息
@@ -92,14 +83,14 @@ public class UserInfoController {
     @PostMapping("/updateDeleted")
     @SysLogger("updateDeleted")
     @Transactional
-    public RespDTO updateDeleted(@RequestParam String userId) {
+    public RespDTO<Boolean> updateDeleted(@RequestParam String userId) {
         return userFacade.updateDeleteds(userId);
     }
 
     @ApiOperation(value = "模糊查询机构信息[by:wangfeng]", notes = "机构信息")
     @PostMapping("/findOrganization")
     @SysLogger("findOrganization")
-    public RespDTO findOrganization(@RequestParam String organizationName) {
+    public RespDTO<Organization> findOrganization(@RequestParam String organizationName) {
         // TODO 返回机构Id和机构
         List<Organization> organization = organizationFacade.findOrganization(organizationName);