驾驶舱功能调整

pqs-system/system-api/src/main/java/com/njcn/system/api/PqDashboardPageFeignClient.java

@@ -0,0 +1,24 @@
+package com.njcn.system.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.system.api.fallback.PqDashboardPageFeignClientFallbackFactory;
+import com.njcn.system.pojo.po.PqDashboardPage;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+
+/**
+ * @author 徐扬
+ */
+@FeignClient(value = ServerInfo.SYSTEM,path = "/dashboard",fallbackFactory = PqDashboardPageFeignClientFallbackFactory.class,contextId = "dashboard")
+public interface PqDashboardPageFeignClient {
+
+    @PostMapping("/getDashboardPageByUserId")
+    @ApiOperation("根据用户id查询用户驾驶舱")
+    HttpResult<List<PqDashboardPage>> getDashboardPageByUserId(@RequestParam("id") String id,@RequestParam("state") boolean state);
+}

pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/PqDashboardPageFeignClientFallbackFactory.java

@@ -0,0 +1,48 @@
+package com.njcn.system.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.system.api.PqDashboardPageFeignClient;
+import com.njcn.system.pojo.po.PqDashboardPage;
+import com.njcn.system.utils.SystemEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年01月05日 15:08
+ */
+@Slf4j
+@Component
+public class PqDashboardPageFeignClientFallbackFactory implements FallbackFactory<PqDashboardPageFeignClient> {
+
+
+    /**
+     * 输出远程请求接口异常日志
+     * @param cause RPC请求异常
+     * @return
+     */
+    @Override
+    public PqDashboardPageFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if(cause.getCause() instanceof BusinessException){
+            BusinessException businessException = (BusinessException) cause.getCause();
+            exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new PqDashboardPageFeignClient() {
+
+            @Override
+            public HttpResult<List<PqDashboardPage>> getDashboardPageByUserId(String id, boolean state) {
+                log.error("{}异常，降级处理，异常为：{}","根据用户id查询用户驾驶舱异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqDashboardPageParam.java

@@ -1,11 +1,5 @@
 package com.njcn.system.pojo.param;
 
-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 com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,8 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 
 /**
  * Description:
@@ -61,6 +53,18 @@ public class PqDashboardPageParam  {
      */
     private Integer state;
 
+    @ApiModelProperty("绑定页面路由")
+    private String pagePath;
+
+    @ApiModelProperty("绑定页面名称")
+    private String pathName;
+
+    @ApiModelProperty("路由名称")
+    private String routeName;
+
+    @ApiModelProperty("图标")
+    private String icon;
+
     /**
      * 更新操作实体
      */

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/PqDashboardPage.java

@@ -1,12 +1,9 @@
 package com.njcn.system.pojo.po;
 
-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.time.LocalDateTime;
-
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -24,6 +21,18 @@ public class PqDashboardPage extends BaseEntity {
      */
     private String id;
 
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 图标
+     */
+    @TableField(value = "icon")
+    private String icon;
+
     /**
      * 页面名称
      */
@@ -59,5 +68,16 @@ public class PqDashboardPage extends BaseEntity {
     @TableField(value = "state")
     private Integer state;
 
+    @TableField(value = "page_path")
+    @ApiModelProperty("绑定页面路由")
+    private String pagePath;
+
+    @TableField(value = "path_name")
+    @ApiModelProperty("绑定页面名称")
+    private String pathName;
+
+    @TableField(value = "route_name")
+    @ApiModelProperty("路由名称")
+    private String routeName;
 
 }

pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqDashboardPageVO.java

@@ -1,12 +1,12 @@
 package com.njcn.system.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -60,6 +60,17 @@ public class PqDashboardPageVO extends BaseEntity {
      */
     private String createBy;
 
+    @ApiModelProperty("绑定页面路由")
+    private String pagePath;
+
+    @ApiModelProperty("绑定页面名称")
+    private String pathName;
+
+    @ApiModelProperty("路由名称")
+    private String routeName;
+
+    @ApiModelProperty("图标")
+    private String icon;
 
     /**
      * 创建时间