Skip to content

M
map-parent
Commit cc521e48 by 宋珺琪
Options

bz-关键词bug调整

parent 5096e9f5
Showing with 90 additions and 22 deletions
service/publicapi/src/main/java/com/founder/publicapi/controller/ypglController/AsjbzController.java
......@@ -226,10 +226,8 @@ public class AsjbzController implements BasicProcessor {
System.out.println("开始时间=="+startTime);
System.out.println("结束时间=="+endTime);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
tbStAsj.setDjsj(dateFormat.parse(startTime));
tbStAsj.setDjsjEnd(dateFormat.parse(endTime));
System.out.println(tbStAsj.getDjsj());
System.out.println(tbStAsj.getDjsjEnd());
// tbStAsj.setDjsj(dateFormat.parse(startTime));
// tbStAsj.setDjsjEnd(dateFormat.parse(endTime));
} catch (Exception e) {
e.printStackTrace();
}
......@@ -272,7 +270,7 @@ public class AsjbzController implements BasicProcessor {
}
tbStAsj.setZjList(list);
}
// asjfssj_asjfskssj
list1 = YpglAsjService.selectAsjBybz(tbStAsj);
integer = YpglAsjService.selectAsjBybzCount(tbStAsj);
......@@ -475,6 +473,76 @@ public class AsjbzController implements BasicProcessor {
}
return resultJSON;
}
//标签研判线程定时任务
public ProcessResult process(TaskContext context) throws Exception{
JSONObject resultJSON = new JSONObject();
ExecutorService executorService = Executors.newFixedThreadPool(1000);
try{
int i1 = YpglAsjService.updateStAsjbz(); //删除表中所有数据
System.out.println(i1);
/*
Properties p = new Properties();
String endTime = p.getProperty("endTime");
String startTime = p.getProperty("startTime");
System.out.println("开始时间=="+startTime);
System.out.println("结束时间=="+endTime);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
tbStAsj.setDjsj(dateFormat.parse(startTime));
tbStAsj.setDjsjEnd(dateFormat.parse(endTime));*/
TbXwAsjbzKeyword tbXwAsjbzKeyword = new TbXwAsjbzKeyword();
TbStAsj tbStAsj = new TbStAsj();
// 案件类别代码模糊查询
if (null != tbStAsj.getAjlbdm() && !"".equals(tbStAsj.getAjlbdm())) {
// 根据规则截取前三位
String ajlbdm = "";
if (tbStAsj.getAjlbdm().endsWith("000")) {
ajlbdm = tbStAsj.getAjlbdm().substring(0, 3);
} else {
ajlbdm = tbStAsj.getAjlbdm();
}
tbStAsj.setAjlbdm(ajlbdm);
}
List<TbStAsj> asjListAll = YpglAsjService.findAsjxxList(tbStAsj);
List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordByCondition(tbXwAsjbzKeyword);
System.out.println("案件数量=="+asjListAll.size());
int ajcount = asjListAll.size();
System.out.println("同义词数量==="+tbXwAsjbzKeywords.size());
List<Asjbz> asjbzs = tbXwAsjbzKeywordService.selectKeyList();
System.out.println("案件数量========"+asjbzs.size());
for (int i=0;i<asjListAll.size();i++){
RunMatchJYAQ runMatchJYAQ = new RunMatchJYAQ(asjListAll.get(i),tbXwAsjbzKeywords,asjbzs);
executorService.execute(runMatchJYAQ);
}
executorService.shutdown();
while (0 < ajcount){
int count = YpglAsjService.selectBzCount();
if(count >= ajcount){
break;
}
System.out.println("案件数量"+count);
}
resultJSON.put("status","success");
resultJSON.put("message", "成功");
return new ProcessResult(true, "认定定时任务完成");
}catch (Exception e){
e.printStackTrace();
executorService.shutdown();
resultJSON.put("status","fail");
resultJSON.put("message", e.getMessage());
return new ProcessResult(false, "认定定时任务失败");
}
}
class RunMatchJYAQ extends Thread{
......@@ -675,7 +743,7 @@ public class AsjbzController implements BasicProcessor {
}
}
public ProcessResult process(TaskContext context) throws Exception {
/* public ProcessResult process1(TaskContext context) throws Exception {
System.out.println("-----------------------日程定时任务启动");
System.out.println();
JSONObject resultJSON = new JSONObject();
......@@ -733,7 +801,7 @@ public class AsjbzController implements BasicProcessor {
return new ProcessResult(false, "认定定时任务失败");
}
}
}*/
/**
* ^
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/DataStatisticsMapperCqxz.xml
......@@ -172,7 +172,7 @@
a.asjfsdd_Dqwd as asjfsddDqwd,
date_format(a.ASJFSSJ_ASJFSKSSJ,'%Y-%m-%d %H:%i:%s') AS asjfssjAsjfskssj,
z.bqyp as bqyp
from tb_st_asj a left JOIN tb_st_ajtztq z ON a.ASJBH = z.ASJBH where xxsc_pdbz='0'
from tb_st_asj a left JOIN tb_st_asjbz z ON a.ASJBH = z.ASJBH where xxsc_pdbz='0'
AND (zcjddm like '04%' or zcjddm like '06%')
<if test="xaStartTime!=null and xaStartTime!=''">
and ASJFSSJ_ASJFSKSSJ<![CDATA[>=]]> str_to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
......@@ -207,7 +207,7 @@
<if test="bqypList != null and bqypList.size() > 0">
and
<foreach collection="bqypList" index="index" item="bqyp" open="(" separator="or" close=")">
z.BQYP like '%'|| #{bqyp} || '%'
z.BQYP like "%"#{ bqyp , jdbcType=VARCHAR }"%"
</foreach>
</if>
limit 10000
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbXwAsjbzKeywordMapper.xml
......@@ -14,7 +14,7 @@
AND xxdjry_xm like "%"#{ xxdjry_xm , jdbcType=VARCHAR }"%"
</if>
<if test="djsj != null">
and to_char(djsj,'yyyy-mm-dd') = #{djsj , jdbcType=VARCHAR }
and DATE(djsj) = #{djsj , jdbcType=VARCHAR }
</if>
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh , jdbcType=VARCHAR }
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/YpglAsjMapper.xml
......@@ -77,7 +77,7 @@
and a.ASJFSSJ_ASJFSKSSJ <![CDATA[ <= ]]> #{asjfssj_asjfsjssj}
</if>
<if test="ajlbdm != null and ajlbdm != ''">
and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
AND a.ajlbdm LIKE CONCAT(#{ajlbdm, jdbcType=VARCHAR}, '%')
</if>
<if test="gxsj != null and gxsj != ''">
and a.gxsj <![CDATA[ >= ]]> #{gxsj}
......@@ -268,7 +268,7 @@
AND a.zatz_jyqk LIKE CONCAT(#{zatz_jyqk, jdbcType=VARCHAR}, '%')
</if>
<if test="ajxz != null and ajxz != ''">
AND z.AJXZ LIKE CONCAT('%', #{ajxz, jdbcType=VARCHAR}, '%')
AND Z.AJXZ LIKE CONCAT('%', #{ajxz, jdbcType=VARCHAR}, '%')
</if>
<if test="isKey != null and isKey != ''">
AND Z.ISKEY = #{isKey, jdbcType=VARCHAR}
......@@ -327,11 +327,11 @@
</if>
<if test="zjList != null and zjList.size() > 0">
<foreach collection="zjList" index="index" item="item" open="AND " close=" " separator="AND">
Z.zj like '%' || #{item , jdbcType=VARCHAR } || '%'
Z.zj LIKE CONCAT('%', #{item, jdbcType=VARCHAR}, '%')
</foreach>
</if>
<if test="keyword != null and keyword != ''">
and Z.keyword like '%' || #{keyword , jdbcType=VARCHAR } || '%'
AND Z.keyword LIKE CONCAT('%', #{keyword, jdbcType=VARCHAR}, '%')
</if>
<if test="asjbh != null and asjbh != ''">
and a.ASJBH = #{asjbh , jdbcType=VARCHAR }
......@@ -343,19 +343,19 @@
and a.djsj <![CDATA[ <= ]]> #{djsjEnd}
</if>
<if test="asjfskssj != null and asjfskssj != ''" >
and (a.asjfssj_asjfskssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
AND DATE_FORMAT(a.asjfssj_asjfskssj,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{asjfskssj}
</if>
<if test="asjfsjssj != null and asjfsjssj != ''">
and (a.asjfssj_asjfsjssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]> #{asjfsjssj}
AND DATE_FORMAT(a.asjfssj_asjfsjssj,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{asjfsjssj}
</if>
<if test="ajlbdm != null and ajlbdm != ''">
and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
AND a.ajlbdm LIKE CONCAT(#{ajlbdm, jdbcType=VARCHAR}, '%')
</if>
<if test="zatz_jyqk != null and zatz_jyqk != ''">
and a.zatz_jyqk like #{zatz_jyqk , jdbcType=VARCHAR } || '%'
AND a.zatz_jyqk LIKE CONCAT(#{zatz_jyqk, jdbcType=VARCHAR}, '%')
</if>
<if test="ajxz != null and ajxz != ''">
and z.ajxz like '%' || #{ajxz , jdbcType=VARCHAR } || '%'
AND Z.AJXZ LIKE CONCAT('%', #{ajxz, jdbcType=VARCHAR}, '%')
</if>
<if test="isKey != null and isKey != ''">
and Z.ISKEY = #{isKey , jdbcType=VARCHAR }
......@@ -369,7 +369,7 @@
select t1.*,
rownum as rn
from (
select a.*,Z.BZZT,Z.bqyp,Z.keyword,Z.ISKEY,z.ajxz from tb_st_asj a left join tb_st_asjbz Z on a.ASJBH = Z.ASJBH
select a.*,Z.BZZT,Z.bqyp,Z.keyword,Z.ISKEY,Z.ajxz from tb_st_asj a left join tb_st_asjbz Z on a.ASJBH = Z.ASJBH
where a.ASJBH = Z.ASJBH and a.ASJBH NOT IN (select a.ASJBH from tb_st_asj a left join tb_st_asjbz Z on a.ASJBH = Z.ASJBH
WHERE 1=1
<if test="bzzt != null and bzzt != ''">
......@@ -405,7 +405,7 @@
and a.zatz_jyqk like #{zatz_jyqk , jdbcType=VARCHAR } || '%'
</if>
<if test="ajxz != null and ajxz != ''">
and z.ajxz like '%' || #{ajxz , jdbcType=VARCHAR } || '%'
and Z.ajxz like '%' || #{ajxz , jdbcType=VARCHAR } || '%'
</if>
<if test="isKey != null and isKey != ''">
and Z.ISKEY = #{isKey , jdbcType=VARCHAR }
......@@ -455,7 +455,7 @@
and a.zatz_jyqk like #{zatz_jyqk , jdbcType=VARCHAR } || '%'
</if>
<if test="ajxz != null and ajxz != ''">
and z.ajxz like '%' || #{ajxz , jdbcType=VARCHAR } || '%'
and Z.ajxz like '%' || #{ajxz , jdbcType=VARCHAR } || '%'
</if>
<if test="isKey != null and isKey != ''">
and Z.ISKEY = #{isKey , jdbcType=VARCHAR }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment