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

admin-service/pom.xml

@@ -83,12 +83,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>

bi-service/pom.xml

@@ -95,10 +95,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
-        <!--</dependency>-->
 
         <!--security-->
         <dependency>
@@ -128,13 +124,6 @@
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
 
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>

config-server/pom.xml

@@ -42,16 +42,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-starter-bus-amqp</artifactId>-->
-        <!--</dependency>-->
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>

config-server/src/main/resources/application.yml

@@ -30,13 +30,6 @@ spring:
 #    password: guest
 #    publisher-confirms: true
 #    virtual-host: /
-#  #热部署设置
-#  thymeleaf:
-#    cache: true #关闭缓存，及时刷新
-#    devtools:
-#      restart:
-#        enabled: true #热部署生效
-#        additional-paths: src/main/java #设置重启的目录，添加那个目录的文件需要restart（监听目录）
 
 # port
 server:

config-server/src/main/resources/shared/application-dev.yml

@@ -55,13 +55,6 @@ spring:
       enabled: true
       trace:
         enabled: true
-#  #热部署设置
-#  thymeleaf:
-#    cache: true #关闭缓存，及时刷新
-#    devtools:
-#      restart:
-#        enabled: true #热部署生效
-#        additional-paths: src/main/java #设置重启的目录，添加那个目录的文件需要restart（监听目录）
 
 swagger:
   enable: true

config-server/src/main/resources/shared/application-local.yml

@@ -55,13 +55,6 @@ spring:
       enabled: true
       trace:
         enabled: true
-#  #热部署设置
-#  thymeleaf:
-#    cache: true #关闭缓存，及时刷新
-#    devtools:
-#      restart:
-#        enabled: true #热部署生效
-#        additional-paths: src/main/java #设置重启的目录，添加那个目录的文件需要restart（监听目录）
 
 swagger:
   enable: true

config-server/src/main/resources/shared/bi-service-dev.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8841
 

config-server/src/main/resources/shared/bi-service-local.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8841
 

config-server/src/main/resources/shared/diagbotman-service-dev.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8811
 

config-server/src/main/resources/shared/diagbotman-service-local.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8811
 

config-server/src/main/resources/shared/feedback-service-dev.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8831
 

config-server/src/main/resources/shared/feedback-service-local.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8831
 

config-server/src/main/resources/shared/knowledge-service-dev.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8821
 

config-server/src/main/resources/shared/knowledge-service-local.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 server:
   port: 8821
 

config-server/src/main/resources/shared/logger-service-dev.yml

@@ -1,15 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
-
 server:
   port: 9997
 

config-server/src/main/resources/shared/logger-service-local.yml

@@ -1,15 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
-
 server:
   port: 9997
 

config-server/src/main/resources/shared/uaa-service-dev.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 # 驱动配置信息
 spring:
   datasource:

config-server/src/main/resources/shared/uaa-service-local.yml

@@ -1,14 +1,3 @@
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 # 驱动配置信息
 spring:
   datasource:

config-server/src/main/resources/shared/user-service-dev.yml

@@ -1,18 +1,6 @@
 server:
   port: 8762
 
-
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 # 驱动配置信息
 spring:
   datasource:

config-server/src/main/resources/shared/user-service-local.yml

@@ -1,18 +1,6 @@
 server:
   port: 8762
 
-
-#spring:
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#    username: root
-#    password: root
-#  jpa:
-#    hibernate:
-#      ddl-auto: update
-#    show-sql: true
-
 # 驱动配置信息
 spring:
   datasource:
@@ -122,9 +110,4 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
-##logging
-#logging:
-#  level.com.diagbot: debug
-#  file: "logs/user-service-local.log"
-
 foo: foo version 1

diagbotman-service/pom.xml

@@ -95,10 +95,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
-        <!--</dependency>-->
 
         <!--security-->
         <dependency>
@@ -128,13 +124,6 @@
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
 
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 11:06 2018/9/27
+ */
+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;
+    }
+}
+

diagbotman-service/src/main/java/com/diagbot/enums/ChargeTypeEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 计费方式枚举类型
+ * @author: wangyu
+ * @time: 11:06 2018/9/27
+ */
+public enum ChargeTypeEnum implements KeyedNamed {
+    ByFlow(1, "按流程计费"),
+    ByOrginations(2, "按机构计费"),
+    ByUser(3,"按用户计费");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ChargeTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ChargeTypeEnum getEnum(Integer key) {
+        for (ChargeTypeEnum item : ChargeTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ChargeTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

diagbotman-service/src/main/java/com/diagbot/enums/NotPassEnum.java

@@ -0,0 +1,52 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 不通过原因枚举类型
+ * @author: wangyu
+ * @time: 11:06 2018/9/27
+ */
+public enum NotPassEnum implements KeyedNamed {
+    ImperfectInformation(1, "账号信息不完善"),
+    AgencyError(2, "机构有误"),
+    CancellationOfOrder(3,"取消订单"),
+    NotChoose(0,"未选择");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    NotPassEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static NotPassEnum getEnum(Integer key) {
+        for (NotPassEnum item : NotPassEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        NotPassEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

diagbotman-service/src/main/java/com/diagbot/enums/TrialStatusEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 试用状态枚举类
+ * @author: wangyu
+ * @time: 11:06 2018/9/27
+ */
+public enum TrialStatusEnum implements KeyedNamed {
+    NotTrial(0, "不可试用"),
+    OnTrial(1, "试用"),
+    NoChoose(1, "未选择");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    TrialStatusEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static TrialStatusEnum getEnum(Integer key) {
+        for (TrialStatusEnum item : TrialStatusEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        TrialStatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
+import com.diagbot.entity.User;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.enums.IsDeleteEnum;
@@ -134,10 +135,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @param page 页数和每页显示的条数默认显示10条
      * @return 根据用户id查询是否有开通产品
      */
-    public IPage<LantoneProduct> productLine(Page page) {
+    public RespDTO<IPage<LantoneProduct>> productLine(Page page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         IPage<LantoneProduct> diagLantoneProducts = productLine(page, userId);
-        return diagLantoneProducts;
+        return RespDTO.onSuc(diagLantoneProducts);
     }
 
 
@@ -195,4 +196,16 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         }
         return list;
     }
+
+    /**
+     * 用户-分页查询产品信息
+     *
+     * @param page       分页参数
+     * @param name 参数
+     * @return 产品信息
+     */
+    public RespDTO<IPage<LantoneProduct>> index(Page page, String name) {
+        IPage<LantoneProduct> res = this.selectProduct(page, name);
+        return RespDTO.onSuc(res);
+    }
 }

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

@@ -149,7 +149,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @param productOrderVO （订单编号，机构名称，申请状态）
 	 * @return 所有订单信息
 	 */
-	public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderVO productOrderVO){
+	public RespDTO<List<ProductOrderWrapper>> selectAllProductOrder(ProductOrderVO productOrderVO){
 		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
 		Long curren = productOrderVO.getCurrent();
 		Long size =productOrderVO.getSize();
@@ -188,7 +188,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 				bean.setAuStatus(uo.getAuStatus());
 			}
 		}
-		return list;
+		return RespDTO.onSuc(list);
 	}
 
 
@@ -215,8 +215,12 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             // 其他 部分通过
         }
         productOrder.setAuditStatus(satus);
-        this.updateById(productOrder);
-        //TODO 更新状态值
+        productOrder.setGmtModified(DateUtil.now());
+        productOrder.setModifier(UserUtils.getCurrentPrincipleID());
+        if(!this.updateById(productOrder)){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "用户订单审核状态修改失败");
+        }
         return true;
     }
 }

diagbotman-service/src/main/java/com/diagbot/mapper/LantoneProductMapper.java

@@ -27,7 +27,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
     IPage<LantoneProduct> productLine(Page page, @Param("userId") Long userId);
 
     /**
-     * @Description: 用户查询所有未开通产品
+     * @Description: 根据产品名称分页查询
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -53,8 +53,7 @@ public class DiagLantoneProductController {
     @PostMapping("/selectProduct")
     @SysLogger("selectProduct")
     public RespDTO<IPage<LantoneProduct>> selectProduct(Page page, String name) {
-        IPage<LantoneProduct> pages = lantoneProductFacade.selectProduct(page, name);
-        return RespDTO.onSuc(pages);
+        return lantoneProductFacade.index(page, name);
     }
 
     @ApiOperation(value = "产品线管理——修改[by:wangyu]",

diagbotman-service/src/main/java/com/diagbot/web/MoreServiceController.java

@@ -36,8 +36,7 @@ public class MoreServiceController {
     @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
     public RespDTO<IPage<LantoneProduct>> showProductInfo(Page page) {
-        IPage<LantoneProduct> diagLantoneProducts = lantoneProductFacade.productLine(page);
-        return RespDTO.onSuc(diagLantoneProducts);
+        return lantoneProductFacade.productLine(page);
     }
 
     @ApiOperation(value = "用户更多服务——生成订单[by:wangyu]", notes = "根据用户所选择的产品生成订单")

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -11,13 +11,9 @@ import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.ProductOrderVO;
@@ -142,8 +138,7 @@ public class ProductOrderController {
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
     public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(ProductOrderVO productOrderVO) {
-        List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderVO);
-        return RespDTO.onSuc(list);
+        return productOrderFacade.selectAllProductOrder(productOrderVO);
     }
 
     @ApiOperation(value = "客户中心-查询用户已开通的功能[by:wangfeng]", notes = "用户已开通信息")

eureka-server/pom.xml

@@ -47,12 +47,6 @@
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
         </dependency>
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>

eureka-server/src/main/resources/bootstrap.yml

@@ -1,10 +1,3 @@
 spring:
   profiles:
     active: local
-#  #热部署设置
-#  thymeleaf:
-#    cache: true #关闭缓存，及时刷新
-#    devtools:
-#      restart:
-#        enabled: true #热部署生效
-#        additional-paths: src/main/java #设置重启的目录，添加那个目录的文件需要restart（监听目录）

feedback-service/pom.xml

@@ -95,11 +95,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
-        <!--</dependency>-->
-
         <!--security-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -128,13 +123,6 @@
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
 
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>

gateway-service/pom.xml

@@ -61,13 +61,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <!--swagger-->
         <dependency>
             <groupId>io.springfox</groupId>

knowledge-service/pom.xml

@@ -95,11 +95,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
-        <!--</dependency>-->
-
         <!--security-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -127,14 +122,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
-
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>

monitor-service/pom.xml

@@ -69,13 +69,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
-
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>

uaa-service/pom.xml

@@ -54,10 +54,6 @@
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -80,13 +76,6 @@
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
 
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -17,14 +17,10 @@
         <result column="descritpion" property="descritpion"/>
     </resultMap>
 
-    <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 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 id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.Permission">
+      select p.* from sys_user u, sys_user_role sru, sys_role_permission rp, sys_permission p
+      where u.is_deleted = 'N' and sru.is_deleted = 'N' and rp.is_deleted = 'N' and p.is_deleted = 'N'
+      and u.id = sru.user_id and sru.role_id = rp.role_id and rp.permission_id = p.id
+      and u.id= #{userId}
      </select>
 </mapper>

user-service/pom.xml

@@ -95,10 +95,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
-        <!--</dependency>-->
 
         <!--security-->
         <dependency>
@@ -128,13 +124,6 @@
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
 
-        <!--&lt;!&ndash;热部署引用&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-devtools</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -16,8 +16,14 @@ import lombok.Setter;
 @Setter
 public class GetConsoleUserInfoDTO {
 
-    private User user;
-    private Organization organization;
-    private UserAuthentication userAuthentication;
+//    private User user;
+//    private Organization organization;
+//    private UserAuthentication userAuthentication;
+    
+    private String organizationName;//机构名称
+    
+    private String userName;//用户名称
+    
+    private String userStatus;//用户认证状态
 
 }

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

@@ -19,10 +19,10 @@ public class QueryAuthProgressDTO implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
-    private Integer status;
+    private Integer userStatus;//用户认证状态
+    
+    private String userStatusMsg;//用户认证状态信息
 
-    private Integer isReject;
-
-    private String rejectComment;
+    private String rejectComment;//认证被拒理由
 
 }

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

@@ -25,9 +25,10 @@ public class PermissionFacade extends PermissionServiceImpl {
     UserFacade userFacade;
 
     /**
-     * @Description: 获取资源信息
-     * @Author: ztg
-     * @Date: 2018/9/25 15:10
+     * 获取资源信息
+     * @param appkey 参数
+     * @param secret 参数
+     * @return 资源信息
      */
     public RespDTO getPermission(String appkey, String secret) {
         User user = userFacade.findByName(appkey);

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

@@ -170,8 +170,8 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         UserAuthentication userAuthentication = this.getOne(qw);
 
         QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
-        queryAuthProgressDTO.setStatus(userAuthentication.getStatus());
-        queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
+        queryAuthProgressDTO.setUserStatus(userAuthentication.getStatus());
+        queryAuthProgressDTO.setUserStatusMsg(AuthStatusEnum.getName(userAuthentication.getStatus()));
         queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
 
         return queryAuthProgressDTO;

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

@@ -20,6 +20,7 @@ import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
 import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -187,7 +188,7 @@ public class UserFacade extends UserServiceImpl {
             //查询机构下是否已存在用户信息，如已存在，就抛异常,需求待核实
             Map paramMap1 = new HashMap();
             paramMap1.put("organization_id", orgId);
-            paramMap1.put("is_deleted", "N");
+            paramMap1.put("is_deleted", IsDeleteEnum.N.getKey());
             List<UserOrganization> res1 = userOrganizationFacade.selectByMap(paramMap1);
             if (ListUtil.isNotEmpty(res1)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户！");
@@ -411,13 +412,17 @@ public class UserFacade extends UserServiceImpl {
         Organization organization = organizationFacade.getByUserId(userId);
         QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
         qw.eq("user_id", userId);
-        qw.eq("is_deleted", "N");
+        qw.eq("is_deleted", IsDeleteEnum.N.getKey());
         UserAuthentication userAuthentication = userAuthenticationFacade.getOne(qw);
 
         GetConsoleUserInfoDTO getConsoleUserInfoDTO = new GetConsoleUserInfoDTO();
-        getConsoleUserInfoDTO.setUser(user);
-        getConsoleUserInfoDTO.setOrganization(organization);
-        getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
+        getConsoleUserInfoDTO.setUserName(user.getUsername());
+        getConsoleUserInfoDTO.setOrganizationName(organization.getName());
+        getConsoleUserInfoDTO.setUserStatus(AuthStatusEnum.getName(userAuthentication.getStatus()));
+        
+//        getConsoleUserInfoDTO.setUser(user);
+//        getConsoleUserInfoDTO.setOrganization(organization);
+//        getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
 
         return getConsoleUserInfoDTO;
     }

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

@@ -25,14 +25,11 @@
     </select>
 
 
-    <select id="getByUserId" parameterType="java.lang.Long"
-            resultType="com.diagbot.entity.Permission">
+    <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 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'
+        from sys_user u, sys_user_role sru, sys_role_permission rp, sys_permission p
+        where u.is_deleted = 'N' and sru.is_deleted = 'N' and rp.is_deleted = 'N' and p.is_deleted = 'N'
+        and u.id = sru.user_id and sru.role_id = rp.role_id and rp.permission_id = p.id
+        and u.id= #{userId}
     </select>
 </mapper>