监控中心修改、服务调用添加路由配置

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/GatewayRoutesController.java

@@ -62,4 +62,13 @@ public class GatewayRoutesController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("获取所有可用路由数据")
+    @GetMapping(value = "/list")
+    public AjaxResult list(GatewayRoutes gatewayRoutes) {
+        QueryWrapper<GatewayRoutes> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", "0")
+                .like(StringUtils.isNotBlank(gatewayRoutes.getServiceName()), "service_name", gatewayRoutes.getServiceName());
+        return AjaxResult.success(gatewayRoutesService.list(queryWrapper));
+    }
+
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/PtServiceService.java

@@ -15,17 +15,6 @@ import java.util.Map;
  */
 public interface PtServiceService extends IService<PtService> {
 
-    /**
-     * 保存服务信息
-     * @param ptService 服务信息
-     * @return 服务
-     */
-//    PtService save(PtService ptService);
-
-    PtService insert(PtService ptService);
-
-    PtService update(PtService ptService);
-
     /**
      * @return 申请数量Top10的数据
      */
@@ -46,8 +35,6 @@ public interface PtServiceService extends IService<PtService> {
      */
     Map<String, List<PtService>> getRankingList();
 
-    PtService get(String srvId);
-
     MdModelInfoVo modelService(MdModelInfoVo par);
 
     List<PtService> selectAllColumns(PtService ptService);

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/InterfaceAuthServiceImpl.java

@@ -37,7 +37,7 @@ public class InterfaceAuthServiceImpl implements InterfaceAuthService {
     @Override
     public Map<String, Object> authCheck(String srvId, String token) {
         Map<String, Object> ret = new HashMap<>(3);
-        PtService ptService = ptServiceService.get(srvId);
+        PtService ptService = ptServiceService.getById(srvId);
         if (ptService == null) {
             ret.put("status", false);
             ret.put("code", 4001);
@@ -121,7 +121,7 @@ public class InterfaceAuthServiceImpl implements InterfaceAuthService {
         PtService service = new PtService();
         service.setSrvId(ptService.getSrvId());
         service.setCnt(ptService.getCnt() + 1);
-        ptServiceService.update(service);
+        ptServiceService.updateById(service);
     }
 
     /**

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtServiceApplyServiceImpl.java

@@ -84,12 +84,12 @@ public class PtServiceApplyServiceImpl implements PtServiceApplyService {
      * @param srvId 服务ID
      */
     private void updateApplyNum(String srvId) {
-        PtService service = ptSrvService.get(srvId);
+        PtService service = ptSrvService.getById(srvId);
         Optional.ofNullable(service).ifPresent(s -> {
             PtService ptService = new PtService();
             ptService.setSrvId(s.getSrvId());
             ptService.setApplyNum(s.getApplyNum() + 1);
-            ptSrvService.update(ptService);
+            ptSrvService.updateById(ptService);
         });
 
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtServiceServiceImpl.java

@@ -36,6 +36,7 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
     private final PtServiceMapper ptServiceMapper;
 
     private final RedisOperator redisOperator;
+
     @Autowired
     private IMdModelInfoService mdModelInfoService;
 
@@ -48,40 +49,30 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
     }
 
     @Override
-    public PtService insert(PtService ptService) {
-        ptService.setSrvId(IdUtils.simpleUUID());
-        ptService.setUserId(String.valueOf(SecurityUtils.getUserId()));
+    public boolean save(PtService entity) {
+        entity.setSrvId(IdUtils.simpleUUID());
+        entity.setUserId(String.valueOf(SecurityUtils.getUserId()));
         int initNumber = 0;
-        ptService.setCnt(initNumber);
-        ptService.setViewNum(initNumber);
-        ptService.setDataNum(initNumber);
-        ptService.setApplyNum(initNumber);
+        entity.setCnt(initNumber);
+        entity.setViewNum(initNumber);
+        entity.setDataNum(initNumber);
+        entity.setApplyNum(initNumber);
         Date now = DateUtils.getNowDate();
-        ptService.setTm(now);
-        ptService.setRlstm(now);
-        ptService.setReleaseTime(now);
-        ptService.setUptm(now);
-        ptServiceMapper.insert(ptService);
-        if (CollectionUtils.isNotEmpty(ptService.getParams())) {
-            ptService.getParams().forEach(ptServiceParamMapper::insert);
+        entity.setTm(now);
+        entity.setRlstm(now);
+        entity.setReleaseTime(now);
+        entity.setUptm(now);
+        boolean  ret = super.save(entity);
+        if (CollectionUtils.isNotEmpty(entity.getParams())) {
+            entity.getParams().forEach(ptServiceParamMapper::insert);
         }
-        return ptService;
-    }
-
-    @Override
-    public PtService update(PtService ptService) {
-        ptServiceMapper.updateByPrimaryKeySelective(ptService);
-        return ptServiceMapper.selectByPrimaryKey(ptService.getSrvId());
+        return ret;
     }
 
     @Override
-    public boolean saveOrUpdate(PtService ptService) {
-        if (StringUtils.isNotBlank(ptService.getSrvId())) {
-            update(ptService);
-            return true;
-        }
-        insert(ptService);
-        return true;
+    public boolean updateById(PtService entity) {
+        entity.setUptm(DateUtils.getNowDate());
+        return super.updateById(entity);
     }
 
     @Override
@@ -114,11 +105,6 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
         return ret;
     }
 
-    @Override
-    public PtService get(String srvId) {
-        return ptServiceMapper.selectByPrimaryKey(srvId);
-    }
-
     /**
      * 获取模型关联服务
      *
@@ -127,7 +113,6 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
      */
     @Override
     public MdModelInfoVo modelService(MdModelInfoVo par) {
-
         return ptServiceMapper.selectModelService(par);
     }
 

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/ServiceDataViewServiceImpl.java

@@ -40,7 +40,7 @@ public class ServiceDataViewServiceImpl implements ServiceDataViewService {
     public Map<String, Object> getDataView(String srvId) {
         Map<String, Object> map = new HashMap<>(2);
 
-        PtService ptService = ptServiceService.get(srvId);
+        PtService ptService = ptServiceService.getById(srvId);
         Optional.ofNullable(ptService).orElseThrow(() -> new CheckException("url invalid"));
         List<PtServiceReturn> ptServiceReturnList = ptServiceReturnService.selectPtServiceReturnBySrvId(srvId);
 

ruoyi-ui/src/api/gateway/gatewayRouters.js

@@ -37,4 +37,13 @@ export function getGatewayRoutersList(data) {
     });
 }
 
-
+/**
+ * 查询选择器列表
+ * @param data
+ */
+export function getGatewayRouters() {
+    return request({
+        url: `/gateway/routes/list`,
+        method: "get",
+    });
+}

ruoyi-ui/src/views/monitor/service/index.vue

@@ -35,11 +35,7 @@
       <gw-card style="width: 40%;">
         <template v-slot:title>
           <div style="display: flex;align-items: center;justify-content: space-between;">
-            <div>
-              <span>模型调用次数</span>
-              <span style="color: #79bbff;">&nbsp;{{ modelTypeCallCount }}&nbsp;</span>
-              <span>次</span>
-            </div>
+            <div>模型调用次数统计</div>
             <el-segmented v-model="dateType" :options="dateTypeOptions" @change="initChartTop3"/>
           </div>
         </template>