yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2025-06-10 21:24:16 +08:00
parent 4eff859075
commit ebfa0582ba
8 changed files with 148 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
View File

@ -219,7 +219,7 @@ public class RestUtil {
* @return ResponseEntity<responseType>
*/
public static <T> ResponseEntity<T> request(String url, HttpMethod method, HttpHeaders headers, JSONObject variables, Object params, Class<T> responseType) {
log.info(" RestUtil --- request --- url = "+ url);
// log.info(" RestUtil --- request --- url = "+ url);
if (StringUtils.isEmpty(url)) {
throw new RuntimeException("url 不能为空");
}

60
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
View File

@ -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<YxHistoryMaj
return Result.OK("操作成功");
}
@PostMapping("/majrseTest1")
public Result<?> majrseTest1(){
LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
List<YxHistoryMajorEnroll> historyMajorEnrollList = yxHistoryMajorEnrollService.duplicateList();
List<YxHistoryMajorEnroll> 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<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
helqw.eq(YxHistoryMajorEnroll::getYear,"2024");
helqw.eq(YxHistoryMajorEnroll::getMajorType,"表演类");
// helqw.eq(YxHistoryMajorEnroll::getMajorType,"表演类");
List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw);
LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>();
smlqw.eq(YxSchoolMajor::getMajorType,"表演类");

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxHistoryMajorEnrollMapper.java
View File

@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface YxHistoryMajorEnrollMapper extends BaseMapper<YxHistoryMajorEnroll> {
List<YxHistoryMajorEnroll> getDataGroupBySchoolCodeAndMaxYear(@Param("professionalCategory")String professionalCategory,@Param("schoolCodeList") List<String> schoolCodeList);
List<YxHistoryMajorEnroll> duplicateList();
}

22
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxHistoryMajorEnrollMapper.xml
View File

@ -28,4 +28,26 @@
<!-- ) ss-->
<!-- GROUP BY school_code;-->
</select>
<select id="duplicateList" resultType="org.jeecg.modules.yx.entity.YxHistoryMajorEnroll">
SELECT
school_code,
batch,
major_name,
category,
major_type_child,
year,
major_type,
COUNT(*) AS duplicate_count
FROM
yx_history_major_enroll
WHERE
major_type = '音乐类'
AND year = '2024'
GROUP BY
school_code, batch, major_name, category,major_type_child
HAVING
COUNT(*) > 1
ORDER BY
duplicate_count DESC;
</select>
</mapper>

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java
View File

@ -40,4 +40,6 @@ public interface IYxHistoryMajorEnrollService extends IService<YxHistoryMajorEnr
* 更新省控线
*/
void renewControlLine(String id);
List<YxHistoryMajorEnroll> duplicateList();
}

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
View File

@ -580,6 +580,14 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
}
}
if("体育类".equals(professionalCategory) && "4615".equals(recommendMajorDTO.getSchoolCode())
&& recommendMajorDTO.getMajorName().contains("休闲体育")){
System.out.println("qvq");
}else if("体育类".equals(professionalCategory) && "5510".equals(recommendMajorDTO.getSchoolCode())
&& recommendMajorDTO.getMajorName().contains("体育教育")){
System.out.println("qvq");
}
if(recommendMajorDTO.getSchoolCode().equals("6506") &&
recommendMajorDTO.getMajorName().equals("社会体育指导与管理")){
System.out.println("qvq");

21
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
View File

@ -88,7 +88,13 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
//将历年计划 组合成map对象
Map<String, YxHistoryMajorEnroll> 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<YxHistoryMajorE
//2022年
for (String year : historyYearsList) {
key = recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
key = "";
if ("表演类".equals(recommendMajorDTO.getMajorType())) {
key = recommendMajorDTO.getMajorTypeChild() + "_";
}else if ("音乐类".equals(recommendMajorDTO.getCategory())) {
key = recommendMajorDTO.getMajorTypeChild() + "_" + recommendMajorDTO.getMainSubjects();
}
key = key + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
yxHistoryMajorEnroll = majorEnrollMap.get(year + a_ + key);
if (yxHistoryMajorEnroll != null) {
//线差
@ -301,6 +313,11 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
}
}
@Override
public List<YxHistoryMajorEnroll> 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'";

35
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/SiliconFlowUtil.java Normal file
View File

@ -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<JSONObject> 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","");
}
}