From ebfa0582ba5f87787c2d57aef6874e7e223bdd45 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Tue, 10 Jun 2025 21:24:16 +0800 Subject: [PATCH] updates --- .../java/org/jeecg/common/util/RestUtil.java | 2 +- .../YxHistoryMajorEnrollController.java | 60 ++++++++++++++++++- .../yx/mapper/YxHistoryMajorEnrollMapper.java | 2 + .../mapper/xml/YxHistoryMajorEnrollMapper.xml | 22 +++++++ .../service/IYxHistoryMajorEnrollService.java | 2 + .../impl/YxCalculationMajorServiceImpl.java | 8 +++ .../impl/YxHistoryMajorEnrollServiceImpl.java | 21 ++++++- .../modules/yx/util/SiliconFlowUtil.java | 35 +++++++++++ 8 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/SiliconFlowUtil.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java index fdf4a79..881420f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java @@ -219,7 +219,7 @@ public class RestUtil { * @return ResponseEntity */ public static ResponseEntity request(String url, HttpMethod method, HttpHeaders headers, JSONObject variables, Object params, Class responseType) { - log.info(" RestUtil --- request --- url = "+ url); + // log.info(" RestUtil --- request --- url = "+ url); if (StringUtils.isEmpty(url)) { throw new RuntimeException("url 不能为空"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java index 9198d72..4a422ac 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.yx.util.SiliconFlowUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -211,12 +212,69 @@ public class YxHistoryMajorEnrollController extends JeecgController majrseTest1(){ + LambdaQueryWrapper helqw = new LambdaQueryWrapper<>(); + List historyMajorEnrollList = yxHistoryMajorEnrollService.duplicateList(); + List list = null; + for (YxHistoryMajorEnroll yxHistoryMajorEnroll : historyMajorEnrollList) { + yxHistoryMajorEnroll.getSchoolCode(); + helqw.clear(); + helqw.eq(YxHistoryMajorEnroll::getSchoolCode,yxHistoryMajorEnroll.getSchoolCode()); + helqw.eq(YxHistoryMajorEnroll::getMajorName,yxHistoryMajorEnroll.getMajorName()); + helqw.eq(YxHistoryMajorEnroll::getCategory,yxHistoryMajorEnroll.getCategory()); + helqw.eq(YxHistoryMajorEnroll::getBatch,yxHistoryMajorEnroll.getBatch()); + helqw.eq(YxHistoryMajorEnroll::getMajorType,yxHistoryMajorEnroll.getMajorType()); + helqw.eq(YxHistoryMajorEnroll::getYear,yxHistoryMajorEnroll.getYear()); + list = yxHistoryMajorEnrollService.list(helqw); + for (YxHistoryMajorEnroll historyMajorEnroll : list) { + if (StringUtils.isNotBlank(historyMajorEnroll.getDetail())) { + String s = SiliconFlowUtil.callSiliconFlowAPI(historyMajorEnroll.getDetail()); + s = s.replace("\n",""); + if (!"null".equals(s)) { + System.out.println(s); + historyMajorEnroll.setMajorName(historyMajorEnroll.getMajorName()+"（"+s+"）"); + yxHistoryMajorEnrollService.updateById(historyMajorEnroll); + } +// String[] split = historyMajorEnroll.getDetail().split("只招收"); +// System.out.println(split); +// if(split.length == 1){ +// split = historyMajorEnroll.getDetail().split("只招"); +// } +// +// if(split.length == 1){ +// if(historyMajorEnroll.getDetail().split("；").length>1){ +// split = historyMajorEnroll.getDetail().split("；"); +// }else if(historyMajorEnroll.getDetail().split(";").length>1){ +// split = historyMajorEnroll.getDetail().split(";"); +// } +// } +// +// if(split.length>1){ +// String[] split1 = null; +// if(split[1].split("\\)").length>1){ +// split1 = split1[0].split("\\)"); +// }else if(split[1].split("\\）").length==1){ +// split1 = split[1].split("\\）"); +// } +// if(split1.length>0){ +// historyMajorEnroll.setMajorName(historyMajorEnroll.getMajorName()+"（"+ split1[0]+"）"); +// yxHistoryMajorEnrollService.updateById(historyMajorEnroll); +// } +// } + + } + } + } + return Result.OK("操作成功"); + } + @ApiOperation(value = "更新25年专业") @PostMapping(value = "/insertNewMajorList") public Result insertNewMajorList() { LambdaQueryWrapper helqw = new LambdaQueryWrapper<>(); helqw.eq(YxHistoryMajorEnroll::getYear,"2024"); - helqw.eq(YxHistoryMajorEnroll::getMajorType,"表演类"); +// helqw.eq(YxHistoryMajorEnroll::getMajorType,"表演类"); List list = yxHistoryMajorEnrollService.list(helqw); LambdaQueryWrapper smlqw = new LambdaQueryWrapper<>(); smlqw.eq(YxSchoolMajor::getMajorType,"表演类"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxHistoryMajorEnrollMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxHistoryMajorEnrollMapper.java index 6c006b2..0db1b8b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxHistoryMajorEnrollMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxHistoryMajorEnrollMapper.java @@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface YxHistoryMajorEnrollMapper extends BaseMapper { List getDataGroupBySchoolCodeAndMaxYear(@Param("professionalCategory")String professionalCategory,@Param("schoolCodeList") List schoolCodeList); + + List duplicateList(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxHistoryMajorEnrollMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxHistoryMajorEnrollMapper.xml index ee8b516..c68954b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxHistoryMajorEnrollMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxHistoryMajorEnrollMapper.xml @@ -28,4 +28,26 @@ + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java index cd49393..bd898eb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java @@ -40,4 +40,6 @@ public interface IYxHistoryMajorEnrollService extends IService duplicateList(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index 5424088..aacce7d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -580,6 +580,14 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl majorEnrollMap = new LinkedHashMap<>(); for (YxHistoryMajorEnroll h : yxHistoryMajorEnrollList) { - key = h.getYear() + a_ + h.getSchoolCode() + a_ + h.getMajorName() + a_ + h.getCategory() + a_ + h.getBatch(); + key = ""; + if ("表演类".equals(h.getMajorType())) { + key = h.getMajorTypeChild() + "_"; + }else if ("音乐类".equals(h.getCategory())) { + key = h.getMajorTypeChild() + "_" + h.getMainSubjects(); + } + key += h.getYear() + a_ + h.getSchoolCode() + a_ + h.getMajorName() + a_ + h.getCategory() + a_ + h.getBatch(); majorEnrollMap.put(key, h); } //遍历，获取历年数据 添加到专业 的历年信息中 @@ -101,7 +107,13 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl duplicateList() { + return baseMapper.duplicateList(); + } + public static void main(String[] args) { int i = 10150; String ss="'3E3NEWGE','YURDLQBC','LEQNLST2','JJN8R28Q','4GXJQ24D','FQL63UND','WJC35WEE','XCJPCSQH','EPJ6SWF3','DRSC4M5E','5YCTFS8D','79YXZFQM','UNKSTQXL','8GMLURG5','WFME5ZLQ','EWJ93S4B','A7BBLEPS','JM2CBSL4','TLBLVUX8','36HNSC75','P82RELPE','SSHNBFKY','GW5NLZBR','L49CR7JC','NB8ZYCLP','FR6WTCF4','7DA5M28U','367KUDPU','MBSS8AZF','8ZSGYBN7','HHTN8LBX','JDTT9V33','YZB69XPU','743KSHX3','4UZTQN2W','4KDXREMD','6UKZKYMR','HQ77CYCB','M4G646JH','6KGE5LK7','RPHU3KXB','RUDTS8VT','Z7JX6YKW','L6NS3FFF','VVPJWE5N','NXEWELUU','7V7EXCCG','HVCSB2YU','8PTCRA7M','8SKZCQTS','8SW5SHPW','U37VXEKZ','N2G7WG95','MRJDJTK8','YNBSSZ6C','4G8FNSDJ','M6P8NK7U','ZXTKRDKC','VNW28QKV','VY8XV35G','T6222R6F','L7FPZPGF','PWH3KZAC','T2XM828L','WF38KUCC','BC8H47MV','BXTK8GXS','7XBTRG3P','6FSQMKG7','KZS585HH','T3DQKF3D','5ZF947NW','27UHKVXG','6LW6LFYM','CUDLLAEV','UAQ8GTHS','FU4J5FJ6','X3L932LB','XW8VNQE2','XJUWC66V','K6M9527Y','YJCUN5P3','T5KW2QS5','VZXXYLQF','PPAY9GLQ','RKS4XBR3','SGK8SM9W','BHPXCWAB','9AFPCU34','SBE47E9Z','BNRA8S9L','UDD5PB3Z','59MHDGVK','PJZCQTVZ','2KCJDKJ6','BX44TFGC','MN4KY9UZ','T3JAKBDR','7XR8YNDT','KL8BCTG3'"; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/SiliconFlowUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/SiliconFlowUtil.java new file mode 100644 index 0000000..0d32dab --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/SiliconFlowUtil.java @@ -0,0 +1,35 @@ +package org.jeecg.modules.yx.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.util.RestUtil; + +import java.io.*; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.List; + +/** + * @author ZhouWenTao + * @create 2025-06-10 14:58 + */ +public class SiliconFlowUtil { + private static final String API_URL = "https://api.siliconflow.cn/v1/chat/completions"; + private static final String API_TOKEN = "sk-qddwvzpdzrojlnmrtrjpcbovphtoxkqwtinskkjtwaxjdeff"; // 替换为你的实际token + public static void main(String[] args) { + String response = callSiliconFlowAPI("你是谁"); + System.out.println("API Response:"); + System.out.println(response); + } + public static String callSiliconFlowAPI(String text){ + JSONObject jsonObject = new JSONObject(); + jsonObject.put("text", text); + JSONObject post = RestUtil.post("http://127.0.0.1:5100/chat", null, jsonObject); + JSONArray choices = post.getJSONArray("choices"); + List javaList = choices.toJavaList(JSONObject.class); +// javaList.forEach(jsonObject1 -> { +// System.out.println(jsonObject1.getJSONObject("message").getString("content")); +// }); + return javaList.get(0).getJSONObject("message").getString("content").replace("\\n",""); + } +}