From 2fc4a9db205e0e3e8f2bf724e9baea4686b84a51 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Tue, 7 Sep 2021 22:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BC=96=E8=BE=91=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/isc/domain/bo/IscServiceBo.java |  7 ++++
 .../com/ruoyi/isc/domain/vo/IscServiceVo.java |  9 ++---
 .../service/impl/IscServiceServiceImpl.java   |  1 +
 ruoyi-ui/src/views/isc/service/index.vue      | 37 ++++++++++++-------
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
index 8a2aa60b6..2254e9fa9 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
@@ -24,6 +24,13 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @ApiModel("服务信息业务对象")
 public class IscServiceBo extends BaseEntity {
 
+    /**
+     * 服务ID
+     */
+    @ApiModelProperty(value = "服务ID", required = true)
+    @NotNull(message = "服务ID不能为空", groups = { EditGroup.class })
+    private Long serviceId;
+
     /**
      * 服务名称
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
index cde19b64b..1eb67f1de 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
@@ -67,14 +67,14 @@ public class IscServiceVo {
     /**
      * 跨域标志（Y是 N否）
      */
-    @ExcelProperty(value = "跨域标志")
+    @ExcelProperty(value = "跨域标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
     @ApiModelProperty("跨域标志（Y是 N否）")
     private String corsFlag;
 
     /**
      * 隐藏参数
      */
-    @ExcelProperty(value = "隐藏参数")
     @ApiModelProperty("隐藏参数")
     private String hiddenParams;
 
@@ -117,7 +117,7 @@ public class IscServiceVo {
     /**
      * 服务分类名称
      */
-    @ExcelProperty(value = "服务分类名称")
+    @ExcelProperty(value = "服务分类")
     @ApiModelProperty("服务分类名称")
     private String cateName;
 
@@ -133,7 +133,6 @@ public class IscServiceVo {
      */
     @ExcelProperty(value = "更新时间")
     @ApiModelProperty("更新时间")
-    private String updateTime;
-
+    private Date updateTime;
 
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 2361eeffd..65d69bd29 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -56,6 +56,7 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     public List<IscServiceVo> queryList(IscServiceBo bo)
     {
         final List<IscServiceVo> results = listVo(buildQueryWrapper(bo));
+        genVoInfo(results);
         return results;
     }
 
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index d3647593d..fde9d000b 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -98,14 +98,14 @@
 
     <el-table v-loading="loading" :data="serviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="服务ID" align="center" prop="serviceId" v-if="false"/>
-      <el-table-column label="服务名称" align="center" prop="serviceName" />
-      <el-table-column label="服务分类" align="center" prop="cateName" />
-      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat" />
-      <el-table-column label="是否在线" align="center" prop="onlineStatus" :formatter="onlineStatusFormat" />
-      <el-table-column label="审核状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" >
+      <el-table-column label="服务ID" align="center" prop="serviceId" width="100"/>
+      <el-table-column label="服务名称" align="left" prop="serviceName" />
+      <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
+      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat"  width="100"/>
+      <el-table-column label="是否在线" align="center" prop="onlineStatus" :formatter="onlineStatusFormat"  width="100"/>
+      <el-table-column label="审核状态" align="center" prop="status" :formatter="statusFormat"  width="100"/>
+      <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime"  width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
@@ -154,7 +154,13 @@
           <el-input v-model="form.probeActiveAddr" placeholder="请输入探活地址" />
         </el-form-item>
         <el-form-item label="请求方式" prop="requestMethod">
-          <el-input v-model="form.requestMethod" placeholder="请输入请求方式" />
+          <el-radio-group v-model="form.requestMethod">
+            <el-radio
+              v-for="dict in requestMethodOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -225,6 +231,8 @@ export default {
       statusOptions: [],
       // 服务状态字典
       enabledOptions: [],
+      // 服务状态字典
+      requestMethodOptions: [],
       //服务分类
       cateOptions:[],
       // 查询参数
@@ -235,8 +243,7 @@ export default {
         onlineStatus: undefined,
         status: undefined,
         enabled: undefined,
-        cateFullPath: undefined,
-        userId: undefined,
+        cateFullPath: undefined
       },
       // 表单参数
       form: {},
@@ -287,6 +294,9 @@ export default {
     this.getDicts("sys_normal_disable").then(response => {
       this.enabledOptions = response.data;
     });
+    this.getDicts("isc_request_method").then(response => {
+      this.requestMethodOptions = response.data;
+    });
   },
   methods: {
     /** 查询服务信息列表 */
@@ -326,9 +336,9 @@ export default {
         serviceName: undefined,
         serviceAddr: undefined,
         probeActiveAddr: undefined,
-        requestMethod: undefined,
+        requestMethod: 'GET',
         remark: undefined,
-        corsFlag: "0",
+        corsFlag: 'Y',
         hiddenParams: undefined,
         onlineStatus: undefined,
         status: undefined,
@@ -340,7 +350,6 @@ export default {
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
-      Time: undefined,
         updateTime: undefined,
         delFlag: undefined
       };