增加运营状态、人员规模字段以及es节点变更

src/main/java/com/zzsn/thinktank/controller/ThinktankBasicInfoController.java

@@ -144,10 +144,12 @@ public class ThinktankBasicInfoController {
             header.put("官网", "officialWebsite");
             header.put("* 所属国家", "belongCountry");
             header.put("语言", "lang");
+            header.put("运营状态", "operateStatus");
             header.put("营利性质", "profitNature");
             header.put("智库性质", "nature");
             header.put("研究领域", "tagName");
             header.put("影响力和地位", "influencePosition");
+            header.put("人员规模", "staffSize");
             header.put("智库规模", "scale");
             header.put("成果类型", "achievementType");
             header.put("资金来源", "fundsSource");
@@ -189,8 +191,8 @@ public class ThinktankBasicInfoController {
             List<ThinktankBasicInfo> thinkTankBasicInfos = thinktankBasicInfoService.exportListByCondition(one.getId(), one.getCodeId(),
                     one.getTypeId(), one.getThinktankName(), one.getTagId(), one.getKeyword());
             if (CollectionUtils.isNotEmpty(thinkTankBasicInfos)) {
-                String[] arr = new String[]{"智库机构id", "智库机构编码", "中文全称", "中文简称", "英文全称", "英文简称", "官网", "所属国家", "语言", "营利性质",
-                        "智库性质", "研究领域", "影响力和地位", "智库规模", "成果类型", "资金来源", "原文全称", "原文简称", "简介", "成立时间", "是否收费(1-是;0-否)",
+                String[] arr = new String[]{"智库机构id", "智库机构编码", "中文全称", "中文简称", "英文全称", "英文简称", "官网", "所属国家", "语言", "经营状态","营利性质",
+                        "智库性质", "研究领域", "影响力和地位", "人员规模","智库规模", "成果类型", "资金来源", "原文全称", "原文简称", "简介", "成立时间", "是否收费(1-是;0-否)",
                         "地址", "创办单位/所属单位"};
                 XSSFWorkbook workbook = new XSSFWorkbook();
                 //基本信息

src/main/java/com/zzsn/thinktank/entity/ThinktankBasicInfo.java

@@ -83,12 +83,16 @@ public class ThinktankBasicInfo extends Model<ThinktankBasicInfo> {
 
   //语言
   private String lang;
+  //运营状态
+  private String operateStatus;
   //营利性质
   private String profitNature;
   //智库性质
   private String nature;
   //影响力和地位
   private String influencePosition;
+  //人员规模
+  private String staffSize;
   //智库规模
   private String scale;
   //成果类型
@@ -107,10 +111,12 @@ public class ThinktankBasicInfo extends Model<ThinktankBasicInfo> {
     list.add(getValue(officialWebsite));
     list.add(getValue(belongCountry));
     list.add(getValue(lang));
+    list.add(getValue(operateStatus));
     list.add(getValue(profitNature));
     list.add(getValue(nature));
     list.add(getValue(tagName));
     list.add(getValue(influencePosition));
+    list.add(getValue(staffSize));
     list.add(getValue(scale));
     list.add(getValue(achievementType));
     list.add(getValue(fundsSource));

src/main/java/com/zzsn/thinktank/vo/ThinkTankFileVO.java

@@ -29,6 +29,8 @@ public class ThinkTankFileVO {
     private String belongCountry;
     //语言
     private String lang;
+    //运营状态
+    private String operateStatus;
     //营利性质
     private String profitNature;
     //智库性质
@@ -37,6 +39,8 @@ public class ThinkTankFileVO {
     private String tagName;
     //影响力和地位
     private String influencePosition;
+    //人员规模
+    private String staffSize;
     //智库规模
     private String scale;
     //成果类型

src/main/java/com/zzsn/thinktank/vo/ThinktankBasicInfoVo.java

@@ -84,12 +84,16 @@ public class ThinktankBasicInfoVo extends Model<ThinktankBasicInfoVo> {
 
   //语言
   private String lang;
+  //运营状态
+  private String operateStatus;
   //营利性质
   private String profitNature;
   //智库性质
   private String nature;
   //影响力和地位
-  private String influencePosition;
+  private String influencePosition;;
+  //人员规模
+  private String staffSize;
   //智库规模
   private String scale;
   //成果类型

src/main/resources/application.yml

@@ -30,9 +30,9 @@ mybatis-plus:
 es1:
   endpoint1: 114.115.215.250
   endpoint1port: 9700
-  endpoint2: 114.116.19.92
-  endpoint2port: 9700
-  endpoint3: 114.116.54.108
+  endpoint2: 1.95.3.121
+  endpoint2port: 9200
+  endpoint3: 114.115.215.96
   endpoint3port: 9200
   username: elastic
   password: zzsn9988

src/main/resources/mapper/ThinktankBasicInfoMapper.xml

@@ -7,10 +7,10 @@
     <select id="getList" resultType="com.zzsn.thinktank.vo.ThinktankBasicInfoVo">
         select
         id,code_id,chinese_whole,chinese_simple,english_whole,english_simple,
-               original_whole,original_simple,official_website,tag_id,tag_name,establish_time,charge,
-               country_within_external,belong_country_id,belong_country,region,address,
-               belong_unit_code,belong_unit,head_sculpture,biographical_notes,status,
-        lang,profit_nature,nature,influence_position,scale,achievement_type,funds_source
+        original_whole,original_simple,official_website,tag_id,tag_name,establish_time,charge,
+        country_within_external,belong_country_id,belong_country,region,address,
+        belong_unit_code,belong_unit,head_sculpture,biographical_notes,status,
+        lang,operate_status,profit_nature,nature,influence_position,staff_size,scale,achievement_type,funds_source
         from thinktank_basic_info a
         where 1 = 1
         <if test="codeId != null and codeId != ''">
@@ -109,13 +109,14 @@
         select
         a.id, a.code_id, a.chinese_whole, a.chinese_simple, a.english_whole, a.english_simple, a.original_whole,
         a.original_simple, a.official_website, a.belong_country_id, a.tag_id, a.biographical_notes, a.establish_time,
-        a.charge, a.address, a.belong_unit_code,lang,profit_nature,nature,influence_position,scale,achievement_type,funds_source
+        a.charge, a.address, a.belong_unit_code,a.lang,a.operate_status,a.profit_nature,a.nature,a.influence_position,
+        a.staff_size,a.scale,a.achievement_type,a.funds_source
         from thinktank_basic_info a
         where 1 = 1
         <if test="ids != null and ids.size() > 0">
             AND a.id in
             <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-                 #{item}
+                #{item}
             </foreach>
         </if>
         <if test="codeId != null and codeId != ''">