提交 92411084 作者: yanxin

导出增加“智库机构采集统计信息”

上级 89e1b47c
......@@ -102,6 +102,10 @@ public class ThinktankBasicInfo extends Model<ThinktankBasicInfo> {
//是否展示(1-是;0-否)
private Integer ynDisplay;
//信息源id
@TableField(exist = false)
private String sourceId;
public List<String> toList(){
List<String> list = new ArrayList<>();
list.add(getValue(id));
......
......@@ -2,11 +2,13 @@ package com.zzsn.thinktank.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zzsn.thinktank.entity.ThinktankBasicInfo;
import com.zzsn.thinktank.vo.CountVo;
import com.zzsn.thinktank.vo.ThinktankBasicInfoExportVo;
import com.zzsn.thinktank.vo.ThinktankBasicInfoListVo;
import com.zzsn.thinktank.vo.ThinktankBasicInfoVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
......@@ -38,4 +40,6 @@ public interface ThinktankBasicInfoMapper extends BaseMapper<ThinktankBasicInfo>
*/
List<ThinktankBasicInfo> exportListByCondition(@Param("ids") List<String> ids, @Param("codeId") String codeId, @Param("typeId") String typeId,
@Param("thinktankName") String thinktankName, @Param("tagId") String tagId, @Param("keyword") String keyword);
List<CountVo> bindInfoSource(@Param("ids")List<String> ids);
}
......@@ -61,4 +61,11 @@ public interface ThinktankBasicInfoService extends IService<ThinktankBasicInfo>
* @date 2024/8/23
*/
List<ThinkTankSourceVO> thinkTankCollectCount(List<ThinktankBasicInfo> dataList);
/**
* 根据智库id查询绑定的信息源id
* @param ids
* @return
*/
List<CountVo> bindInfoSource(List<String> ids);
}
......@@ -539,6 +539,11 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
}
@Override
public List<CountVo> bindInfoSource(List<String> ids) {
return this.baseMapper.bindInfoSource(ids);
}
@Override
public List<ThinktankBasicInfo> exportListByCondition(String id, String codeId, String typeId, String thinktankName, String tagId, String keyword) {
List<String> ids = new ArrayList<>();
if (StringUtils.isNotEmpty(id)) {
......
package com.zzsn.thinktank.vo;
import lombok.Data;
/**
* @Description: 统计
*/
@Data
public class CountVo {
private String id;
private String code;
private String name;
private Integer count;
}
......@@ -43,6 +43,8 @@ public class ThinkTankSourceVO {
private Integer infoMonthlyCount;
/**智库下的资讯数量**/
private Integer groupCount;
/**信息源采集状态**/
private String abnormalName;
public List<String> toList(){
List<String> list = new ArrayList<>();
......@@ -74,6 +76,7 @@ public class ThinkTankSourceVO {
} else {
list.add(String.valueOf(infoMonthlyCount));
}
list.add(getValue(abnormalName));
return list;
}
......
......@@ -12,12 +12,12 @@ spring:
max-request-size: 1000MB
datasource:
url: jdbc:mysql://114.116.44.11:3306/clb_project?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
url: jdbc:mysql://1.95.14.228:3306/clb_project?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
username: ciglobal
password: _PSuWVQ4CLpX
redis:
database: 0
host: 114.116.90.53
host: 1.95.69.2
password: RPHZgkDQ4zGJ
port: 6380
mybatis-plus:
......@@ -28,12 +28,12 @@ mybatis-plus:
#生产es集群
es1:
endpoint1: 114.115.215.250
endpoint1: 1.95.38.69
endpoint1port: 9700
endpoint2: 1.95.3.121
endpoint2port: 9200
endpoint3: 114.115.215.96
endpoint3port: 9200
endpoint3: 1.95.87.177
endpoint3port: 9700
username: elastic
password: zzsn9988
......
......@@ -141,6 +141,20 @@
</if>
order by create_time desc
</select>
<select id="bindInfoSource" resultType="com.zzsn.thinktank.vo.CountVo">
SELECT
group_id id,source_id code
FROM
thinktank_info_source_group_map
WHERE 1=1
<if test="ids != null and ids.size() > 0">
AND group_id in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论