Lin Qilong пре 2 недеља
родитељ
комит
c04edf29a8

+ 1 - 0
ruoyi-admin/src/main/resources/application-dev.yml

@@ -82,3 +82,4 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间(使用负值表示没有限制)
         max-wait: -1ms
+

+ 0 - 81
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/SCSSFMController.java

@@ -1,81 +0,0 @@
-package com.ruoyi.interfaces.controller;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.JSONPath;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.OkHttpUtils;
-import com.ruoyi.interfaces.service.BizDataShowConfigService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Shanghai Coastal Storm Surge Forecast Model
- * 上海沿海风暴潮顾报模型 自定义接口
- */
-@RestController
-@RequestMapping("/SCSSFM")
-public class SCSSFMController extends BaseController {
-
-    @Autowired
-    private BizDataShowConfigService bizDataShowConfigService;
-
-    @ApiOperation("根据主键获取数据")
-    @PostMapping(value = "/getCalResultsByStation")
-    public AjaxResult createContainer(@RequestBody Map<String, Object> params) {
-        Map<String, Object> stationParams = new HashMap<>();
-        stationParams.put("projectId", params.get("projectId"));
-        stationParams.put("forecastSchemeId", params.get("forecastSchemeId"));
-        stationParams.put("userName", "shfbc");
-
-        String stationResponseString = OkHttpUtils.executeRequest(
-                "http://169.97.234.19:2111/RiverStrongAPI2.0/StormSurgeForecast/StormSurge/BaseInfo/GetForecastStationInfos",
-                "GET",
-                stationParams,
-                null,
-                null,
-                null
-        );
-        JSONObject stationResponseObj = JsonUtils.jsonToPojo(stationResponseString, JSONObject.class);
-        List<Map<String, Object>> stationList = (List<Map<String, Object>>) JSONPath.eval(stationResponseObj, "$.data");
-
-        String responseString = OkHttpUtils.executeRequest(
-                "http://169.97.234.19:2111/RiverStrongAPI2.0/StormSurgeForecast/StormSurge/Calculate/GetCalResultsByStation",
-                "POST",
-                null,
-                JsonUtils.objectToJson(params),
-                null,
-                null
-        );
-        JSONObject responseObj = JsonUtils.jsonToPojo(responseString, JSONObject.class);
-        List<Map<String, Object>> calResultsList = (List<Map<String, Object>>) JSONPath.eval(responseObj, "$.data");
-
-        calResultsList.forEach(item -> {
-            Map<String, Object> station = stationList.stream()
-                    .filter(s -> String.valueOf(s.get("stationCode")).equals(item.get("stationCode")))
-                    .findFirst()
-                    .orElse(null);
-
-            Optional.ofNullable(station).ifPresent(s -> {
-                item.put("stationType", s.get("stationType"));
-                item.put("sensorType", s.get("sensorType"));
-                item.put("lgtd", s.get("lgtd"));
-                item.put("lttd", s.get("lttd"));
-                item.put("order", s.get("order"));
-            });
-        });
-
-        return AjaxResult.success(calResultsList);
-    }
-
-}

+ 1 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/SysMetaDatasourceController.java

@@ -38,6 +38,7 @@ public class SysMetaDatasourceController extends BaseController {
 
     @Autowired
     private SM4Util sm4Util;
+
     /**
      * 查询数据源管理列表
      */

+ 0 - 396
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/SysSearchController.java

@@ -1,396 +0,0 @@
-//package com.ruoyi.interfaces.controller;
-//
-//import cn.com.goldenwater.app.gx.utils.JsonMapper;
-//import cn.com.goldenwater.app.gx.utils.LoggerUtils;
-//import com.ruoyi.interfaces.mapper.SysSearchMapper;
-//import com.ruoyi.interfaces.domain.SysSearch;
-//import cn.com.goldenwater.cmp.search.utils.ElasticSearchUtils;
-//import com.ruoyi.interfaces.core.page.Page;
-//import com.ruoyi.interfaces.core.page.PageUtils;
-//import com.ruoyi.common.core.controller.BaseController;
-//import com.ruoyi.common.core.domain.AjaxResult;
-//import com.ruoyi.common.utils.uuid.IdUtils;
-//import com.github.pagehelper.PageHelper;
-//import com.github.pagehelper.PageInfo;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.apache.commons.lang3.StringUtils;
-//import org.apache.http.HttpResponse;
-//import org.apache.http.client.methods.HttpGet;
-//import org.apache.http.client.methods.HttpRequestBase;
-//import org.apache.http.client.protocol.HttpClientContext;
-//import org.apache.http.impl.client.DefaultHttpClient;
-//import org.apache.http.params.CoreConnectionPNames;
-//import org.apache.http.util.EntityUtils;
-//import org.elasticsearch.ElasticsearchException;
-//import org.elasticsearch.action.DocWriteResponse;
-//import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-//import org.elasticsearch.action.index.IndexResponse;
-//import org.elasticsearch.client.RestHighLevelClient;
-//import org.elasticsearch.rest.RestStatus;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.servlet.ModelAndView;
-//
-//import javax.servlet.ServletOutputStream;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.UnsupportedEncodingException;
-//import java.net.HttpURLConnection;
-//import java.net.MalformedURLException;
-//import java.net.URL;
-//import java.util.Enumeration;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//@RestController
-//@RequestMapping("/sys/search")
-//public class SysSearchController extends BaseController {
-//    private static Logger logger = LoggerFactory.getLogger(SysSearchController.class);
-//
-//    @Autowired
-//    private SysSearchMapper sysSearchMapper;
-//
-//    @Autowired
-//    private RestHighLevelClient client;
-//
-//    @Value("${httpHost.host}")
-//    private String host;
-//
-//    @Value("${httpHost.port}")
-//    private String port;
-//
-//    @ApiOperation("添加索引")
-//    @RequestMapping(value = "/add")
-//    public AjaxResult add(SysSearch fullIndex) {
-//        fullIndex.setId(IdUtils.simpleUUID());
-//        return sysSearchMapper.insert(fullIndex) > 0 ? AjaxResult.success() : AjaxResult.error();
-//    }
-//
-//    @ApiOperation("删除索引")
-//    @RequestMapping("/del")
-//    public AjaxResult del(String ids) throws Exception {
-//        String[] strs = ids.split(",");
-//        int delete = 0;
-//        for (String str : strs) {
-//            SysSearch sysSearch = sysSearchMapper.selectByPrimaryKey(str);
-//            if ("1".equals(sysSearch.getFlag())) {
-//                ElasticSearchUtils.delIndex(client, sysSearch.getTitle());
-//            }
-//            delete += sysSearchMapper.deleteByPrimaryKey(str);
-//        }
-//        return delete == strs.length ? AjaxResult.success() : AjaxResult.error();
-//    }
-//
-//    @ApiOperation("修改索引")
-//    @RequestMapping("/update")
-//    public AjaxResult update(SysSearch fullIndex) {
-//        /*RestHighLevelClient client, String index, String type, String id, String content*/
-//        if ("1".equals(sysSearchMapper.selectByPrimaryKey(fullIndex.getId()).getFlag())) {
-//            // ElasticSearchUtils.updateDocument(client , fullIndex.getName() ,"",fullIndex.getId(), fullIndex.getProp());
-//        }
-//        return sysSearchMapper.updateByPrimaryKeyWithBLOBs(fullIndex) > 0 ? AjaxResult.success() : AjaxResult.error();
-//    }
-//
-//    @ApiOperation("查询所有")
-//    @RequestMapping("/list")
-//    public Page list(int page, int rows, SysSearch fullIndex) {
-//        PageHelper.startPage(page, rows);
-//        List<SysSearch> list = sysSearchMapper.selectAll(fullIndex);
-//        PageInfo<SysSearch> pageInfo = new PageInfo<SysSearch>(list);
-//        return PageUtils.convert(pageInfo);
-//    }
-//
-//    @ApiOperation("去编辑页面")
-//    @RequestMapping("/to_edit")
-//    public ModelAndView toEdit(String id) {
-//        ModelAndView modelAndView = new ModelAndView();
-//        modelAndView.addObject("fullIndex", sysSearchMapper.selectByPrimaryKey(id));
-//        modelAndView.setViewName("mng/sys_search_edit");
-//        return modelAndView;
-//    }
-//
-//    @ApiOperation("同步")
-//    @RequestMapping("/sync")
-//    public AjaxResult sync(SysSearch sysSearch) throws Exception {
-//        sysSearch.setFlag("1");
-//        sysSearch = sysSearchMapper.selectByPrimaryKey(sysSearch.getId());
-//        AjaxResult AjaxResult = syncConnetion(sysSearch.getTitle(), sysSearch.getAliases(), sysSearch.getType(), sysSearch.getProp());
-//        if (AjaxResult != null && AjaxResult.isSuccess()) {
-//            sysSearch.setFlag("1");
-//            return sysSearchMapper.updateFlag(sysSearch) > 0 ? AjaxResult.success() : AjaxResult.error();
-//        }
-//        return AjaxResult;
-//    }
-//
-//    /**
-//     * 同步连接
-//     *
-//     * @param
-//     */
-//    public AjaxResult syncConnetion(@RequestParam(required = true) String index,
-//                                      @RequestParam(required = false) String alias,
-//                                      @RequestParam(required = false) String type,
-//                                      @RequestParam(required = true) String source) throws Exception {
-//        //判断网络连接状态
-//        boolean flag = client.ping();
-//        if (!flag) {
-//            return AjaxResult.error("网络连接错误!");
-//        } else {
-//            //操作
-//            //1、判断别名存不存在,如果不存在,则将索引名称与别名一致
-//            if (StringUtils.isBlank(alias)) {
-//                alias = index;
-//            }
-//            if (StringUtils.isBlank(type)) {
-//                type = index;
-//            }
-//            //2、判断索引是否存在
-//            try {
-//                CreateIndexResponse response = ElasticSearchUtils.addIndex(client, index, alias, type, source);
-//                if (response.isAcknowledged()) {////指示是否所有节点都已确认请求
-//                    return AjaxResult.success();
-//                } else {
-//                    return AjaxResult.success("此索引已创建,但有节点未确认!");
-//                }
-//                //}
-//            } catch (ElasticsearchException e) {
-//                //在此处调用
-//                logger.error(e.getLocalizedMessage(), e);
-//                if (e.status() == RestStatus.FOUND) {
-//                    //如果没有找到要删除的索引,要执行某些操作
-//                    return AjaxResult.error("此索引已创建!");
-//                } else {
-//                    return AjaxResult.error(e);
-//                }
-//            }
-//        }
-//    }
-//
-//    @ApiOperation("查看索引详情")
-//    @RequestMapping(value = "/selects")
-//    public ModelAndView selects(String id) throws Exception {
-//        ModelAndView modelAndView = new ModelAndView();
-//        SysSearch sysSearch = sysSearchMapper.selectByPrimaryKey(id);
-//        String url = "http://" + host + ":" + port + "/" + sysSearch.getTitle();
-//        modelAndView.addObject("searchMess", connectServlet(url));
-//        modelAndView.setViewName("mng/sys_search_xq");
-//        return modelAndView;
-//    }
-//
-//    /**
-//     * 获取访问的内容
-//     *
-//     * @return
-//     */
-//    public String connectServlet(String u) throws Exception {
-//        String result = null;
-//        try {
-//            InputStream is = httpRequestToStream(u);
-//            byte[] b = new byte[is.available()];
-//            is.read(b);
-//            result = new String(b);
-//        } catch (IOException e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        }
-//        return result;
-//    }
-//
-//    /**
-//     * <pre>
-//     * 方法体说明:向远程接口发起请求,返回字节流类型结果
-//     * 作者:itar
-//     * 日期:2015年3月17日 上午11:20:25
-//     * @param url 接口地址
-//     * @return InputStream 返回结果
-//     * </pre>
-//     */
-//    public static InputStream httpRequestToStream(String url) {
-//
-//        InputStream is = null;
-//        try {
-//            String parameters = "";
-//            boolean hasParams = false;
-//
-//            if (hasParams) {
-//                parameters = parameters.substring(0, parameters.length() - 1);
-//            }
-//
-//
-//            URL u = new URL(url);
-//            HttpURLConnection conn = (HttpURLConnection) u.openConnection();
-//
-//            //请求的参数类型(使用restlet框架时,为了兼容框架,必须设置Content-Type为“”空)
-//            conn.setRequestProperty("Content-Type", "application/octet-stream");
-//            //conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-//            //设置连接超时时间
-//            conn.setConnectTimeout(50000);
-//            //设置读取返回内容超时时间
-//            conn.setReadTimeout(50000);
-//            //设置向HttpURLConnection对象中输出,因为post方式将请求参数放在http正文内,因此需要设置为ture,默认false
-//
-//            //设置从HttpURLConnection对象读入,默认为true
-//            conn.setDoInput(true);
-//            //设置是否使用缓存,post方式不能使用缓存
-//
-//            //设置请求方式,默认为GET
-//            conn.setRequestMethod("GET");
-//
-//            //post方式需要将传递的参数输出到conn对象中
-//
-//            //从HttpURLConnection对象中读取响应的消息
-//            //执行该语句时才正式发起请求
-//            is = conn.getInputStream();
-//        } catch (UnsupportedEncodingException e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        } catch (MalformedURLException e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        } catch (IOException e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        }
-//        return is;
-//    }
-//
-//
-//    @ApiOperation("/删除search中的某个索引")
-//    @RequestMapping(value = "/del_search")
-//    public AjaxResult delSearch(String index) throws Exception {
-//        return ElasticSearchUtils.delIndex(client, index) ? AjaxResult.success() : AjaxResult.error();
-//    }
-//
-//    @ApiOperation("/去添加文档界面")
-//    @RequestMapping(value = "/to_add_dox")
-//    public ModelAndView toAddDox(String id) {
-//        ModelAndView modelAndView = new ModelAndView();
-//        SysSearch sysSearch = sysSearchMapper.selectByPrimaryKey(id);
-//        modelAndView.addObject("sysSearch", sysSearch);
-//        modelAndView.setViewName("mng/sys_search_doc");
-//        return modelAndView;
-//    }
-//
-//    @ApiOperation("/添加文档")
-//    @RequestMapping(value = "/add_dox")
-//    public AjaxResult addDox(String index, HttpServletRequest request) {
-//        Enumeration<String> enumeration = request.getParameterNames();
-//        Map map = new HashMap();
-//        while (enumeration.hasMoreElements()) {
-//            String key = (String) enumeration.nextElement();
-//            String value = request.getParameter(key);
-//            map.put(key, value);
-//        }
-//        try {
-//
-//            //  Map data = new HashMap();
-//            //  data.put("id",IdUtils.simpleUUID());
-//            //  data.put("author","lpj");
-//            //  data.put("publish_date","2018-08-29");
-//
-//            //  IndexResponse indexResponse = ElasticSearchUtils.addDocument(client ,index,"test", data  );
-//
-//            IndexResponse indexResponse = ElasticSearchUtils.addDocument(client, index, (String) map.get("type"), map);
-//
-//            if (indexResponse.getResult() == DocWriteResponse.Result.CREATED) {
-//                return AjaxResult.success();
-//            }
-//        } catch (Exception e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        }
-//
-//        return AjaxResult.error();
-//    }
-//
-//    @ApiOperation("删除文档")
-//    @RequestMapping(value = "/del_doc")
-//    public AjaxResult delDoc(String index, String id, String type) {
-//        try {
-//            ElasticSearchUtils.delDocument(client, index, type, IdUtils.simpleUUID());
-//            return AjaxResult.success();
-//        } catch (Exception e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        }
-//
-//        return AjaxResult.error();
-//    }
-//
-//    @ApiOperation("/修改文档")
-//    @RequestMapping(value = "/update_doc")
-//    public AjaxResult updateDoc(String index, String type, String id, String content) {
-//        try {
-//            ElasticSearchUtils.updateDocument(client, index, type, id, content);
-//            return AjaxResult.success();
-//        } catch (Exception e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        }
-//        return AjaxResult.error();
-//    }
-//
-//    @ApiOperation("搜索")
-//    @RequestMapping(value = "/search")
-//    public void search(String content, HttpServletResponse response) throws Exception {
-//        String url = "http://" + host + ":" + port + "/test/_search?q=" + content.replace(" ", "");
-//        ServletOutputStream out = response.getOutputStream();
-//        out.write(httpRequestToString(url).getBytes("utf-8"));
-//    }
-//
-//
-//    /**
-//     * <pre>
-//     * 方法体说明:向远程接口发起请求,返回字符串类型结果
-//     * @param url 接口地址
-//     * @return String 返回结果
-//     * </pre>
-//     */
-//    public static String httpRequestToString(String url) {
-//        //接口返回结果
-//        String methodResult = null;
-//        try {
-//            String parameters = "";
-//            boolean hasParams = false;
-//
-//            if (hasParams) {
-//                parameters = parameters.substring(0, parameters.length() - 1);
-//            }
-//
-//            //创建HttpClient连接对象
-//            DefaultHttpClient client = new DefaultHttpClient();
-//            HttpRequestBase method = null;
-//            method = new HttpGet(url);
-//            method.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 6000);
-//            //设置参数内容类型
-//            method.addHeader("Content-Type", "application/x-www-form-urlencoded");
-//            //httpClient本地上下文
-//            HttpClientContext context = null;
-//
-//            //访问接口,返回状态码
-//            HttpResponse response = client.execute(method, context);
-//            //返回状态码200,则访问接口成功
-//            if (response.getStatusLine().getStatusCode() == 200) {
-//                methodResult = EntityUtils.toString(response.getEntity());
-//            }
-//            client.close();
-//        } catch (UnsupportedEncodingException e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        } catch (IOException e) {
-//            //在此处调用
-//            logger.error(e.getLocalizedMessage(), e);
-//        }
-//        return methodResult;
-//    }
-//
-//}

+ 0 - 110
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/TbModelsController.java

@@ -1,110 +0,0 @@
-package com.ruoyi.interfaces.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.interfaces.domain.TbModels;
-import com.ruoyi.interfaces.service.TbModelsService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 模型Controller
- * 
- * @author ruoyi
- * @date 2025-06-12
- */
-@RestController
-@RequestMapping("/tb/models")
-public class TbModelsController extends BaseController
-{
-    @Autowired
-    private TbModelsService tbModelsService;
-
-    /**
-     * 查询模型列表
-     */
-    @ApiOperation("查询模型列表")
-    @GetMapping("/list")
-    public TableDataInfo list(TbModels tbModels)
-    {
-        startPage();
-        List<TbModels> list = tbModelsService.selectTbModelsList(tbModels);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出模型列表
-     */
-    @ApiOperation("导出模型列表")
-    @Log(title = "模型", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, TbModels tbModels)
-    {
-        List<TbModels> list = tbModelsService.selectTbModelsList(tbModels);
-        ExcelUtil<TbModels> util = new ExcelUtil<TbModels>(TbModels.class);
-        util.exportExcel(response, list, "模型数据");
-    }
-
-    /**
-     * 获取模型详细信息
-     */
-    @ApiOperation("获取模型详细信息")
-    @GetMapping(value = "/{modelId}")
-    public AjaxResult getInfo(@PathVariable("modelId") Long modelId)
-    {
-        return success(tbModelsService.selectTbModelsByModelId(modelId));
-    }
-
-    /**
-     * 新增模型
-     */
-    @ApiOperation("新增模型")
-    @Log(title = "模型", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TbModels tbModels)
-    {
-        tbModels.setCreatedBy(getUsername());
-        tbModels.setCreatedTime(DateUtils.getNowDate());
-        return toAjax(tbModelsService.insertTbModels(tbModels));
-    }
-
-    /**
-     * 修改模型
-     */
-    @ApiOperation("修改模型")
-    @Log(title = "模型", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TbModels tbModels)
-    {
-        tbModels.setUpdatedBy(getUsername());
-        tbModels.setUpdatedTime(DateUtils.getNowDate());
-        return toAjax(tbModelsService.updateTbModels(tbModels));
-    }
-
-    /**
-     * 删除模型
-     */
-    @ApiOperation("删除模型")
-    @Log(title = "模型", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{modelIds}")
-    public AjaxResult remove(@PathVariable Long[] modelIds)
-    {
-        return toAjax(tbModelsService.deleteTbModelsByModelIds(modelIds));
-    }
-}

+ 0 - 3
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/TokenController.java

@@ -1,10 +1,7 @@
 package com.ruoyi.interfaces.controller;
 
-import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.interfaces.service.InterfaceTokenService;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+ 0 - 39
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/WorkflowController.java

@@ -1,39 +0,0 @@
-package com.ruoyi.interfaces.controller;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.interfaces.workflow.ExecutionResult;
-import com.ruoyi.interfaces.workflow.WorkflowEngine;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @author LinQiLong
- * @date 2025/7/16 10:08
- */
-@RestController
-@RequestMapping("/model/workflows")
-public class WorkflowController extends BaseController {
-
-    @Autowired
-    private WorkflowEngine engine;
-
-    @PostMapping("/{id}/execute")
-    public AjaxResult executeWorkflow(@PathVariable Long id, @RequestBody Map<String, Object> input) {
-        ExecutionResult result = engine.execute(id, input);
-        return AjaxResult.success(result);
-    }
-
-    /**
-     * 获取历史执行记录
-     * @param id
-     * @return
-     */
-    @GetMapping("/{id}/executions")
-    public AjaxResult getExecutions(@PathVariable Long id) {
-        return AjaxResult.success();
-    }
-
-}

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

@@ -88,7 +88,11 @@ public class PtServiceApplyServiceImpl implements PtServiceApplyService {
         Optional.ofNullable(service).ifPresent(s -> {
             PtService ptService = new PtService();
             ptService.setSrvId(s.getSrvId());
-            ptService.setApplyNum(s.getApplyNum() + 1);
+            if (s.getApplyNum() == null){
+                s.setApplyNum(1);
+            } else {
+                s.setApplyNum(s.getApplyNum() + 1);
+            }
             ptSrvService.updateById(ptService);
         });
 

+ 0 - 7
ruoyi-ui/src/views/Interactive.vue

@@ -1,11 +1,4 @@
 <template>
-  <el-row>
-    <el-col :span="24">
-      <div class="index_head">
-        <h3>打造数字平台,建设魅力中国</h3>
-      </div>
-    </el-col>
-  </el-row>
   <el-row :gutter="20" class="user-center" style="margin: 20px 0">
     <el-col :span="4" :offset="2">
       <el-card>

+ 0 - 7
ruoyi-ui/src/views/OpenData.vue

@@ -1,11 +1,4 @@
 <template>
-  <el-row>
-    <el-col :span="24">
-      <div class="index_head">
-        <h3>打造数字平台,建设魅力中国</h3>
-      </div>
-    </el-col>
-  </el-row>
   <el-row :gutter="20" style="margin: 0">
     <el-col :span="5" :offset="2">
       <router-view name="left"/>

+ 0 - 7
ruoyi-ui/src/views/UserCenter.vue

@@ -1,11 +1,4 @@
 <template>
-  <el-row>
-    <el-col :span="24">
-      <div class="index_head">
-        <h3>打造数字平台,建设魅力中国</h3>
-      </div>
-    </el-col>
-  </el-row>
   <el-row :gutter="20" class="user-center" style="margin: 20px 0">
     <el-col :span="3" :offset="2">
       <el-card>

+ 4 - 4
ruoyi-ui/src/views/service/gateway/index.vue

@@ -338,10 +338,10 @@ function submitForm() {
         return item.serviceName === form.value.serviceName;
       });
 
-      if (isDuplicate) {
-        proxy.$modal.msgError("该应用网关已存在,不需要添加");
-        return;
-      }
+      // if (isDuplicate) {
+      //   proxy.$modal.msgError("该应用网关已存在,不需要添加");
+      //   return;
+      // }
 
       form.value.resultSuccessFormat = JSON.stringify(form.value.resultSuccessFormatObj);
       saveGatewayRouter(form.value).then(response => {

+ 5 - 2
ruoyi-ui/src/views/service/info/AeService.vue

@@ -163,6 +163,7 @@
               :url="form.url"
               @forwardStep="forwardStep"
               @nextStep="nextStep"
+              @close="exit"
           ></param-and-file>
         </div>
         <div class="box" v-show="step === 2">
@@ -171,6 +172,7 @@
               :srvId="form.srvId"
               @forwardStep="forwardStep"
               @nextStep="nextStep"
+              @close="exit"
           ></service-file>
         </div>
       </el-card>
@@ -357,7 +359,8 @@ const submitForm = (name) => {
 
 // 监听器
 watch(() => route.query.isClose, (val) => {
-  if (val == "true") {
+  if (val === "true") {
+    this.$router.replace({query: {isClose: "false"}});
     exit();
   }
 }, {immediate: true});
@@ -412,4 +415,4 @@ onMounted(() => {
 .ae-service ::v-deep(.el-form-item) {
   margin-bottom: 20px;
 }
-</style>
+</style>

+ 7 - 2
ruoyi-ui/src/views/service/info/paramAndFile.vue

@@ -4,12 +4,14 @@
       <el-tab-pane label="请求参数" name="first">
         <p><label style="padding: 0 10px;">地址</label>{{ url }}</p>
         <el-divider></el-divider>
-        <service-param :srvId="srvId" :url="url" @forwardStep="forwardStep" @nextStep="nextStep"></service-param>
+        <service-param :srvId="srvId" :url="url" @forwardStep="forwardStep" @nextStep="nextStep"
+                       @close="exit"></service-param>
       </el-tab-pane>
       <el-tab-pane label="返回值" name="second">
         <p><label style="padding: 0 10px;">地址</label>{{ url }}</p>
         <el-divider></el-divider>
-        <service-return :srvId="srvId" :url="url" @forwardStep="forwardStep" @nextStep="nextStep"></service-return>
+        <service-return :srvId="srvId" :url="url" @forwardStep="forwardStep" @nextStep="nextStep"
+                        @close="exit"></service-return>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -36,6 +38,9 @@ export default {
     nextStep() {
       this.$emit("nextStep");
     },
+    exit() {
+      this.$emit("close");
+    },
   },
 };
 </script>

+ 1 - 5
ruoyi-ui/src/views/service/info/serviceFile.vue

@@ -296,11 +296,7 @@ export default {
     },
     // 退出
     exit() {
-      this.$nextTick(() => {
-        this.$router.replace({
-          query: {isClose: "true"},
-        });
-      });
+      this.$emit("close");
     },
   },
   watch: {

+ 20 - 24
ruoyi-ui/src/views/service/info/serviceParam.vue

@@ -9,6 +9,7 @@
         <col width="20%" align="center" valign="middle"/>
         <col width="14%" align="center" valign="middle"/>
       </colgroup>
+      <thead>
       <tr>
         <th>序号</th>
         <th>参数字段</th>
@@ -17,14 +18,16 @@
         <th>参数备注</th>
         <th>操作</th>
       </tr>
+      </thead>
+      <tbody>
       <tr v-for="(param, index) in serviceParamForm.params" :key="index">
         <td>
           {{ index + 1 }}
         </td>
         <td>
           <el-form-item
-            :prop="'params.' + index + '.paramCode'"
-            :rules="{
+              :prop="'params.' + index + '.paramCode'"
+              :rules="{
               required: true,
               message: '参数字段不能为空',
               trigger: 'blur',
@@ -35,8 +38,8 @@
         </td>
         <td>
           <el-form-item
-            :prop="'params.' + index + '.paramName'"
-            :rules="{
+              :prop="'params.' + index + '.paramName'"
+              :rules="{
               required: true,
               message: '参数名称不能为空',
               trigger: 'blur',
@@ -47,8 +50,8 @@
         </td>
         <td>
           <el-form-item
-            :prop="'params.' + index + '.paramType'"
-            :rules="{
+              :prop="'params.' + index + '.paramType'"
+              :rules="{
               required: true,
               message: '参数类型不能为空',
               trigger: 'blur',
@@ -56,10 +59,10 @@
           >
             <el-select v-model="param.paramType" placeholder="请选择">
               <el-option
-                v-for="item in paramTypes"
-                :key="item"
-                :label="item"
-                :value="item"
+                  v-for="item in paramTypes"
+                  :key="item"
+                  :label="item"
+                  :value="item"
               >
               </el-option>
             </el-select>
@@ -74,12 +77,13 @@
           <el-button @click.prevent="removeParam(param)"> 删除</el-button>
         </td>
       </tr>
+      </tbody>
     </table>
     <el-row type="flex" justify="center">
       <el-button
-        icon="ArrowLeft"
-        @click="forwardStep"
-        circle
+          icon="ArrowLeft"
+          @click="forwardStep"
+          circle
       ></el-button>
       <el-button @click="addParam">新增参数</el-button>
       <el-button type="primary" @click="submitForm('serviceParamForm')">
@@ -92,11 +96,7 @@
 </template>
 
 <script>
-import {
-  getServiceAllParam,
-  addServiceParam,
-  delServiceParam,
-} from "@/api/service/info";
+import {addServiceParam, delServiceParam, getServiceAllParam,} from "@/api/service/info";
 
 export default {
   props: ["srvId"],
@@ -201,11 +201,7 @@ export default {
     },
     // 退出
     exit() {
-      this.$nextTick(() => {
-        this.$router.replace({
-          query: {isClose: "true"},
-        });
-      });
+      this.$emit("close");
     },
   },
   watch: {
@@ -245,7 +241,7 @@ export default {
   padding: 5px;
 }
 
-#serviceParamTable td ::v-deep .el-form-item {
+#serviceParamTable td :deep(.el-form-item) {
   margin: 0;
 }
 </style>

+ 18 - 18
ruoyi-ui/src/views/service/info/serviceReturn.vue

@@ -13,15 +13,18 @@
         <col width="20%" align="center" valign="middle"/>
         <col width="14%" align="center" valign="middle"/>
       </colgroup>
-      <tr>
-        <th>序号</th>
-        <th>参数字段</th>
-        <th>参数名称</th>
-        <th>参数类型</th>
-        <th>参数备注</th>
-        <th>操作</th>
-      </tr>
-      <tr v-for="(param, index) in serviceReturnForm.params" :key="index">
+      <thead>
+        <tr>
+          <th>序号</th>
+          <th>参数字段</th>
+          <th>参数名称</th>
+          <th>参数类型</th>
+          <th>参数备注</th>
+          <th>操作</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="(param, index) in serviceReturnForm.params" :key="index">
         <td>
           {{ index + 1 }}
         </td>
@@ -78,6 +81,7 @@
           <el-button @click.prevent="removeReturn(param)"> 删除</el-button>
         </td>
       </tr>
+      </tbody>
     </table>
     <el-row type="flex" justify="center">
       <el-button
@@ -133,6 +137,10 @@ export default {
     nextStep() {
       this.$emit("nextStep");
     },
+    // 退出
+    exit() {
+      this.$emit("close");
+    },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -206,14 +214,6 @@ export default {
         });
       }
     },
-    // 退出
-    exit() {
-      this.$nextTick(() => {
-        this.$router.replace({
-          query: {isClose: "true"},
-        });
-      });
-    },
   },
   watch: {
     srvId: {
@@ -252,7 +252,7 @@ export default {
   padding: 5px;
 }
 
-#serviceReturnTable td ::v-deep .el-form-item {
+#serviceReturnTable td :deep(.el-form-item) {
   margin: 0;
 }
 </style>