From 0a68d1ae4a7e797342cf039a757fae4fc357faef Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 07 八月 2025 08:46:07 +0800
Subject: [PATCH] zjh202500807
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index e46ac4d..2d3af23 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -80,6 +80,8 @@
private TestMapper testMapper;
@Autowired
private AwsService awsService;
+ @Autowired
+ private ApiJcycpdgjzService apiJcycpdgjzService;
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
@@ -252,7 +254,7 @@
}
}
- List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
+ /* List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
log.info("澶栭�侀」鐩釜鏁�->{} 缁撴灉",awsList.size());
log.info(awsList.toString());
@@ -260,14 +262,14 @@
log.info("鍒犻櫎澶栭�侀」鐩垚鍔�");
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
- }
+ }*/
List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,hosp);
log.info("鍘焗ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
- List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
+ /* List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
if(null !=wssq && !wssq.isEmpty()){
log.info("澶栭�侀」涓�->{} 缁撴灉",wssq.toString());
hysqdList.addAll(wssq);
- }
+ }*/
if (null != hysqdList && !hysqdList.isEmpty()) {
log.info("鐜癶ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
for (LtkjHysqd hysqd : hysqdList) {
@@ -278,8 +280,8 @@
}
if (ltkjHysqdService.save(hysqd)) {
List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
- List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
- if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
+ /* List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+ if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);*/
ltkjHybgdService.saveBatch(hybgdList);
}
}
@@ -311,9 +313,27 @@
jcycxmService.deletedByTjh(s);
for (LtkjExamJcsqd jcsqd : jcsqdList) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ String regex = configService.selectConfigByKey("jcycxmzz");
+ if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
+// String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ if(StringUtil.isNotBlank(jg)){
+ boolean b = apiJcycpdgjz(jg);
+ if(!b){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(yqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ }
+
+ /* if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
TjJcycxm jcycxm=new TjJcycxm();
@@ -325,7 +345,7 @@
jcycxm.setCreateTime(new Date());
jcycxm.setJcjg(jg);
jcycxmService.save(jcycxm);
- }
+ }*/
}
}
}
@@ -458,7 +478,22 @@
System.out.println("jcycxmzz鍊间负"+regex);
String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ if(StringUtil.isNotBlank(jg)){
+ boolean b = apiJcycpdgjz(jg);
+ if(!b){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(yqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ }
+
+ /* if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.matches("\\d+") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
TjJcycxm jcycxm=new TjJcycxm();
@@ -470,7 +505,7 @@
jcycxm.setCreateTime(new Date());
jcycxm.setJcjg(jg);
jcycxmService.save(jcycxm);
- }
+ }*/
}
}
}
@@ -501,4 +536,14 @@
return AjaxResult.success();
}
+ public boolean apiJcycpdgjz(String jg) {
+ if(StringUtil.isNotBlank(jg)){
+ List<String> gjzList = apiJcycpdgjzService.getGjzList();
+ if(null !=gjzList && !gjzList.isEmpty()){
+ return gjzList.stream().anyMatch(jg::contains);
+ }
+ }
+ return false;
+ }
+
}
--
Gitblit v1.8.0