Skip to content

Z
zzsn-cloud-kgj
提交 a6e17f38 作者: lihuawei
操作

科工局项目修改提交

上级 fcefafa1
正在显示 包含 216 行增加 和 7 行删除
zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/controller/CisAnsBasedataController.java
...@@ -135,7 +135,12 @@ public class CisAnsBasedataController extends JeecgController<CisAnsBasedata, IC ...@@ -135,7 +135,12 @@ public class CisAnsBasedataController extends JeecgController<CisAnsBasedata, IC
Page<CisAnsBasedata> page = new Page<>(pageNo, pageSize); Page<CisAnsBasedata> page = new Page<>(pageNo, pageSize);
int offset = (pageNo-1)*pageSize; int offset = (pageNo-1)*pageSize;
List<CisAnsBasedata> listBasedata = cisAnsBasedataMapper.getCisAnsBasedataList2(req.getParameter("publishDate_begin") String publishdate_start=req.getParameter("publishDate_begin");
if(StringUtils.isEmpty(publishdate_start)){
publishdate_start="2012-04-12 15:57:40";
}
List<CisAnsBasedata> listBasedata = cisAnsBasedataMapper.getCisAnsBasedataList2(publishdate_start
,req.getParameter("publishDate_end"), offset ,offset+pageSize,flag,webTypeList,siteId); ,req.getParameter("publishDate_end"), offset ,offset+pageSize,flag,webTypeList,siteId);
//把内容中的图片进行处理,加ip和端口，直接访问文件 //把内容中的图片进行处理,加ip和端口，直接访问文件
// List<CisAnsBasedata> collect = listBasedata.stream().map(baseData -> { // List<CisAnsBasedata> collect = listBasedata.stream().map(baseData -> {
...@@ -158,6 +163,93 @@ public class CisAnsBasedataController extends JeecgController<CisAnsBasedata, IC ...@@ -158,6 +163,93 @@ public class CisAnsBasedataController extends JeecgController<CisAnsBasedata, IC
page.setRecords(listBasedata); page.setRecords(listBasedata);
return Result.ok(page); return Result.ok(page);
} }
@ApiOperation(value = "CIS_ANS_BASEDATA-审核分页查询", notes="CIS_ANS_BASEDATA-根据参数传入的sysUser对象和分页控制参数，对数据进行数据库查询后，封装成page分页对象并返回")
@GetMapping(value = "/shenhe")
public Result<?> queryShenhePageList( CisAnsBasedata cisAnsBasedata,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Long flag = 0L;
if(StringUtils.isNotBlank(req.getParameter("delFlag"))){
flag = new Long(req.getParameter("delFlag"));
}
Long min = 0L;
if(StringUtils.isNotBlank(req.getParameter("min"))){
min = new Long(req.getParameter("min"));
}
Long max = 0L;
if(StringUtils.isNotBlank(req.getParameter("max"))){
max = new Long(req.getParameter("max"));
}
List<Long> webTypeList = getUserSiteType();
//网站ID
Long siteId = null;
if (StringUtils.isNotBlank(req.getParameter("siteId"))) {
siteId = new Long(req.getParameter("siteId"));
webTypeList = null;//当用网站ID作为参数时，网站类型webTypeList设为null
}
//当关键字不为空时候，走es搜索，否则走数据库查询
if (cisAnsBasedata != null && !StringUtils.isBlank(cisAnsBasedata.getTitle())) {
BaseDataDto baseDataDto = new BaseDataDto();
baseDataDto.setSearchKey(req.getParameter("title"));
baseDataDto.setPublishStartTime(req.getParameter("publishDate_begin"));
baseDataDto.setPublishEndTime(req.getParameter("publishDate_end"));
baseDataDto.setDelflag(flag);
baseDataDto.setPageNum(pageNo);
baseDataDto.setPageSize(pageSize);
baseDataDto.setSiteId(siteId);
baseDataDto.setMin(min.intValue());
baseDataDto.setMax(max.intValue());
log.info("信息列表查询入参：{}", baseDataDto);
long startTime = System.currentTimeMillis();
System.out.println("开始时间:" + startTime);
Page<CisAnsBasedata> result = cisAnsBasedataService.findEsByKey(baseDataDto,webTypeList);
long endTime = System.currentTimeMillis();
System.out.println("结束时间:" + startTime);
System.out.println("耗时：" + (endTime - startTime));
return Result.ok(result);
}
if (StringUtils.isNotBlank(req.getParameter("siteId"))) {
webTypeList = null;//当用网站ID作为参数时，网站类型webTypeList设为null
}
Page<CisAnsBasedata> page = new Page<>(pageNo, pageSize);
int offset = (pageNo-1)*pageSize;
String publishdate_start=req.getParameter("publishDate_begin");
if(StringUtils.isEmpty(publishdate_start)){
publishdate_start="2012-04-12 15:57:40";
}
List<CisAnsBasedata> listBasedata = cisAnsBasedataMapper.getCisAnsBasedataListByscore(publishdate_start
,req.getParameter("publishDate_end"), offset ,offset+pageSize,min,max,webTypeList,siteId);
//把内容中的图片进行处理,加ip和端口，直接访问文件
// List<CisAnsBasedata> collect = listBasedata.stream().map(baseData -> {
// Map<String, Object> contentFileTag = ContentFileFinder.getContentAllFileTag(baseData.getContentString(),"img");
// if (contentFileTag == null || contentFileTag.size() < 1) {
// return baseData;
// }
// //遍历map
// contentFileTag.forEach((key, value) -> {
// String newTag = HtmlUtils.appendHtmlTag(key, "img", "src", "src=\"" + FileAccessConstant.REAL_PATH, "\"");
// log.info("替换[{}]为[{}]",key,newTag);
// baseData.setContent(baseData.getContentString().replaceAll(key,newTag).getBytes());
// });
// return baseData;
// }).collect(Collectors.toList());
int cont = cisAnsBasedataMapper.getCisAnsBasedataCountByscore(publishdate_start
,req.getParameter("publishDate_end"), offset ,offset+pageSize,min,max,webTypeList,siteId
);
page.setTotal(cont);
page.setRecords(listBasedata);
return Result.ok(page);
}
/** /**
* 分页列表查询 * 分页列表查询
* *
......
zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/entity/BaseDataDto.java
...@@ -14,6 +14,9 @@ public class BaseDataDto { ...@@ -14,6 +14,9 @@ public class BaseDataDto {
private String publishEndTime; private String publishEndTime;
private Long delflag; private Long delflag;
private Long siteId; private Long siteId;
private Integer min;
private Integer max;
@Override @Override
......
zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/mapper/CisAnsBasedataMapper.java
...@@ -36,6 +36,10 @@ public interface CisAnsBasedataMapper extends BaseMapper<CisAnsBasedata> { ...@@ -36,6 +36,10 @@ public interface CisAnsBasedataMapper extends BaseMapper<CisAnsBasedata> {
List<CisAnsBasedata> getCisAnsBasedataList2(@Param("publishDate_begin") String publishDate_begin List<CisAnsBasedata> getCisAnsBasedataList2(@Param("publishDate_begin") String publishDate_begin
, @Param("publishDate_end") String publishDate_end, Integer offset, Integer offset1, @Param("delflag") Long delFlag,@Param("list") List<Long> webTypeList , @Param("publishDate_end") String publishDate_end, Integer offset, Integer offset1, @Param("delflag") Long delFlag,@Param("list") List<Long> webTypeList
,@Param("siteId") Long siteId); ,@Param("siteId") Long siteId);
//add lihuawei 新曾按打分查询
List<CisAnsBasedata> getCisAnsBasedataListByscore(@Param("publishDate_begin") String publishDate_begin
, @Param("publishDate_end") String publishDate_end, Integer offset, Integer offset1, @Param("min") Long min,@Param("max") Long max,@Param("list") List<Long> webTypeList
,@Param("siteId") Long siteId);
@DS("master") @DS("master")
int getCisAnsBasedataCount2Old(@Param("publishDate_begin") String publishDate_begin int getCisAnsBasedataCount2Old(@Param("publishDate_begin") String publishDate_begin
, @Param("publishDate_end") String publishDate_end,Integer offset, Integer offset1, @Param("delflag")Long delFlag); , @Param("publishDate_end") String publishDate_end,Integer offset, Integer offset1, @Param("delflag")Long delFlag);
...@@ -43,6 +47,11 @@ public interface CisAnsBasedataMapper extends BaseMapper<CisAnsBasedata> { ...@@ -43,6 +47,11 @@ public interface CisAnsBasedataMapper extends BaseMapper<CisAnsBasedata> {
int getCisAnsBasedataCount2(@Param("publishDate_begin") String publishDate_begin int getCisAnsBasedataCount2(@Param("publishDate_begin") String publishDate_begin
, @Param("publishDate_end") String publishDate_end,Integer offset, Integer offset1, @Param("delflag")Long delFlag,@Param("list") List<Long> webTypeList , @Param("publishDate_end") String publishDate_end,Integer offset, Integer offset1, @Param("delflag")Long delFlag,@Param("list") List<Long> webTypeList
,@Param("siteId") Long siteId); ,@Param("siteId") Long siteId);
@DS("master")
int getCisAnsBasedataCountByscore(@Param("publishDate_begin") String publishDate_begin
, @Param("publishDate_end") String publishDate_end,Integer offset, Integer offset1,@Param("min")Long min, @Param("max")Long max,@Param("list") List<Long> webTypeList
,@Param("siteId") Long siteId);
/** /**
* 功能描述: 批量查询ID * 功能描述: 批量查询ID
* @author chen * @author chen
......
zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/mapper/xml/CisAnsBasedataMapper.xml
...@@ -91,8 +91,12 @@ ...@@ -91,8 +91,12 @@
SELECT count(1) SELECT count(1)
FROM cis_ans_basedata b FROM cis_ans_basedata b
left JOIN cis_ans_basedata_type t ON t.bid = b.id left JOIN cis_ans_basedata_type t ON t.bid = b.id
<if test=" (list!=null and list.size>0) or (siteId != null and siteId != '')">
left JOIN CIS_BASEDATA_WEB_MID m on b.ID=m.BID left JOIN CIS_BASEDATA_WEB_MID m on b.ID=m.BID
</if>
<if test=" list!=null and list.size>0 ">
left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID
</if>
WHERE t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942 WHERE t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942
<if test="publishDate_begin!=null and publishDate_begin!=''"> <if test="publishDate_begin!=null and publishDate_begin!=''">
AND t.publish_date > #{publishDate_begin} AND t.publish_date > #{publishDate_begin}
...@@ -113,6 +117,40 @@ ...@@ -113,6 +117,40 @@
and m.WEB_ID = #{siteId} and m.WEB_ID = #{siteId}
</if> </if>
</select> </select>
<select id="getCisAnsBasedataCountByscore" parameterType="Map" resultType="java.lang.Integer">
SELECT count(1)
FROM cis_ans_basedata b
left JOIN cis_ans_basedata_type t ON t.bid = b.id
<if test=" (list!=null and list.size>0) or (siteId != null and siteId != '')">
left JOIN CIS_BASEDATA_WEB_MID m on b.ID=m.BID
</if>
<if test=" list!=null and list.size>0">
left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID
</if>
WHERE t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942
<if test="publishDate_begin!=null and publishDate_begin!=''">
AND t.publish_date > #{publishDate_begin}
</if>
<if test="publishDate_end!=null and publishDate_end!=''">
AND #{publishDate_end} > t.publish_date
</if>
<if test='min != null and min!="0"'>
and m.secret_level >= #{min}
</if>
<if test='max != null and max!="0"'>
and m.secret_level &lt;= #{max}
</if>
<if test="list!=null and list.size>0">
and s.TYPEID in
<foreach collection="list" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</if>
<if test="siteId != null and siteId != ''">
and m.WEB_ID = #{siteId}
</if>
</select>
<select id="queryById" resultType="com.zzsn.modules.kgj.entity.CisAnsBasedata"> <select id="queryById" resultType="com.zzsn.modules.kgj.entity.CisAnsBasedata">
select * from cis_ans_basedata where id =#{id} select * from cis_ans_basedata where id =#{id}
</select> </select>
...@@ -169,8 +207,12 @@ ...@@ -169,8 +207,12 @@
b.CONTENT_NO_TAG b.CONTENT_NO_TAG
FROM cis_ans_basedata b FROM cis_ans_basedata b
left JOIN cis_ans_basedata_type t ON t.bid = b.id left JOIN cis_ans_basedata_type t ON t.bid = b.id
<if test=" (list!=null and list.size>0) or (siteId != null and siteId != '')">
left JOIN CIS_BASEDATA_WEB_MID m on b.ID=m.BID left JOIN CIS_BASEDATA_WEB_MID m on b.ID=m.BID
</if>
<if test="list!=null and list.size>0">
left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID
</if>
WHERE t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942 WHERE t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942
<if test="publishDate_begin!=null and publishDate_begin!=''"> <if test="publishDate_begin!=null and publishDate_begin!=''">
AND t.publish_date > #{publishDate_begin} AND t.publish_date > #{publishDate_begin}
...@@ -194,6 +236,56 @@ ...@@ -194,6 +236,56 @@
WHERE ROWNUM <![CDATA[<=]]> #{offset1}) WHERE ROWNUM <![CDATA[<=]]> #{offset1})
WHERE ROW_ID <![CDATA[>]]> #{offset} WHERE ROW_ID <![CDATA[>]]> #{offset}
</select> </select>
<select id="getCisAnsBasedataListByscore" parameterType="Map" resultType="com.zzsn.modules.kgj.entity.CisAnsBasedata">
SELECT *
FROM (
SELECT TMP_PAGE.*, ROWNUM ROW_ID
FROM (
SELECT b.id,
t.publish_date,
b.title,
b.content,
t.match_keywords AS keywords,
b.origin,
b.sourceaddress,
b.author,
b.summary,
b.locale,
b.CONTENT_NO_TAG
FROM cis_ans_basedata b
left JOIN cis_ans_basedata_type t ON t.bid = b.id
<if test=" (list!=null and list.size>0) or (siteId != null and siteId != '')">
left JOIN CIS_BASEDATA_WEB_MID m on b.ID=m.BID
</if>
<if test=" list!=null and list.size>0">
left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID
</if>
WHERE t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942
<if test="publishDate_begin!=null and publishDate_begin!=''">
AND t.publish_date > #{publishDate_begin}
</if>
<if test="publishDate_end!=null and publishDate_end!=''">
AND #{publishDate_end} > t.publish_date
</if>
<if test='min != null and min!="0"'>
and m.secret_level >= #{min}
</if>
<if test='max != null and max!="0"'>
and m.secret_level &lt;= #{max}
</if>
<if test="list!=null and list.size>0">
and s.TYPEID in
<foreach collection="list" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</if>
<if test="siteId != null and siteId != ''">
and m.WEB_ID = #{siteId}
</if>
order by t.publish_date desc ,t.id desc) TMP_PAGE
WHERE ROWNUM <![CDATA[<=]]> #{offset1})
WHERE ROW_ID <![CDATA[>]]> #{offset}
</select>
<select id="selectByIdsOld" parameterType="java.util.List" resultType="com.zzsn.modules.kgj.entity.CisAnsBasedata"> <select id="selectByIdsOld" parameterType="java.util.List" resultType="com.zzsn.modules.kgj.entity.CisAnsBasedata">
SELECT b.id, SELECT b.id,
b.publish_date, b.publish_date,
......
zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/service/impl/CisAnsBasedataServiceImpl.java
...@@ -240,6 +240,19 @@ public class CisAnsBasedataServiceImpl extends ServiceImpl<CisAnsBasedataMapper, ...@@ -240,6 +240,19 @@ public class CisAnsBasedataServiceImpl extends ServiceImpl<CisAnsBasedataMapper,
rangeQuery.lt(EsDateUtil.esFieldDateFormat(endTime)); rangeQuery.lt(EsDateUtil.esFieldDateFormat(endTime));
boolQuery.filter(rangeQuery); boolQuery.filter(rangeQuery);
} }
//add lihuawei 增加分数条件
if(baseDataDto.getMax()>0||baseDataDto.getMin()>0){
RangeQueryBuilder scoreQuery = QueryBuilders.rangeQuery("publishDate");
scoreQuery.gt(baseDataDto.getMin());
if(baseDataDto.getMax()>0){
scoreQuery.lt(baseDataDto.getMax());
}
boolQuery.filter(scoreQuery);
}
//打印e查询语句 //打印e查询语句
System.out.println(boolQuery.toString()); System.out.println(boolQuery.toString());
searchSourceBuilder.query(boolQuery); searchSourceBuilder.query(boolQuery);
......
zzsn-cloud-system/zzsn-cloud-system-biz/src/main/resources/bootstrap.yml
...@@ -237,14 +237,14 @@ spring: ...@@ -237,14 +237,14 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource: datasource:
master: master:
url: jdbc:oracle:thin:@1.203.103.158:1521:orcl #url: jdbc:oracle:thin:@1.203.103.158:1521:orcl
#url: jdbc:oracle:thin:@192.168.10.10:1521:orcl #url: jdbc:oracle:thin:@192.168.10.10:1521:orcl
username: cis #username: cis
password: cis #password: cis
# driver-class-name: oracle.jdbc.driver.OracleDriver # driver-class-name: oracle.jdbc.driver.OracleDriver
#url: jdbc:oracle:thin:@127.0.0.1:1521:orcl url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
#username: kegongju username: kegongju
#password: kegongju password: kegongju
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
# 多数据源配置 # 多数据源配置
# multi-datasource1: # multi-datasource1:
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论