diff --git a/pom.xml b/pom.xml
index cb1d045..330b85b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,26 @@
org.springframework.boot
spring-boot-starter-web
+
+ org.springframework.boot
+ spring-boot-starter-data-elasticsearch
+
+
+ org.springframework.data
+ spring-data-elasticsearch
+ 3.0.14.RELEASE
+
+
+ org.elasticsearch.plugin
+ transport-netty4-client
+ 5.6.16
+
+
+
+
+
+
+
com.mysql
diff --git a/src/main/java/com/darkness/common/PublicConst.java b/src/main/java/com/darkness/common/PublicConst.java
new file mode 100644
index 0000000..2a8388c
--- /dev/null
+++ b/src/main/java/com/darkness/common/PublicConst.java
@@ -0,0 +1,59 @@
+package com.darkness.common;
+
+/**
+ * 公共常量类
+ */
+public class PublicConst {
+
+ // 索引名称
+ public final static String E_ACTUAL_POPULATION_INDEX_NAME = "e_actual_population_index_name";
+
+ // 索引类型
+ public final static String ES_INDEX_TYPE = "doc";
+
+ // 分片数
+ public final static short ES_SHARDS = 1;
+
+ // 数
+ public final static short ES_REPLICAS = 0;
+
+ // 删除标识位：0:未删除 1:已删除
+ public static final Byte DELETE_FLAG_ZERO = 0,
+ DELETE_FLAG_ONE = 1,
+ DELETE_FLAG_TWO = 2,
+ DELETE_FLAG_TREE = 3,
+ DELETE_FLAG_FAIL = -1;
+
+ // 日期格式化
+ public static final String DATE_FORMAT_YMD_HMS = "yyyy-MM-dd HH:mm:ss",
+ DATE_FORMAT_YMD = "yyyy-MM-dd";
+
+ // 一天的结束时间
+ public static final String DAY_END_TIME = "23:59:59";
+
+ // 电话号码和手机号正则
+ public static final String REGX_TELANDPHONE = "^([1]\\d{10}|([\\(（]?0[0-9]{2,3}[）\\)]?[-]?)?([2-9][0-9]{6,7})+(\\-[0-9]{1,4})?)$";
+
+ // 符号
+ public static final String SYMBOL_1 = "/",
+ SYMBOL_2 = "-",
+ SYMBOL_3 = "#",
+ SYMBOL_4 = ",",
+ SYMBOL_5 = "%",
+ SYMBOL_6 = "::",
+ SYMBOL_7 = ":",
+ SYMBOL_8 = "(",
+ SYMBOL_9 = ")";
+
+ // es 最大查询条数
+ public static final Integer EVENT_SYNTHETICAL_ESMAXCOUNT = 10000;
+
+ // 项目名
+ public static final String PROJECT_NAME = "darkness";
+
+ // ES 统一配置
+ public final static String
+ ES_SETTING_SETTINGPATH = "es/settings.json",
+ ES_SETTING_NORMALIZER_LOWERCASE = "lowercase"; // 忽略大小写
+
+}
diff --git a/src/main/java/com/darkness/pojo/dto/es/PopulationElasticsearchDto.java b/src/main/java/com/darkness/pojo/dto/es/PopulationElasticsearchDto.java
new file mode 100644
index 0000000..825d2dc
--- /dev/null
+++ b/src/main/java/com/darkness/pojo/dto/es/PopulationElasticsearchDto.java
@@ -0,0 +1,776 @@
+package com.darkness.pojo.dto.es;
+
+import com.darkness.common.PublicConst;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.Setting;
+
+import java.sql.Timestamp;
+
+
+@Data
+@Document(indexName = PublicConst.E_ACTUAL_POPULATION_INDEX_NAME,type = PublicConst.ES_INDEX_TYPE
+ ,shards = PublicConst.ES_SHARDS, replicas = PublicConst.ES_REPLICAS, createIndex = false)
+@Setting(settingPath = PublicConst.ES_SETTING_SETTINGPATH)
+public class PopulationElasticsearchDto {
+
+
+ @Id
+ private Long id;
+
+ @Field(type = FieldType.Keyword, normalizer = PublicConst.ES_SETTING_NORMALIZER_LOWERCASE)
+ private String name;
+
+ @Field(type = FieldType.Integer)
+ private Byte sex;
+
+ @Field(type = FieldType.Integer)
+ private Integer age;
+
+ @Field(type = FieldType.Integer)
+ private Integer nationality;
+
+ @Field(type = FieldType.Integer)
+ private Integer nation;
+
+ @Field(type = FieldType.Long)
+ private Long birthday;
+
+ @Field(type = FieldType.Integer)
+ private Integer documentType;
+
+ @Field(type = FieldType.Keyword)
+ private String certificateNo;
+
+ @Field(type = FieldType.Integer)
+ private Integer telephoneType;
+
+ @Field(type = FieldType.Keyword)
+ private String myPhone;
+
+ @Field(type = FieldType.Keyword)
+ private String contactTelephone;
+
+ @Field(type = FieldType.Keyword)
+ private String contactName;
+
+ @Field(type = FieldType.Keyword)
+ private String relationshipWithMyself;
+
+ @Field(type = FieldType.Keyword)
+ private String projectIdTree;
+
+ @Field(type = FieldType.Keyword)
+ private String registeredResidenceCode;
+
+ @Field(type = FieldType.Keyword)
+ private String registeredResidenceTreename;
+
+ @Field(type = FieldType.Keyword)
+ private String registeredResidence;
+
+ @Field(type = FieldType.Keyword)
+ private String remarks;
+
+ @Field(type = FieldType.Date)
+ private Timestamp createdDate;
+
+ @Field(type = FieldType.Keyword)
+ private String nameUsedBefore;
+
+ @Field(type = FieldType.Keyword)
+ private String nativePlace;
+
+ @Field(type = FieldType.Integer)
+ private Integer politicalOutlook;
+
+ @Field(type = FieldType.Integer)
+ private Integer religiousBelief;
+
+ @Field(type = FieldType.Integer)
+ private Integer maritalStatus;
+
+ @Field(type = FieldType.Integer)
+ private Integer education;
+
+ @Field(type = FieldType.Keyword)
+ private String graduateSchool;
+
+ @Field(type = FieldType.Keyword)
+ private String employmentStatus;
+
+ @Field(type = FieldType.Keyword)
+ private String workplace;
+
+ @Field(type = FieldType.Keyword)
+ private String duties;
+
+ @Field(type = FieldType.Keyword)
+ private String endowmentInsurance;
+
+ @Field(type = FieldType.Keyword)
+ private String medicalInsurance;
+
+ @Field(type = FieldType.Integer)
+ private Byte isBoundHouse;
+
+ @Field(type = FieldType.Keyword)
+ private String labelCategorys;
+
+ @Field(type = FieldType.Keyword)
+ private String labels;
+
+ @Field(type = FieldType.Keyword)
+ private String labelOrgCode;
+
+ @Field(type = FieldType.Keyword)
+ private String dataSources;
+
+ @Field(type = FieldType.Integer)
+ private Integer namespaceId;
+
+ @Field(type = FieldType.Long)
+ private Long creatorUid;
+
+ @Field(type = FieldType.Date)
+ private Timestamp createTime;
+
+ @Field(type = FieldType.Long)
+ private Long operatorUid;
+
+ @Field(type = FieldType.Date)
+ private Timestamp updateTime;
+
+ @Field(type = FieldType.Integer)
+ private Byte deleteFlag;
+
+
+ @Field(type = FieldType.Keyword)
+ private String sexName;
+ @Field(type = FieldType.Keyword)
+ private String nationalityName;
+ @Field(type = FieldType.Keyword)
+ private String nationName;
+ @Field(type = FieldType.Keyword)
+ private String documentTypeName;
+ @Field(type = FieldType.Keyword)
+ private String telephoneTypeName;
+ @Field(type = FieldType.Keyword)
+ private String politicalOutlookName;
+ @Field(type = FieldType.Keyword)
+ private String religiousBeliefName;
+ @Field(type = FieldType.Keyword)
+ private String maritalStatusName;
+ @Field(type = FieldType.Keyword)
+ private String educationName;
+ @Field(type = FieldType.Keyword)
+ private String labelCategorysName;
+ @Field(type = FieldType.Keyword)
+ private String labelsName;
+ @Field(type = FieldType.Keyword)
+ private String labelsColor;
+ @Field(type = FieldType.Keyword)
+ private String labelsBackground;
+ @Field(type = FieldType.Keyword)
+ private String houseIds;
+ @Field(type = FieldType.Keyword)
+ private String houseAddress;
+ @Field(type = FieldType.Keyword)
+ private String houseCategory;
+ @Field(type = FieldType.Keyword)
+ private String registerStatus;
+ @Field(type = FieldType.Keyword)
+ private String registerStatusName;
+
+ @Field(type = FieldType.Integer)
+ private Integer isForeign;
+
+ @Field(type = FieldType.Keyword)
+ private String cityCode;
+
+ @Field(type = FieldType.Keyword)
+ private String areaCode;
+
+ @Field(type = FieldType.Keyword)
+ private String streetCode;
+
+ @Field(type = FieldType.Keyword)
+ private String communityCode;
+
+ @Field(type = FieldType.Keyword)
+ private String gridCode;
+
+ @Field(type = FieldType.Keyword)
+ private String gridUser;
+
+ @Field(type = FieldType.Keyword)
+ private String cityName;
+
+ @Field(type = FieldType.Keyword)
+ private String areaName;
+
+ @Field(type = FieldType.Keyword)
+ private String streetName;
+
+ @Field(type = FieldType.Keyword)
+ private String communityName;
+
+ @Field(type = FieldType.Keyword)
+ private String gridName;
+
+ @Field(type = FieldType.Keyword)
+ private String foreignName;
+
+ @Field(type = FieldType.Integer)
+ private Integer visaType;
+
+ @Field(type = FieldType.Keyword)
+ private String visaPermitNumber;
+
+ @Field(type = FieldType.Long)
+ private Long issueDate;
+
+ @Field(type = FieldType.Long)
+ private Long validityTime;
+
+ @Field(type = FieldType.Keyword)
+ private String signOrganization;
+
+ @Field(type = FieldType.Integer)
+ private Integer identityOverseasPersonnel;
+
+ @Field(type = FieldType.Long)
+ private Long arriveTime;
+
+ @Field(type = FieldType.Long)
+ private Long expectedDepartureTime;
+
+ @Field(type = FieldType.Integer)
+ private Integer purposeComingToChina;
+
+ @Field(type = FieldType.Integer)
+ private Integer residenceType;
+
+ @Field(type = FieldType.Keyword)
+ private String relationshipWithMyselfName;
+
+ @Field(type = FieldType.Keyword)
+ private String syncSource;
+
+ // 数据同步新增字段
+ @Field(type = FieldType.Keyword)
+ private String strHealthStatus;
+
+ @Field(type = FieldType.Keyword)
+ private String strMentalStatus;
+
+ @Field(type = FieldType.Integer)
+ private Integer isVaccinated;
+
+ @Field(type = FieldType.Keyword)
+ private String isVaccinatedName;
+
+ @Field(type = FieldType.Date)
+ private Timestamp vaccinatedTime;
+
+ @Field(type = FieldType.Keyword)
+ private String vaccinatedNum;
+
+ @Field(type = FieldType.Keyword)
+ private String vaccinatedForm;
+
+ @Field(type = FieldType.Keyword)
+ private String vaccinatedArea;
+
+ @Field(type = FieldType.Integer)
+ private Integer isVaccinatedOne;
+
+ @Field(type = FieldType.Date)
+ private Timestamp vaccinatedTimeOne;
+
+ @Field(type = FieldType.Integer)
+ private Integer isVaccinatedTwo;
+
+ @Field(type = FieldType.Date)
+ private Timestamp vaccinatedTimeTwo;
+
+ @Field(type = FieldType.Keyword)
+ private String vaccinatedCom;
+
+ @Field(type = FieldType.Integer)
+ private Integer peopelType;
+
+ // 身高
+ @Field(type = FieldType.Keyword)
+ private String height;
+
+ // 血型
+ @Field(type = FieldType.Integer)
+ private Integer bloodType;
+
+
+ @Field(type = FieldType.Keyword)
+ private String bloodTypeName;
+
+ @Field(type = FieldType.Keyword)
+ private String strGuid;
+ // 兵役情况
+ @Field(type = FieldType.Integer)
+ private Integer military;
+
+ @Field(type = FieldType.Keyword)
+ private String militaryName;
+
+ //从事职业
+ @Field(type = FieldType.Integer)
+ private Integer cszy;
+
+ @Field(type = FieldType.Keyword)
+ private String cszyName;
+
+ //入职时间
+ @Field(type = FieldType.Long)
+ private Long entryDate;
+
+ // 离职时间
+ @Field(type = FieldType.Long)
+ private Long dimissiDate;
+
+ // 单位负责人
+ @Field(type = FieldType.Keyword)
+ private String dwfzr;
+
+ // 单位地址
+ @Field(type = FieldType.Keyword)
+ private String dwdz;
+
+ // 单位联系电话
+ @Field(type = FieldType.Keyword)
+ private String dwlxdh;
+
+ // 健康状况
+ @Field(type = FieldType.Integer)
+ private Integer healthRkfs;
+
+ @Field(type = FieldType.Keyword)
+ private String healthRkfsName;
+
+ // 是否死亡
+ @Field(type = FieldType.Integer)
+ private Integer death;
+
+ @Field(type = FieldType.Keyword)
+ private String deathName;
+
+ // 死亡日期
+ @Field(type = FieldType.Long)
+ private Long deathDate;
+
+ // 火化日期
+ @Field(type = FieldType.Long)
+ private Long cremationDate;
+
+ //所在殡仪馆
+ @Field(type = FieldType.Keyword)
+ private String funaralHome;
+
+ // 人口属性 不能确定是否是字典项
+
+ //公安同步sync_uuid
+ @Field(type = FieldType.Keyword)
+ private String strGaGuid;
+
+ //微信号
+ @Field(type = FieldType.Keyword)
+ private String wechatNo;
+ //微信昵称
+ @Field(type = FieldType.Keyword)
+ private String wechatNickname;
+
+ //公安标准地址id
+ @Field(type = FieldType.Keyword)
+ private String gaXjzdzbm;
+
+ //公安标准地址
+ @Field(type = FieldType.Keyword)
+ private String gaXjzdz;
+
+ //养牛字段
+ //畜禽种类
+ @Field(type = FieldType.Integer)
+ private Integer livestockType;
+ //养殖规模
+ @Field(type = FieldType.Integer)
+ private Integer breedRange;
+ //畜禽种类
+ @Field(type = FieldType.Keyword)
+ private String livestockTypeName;
+ //养殖规模
+ @Field(type = FieldType.Keyword)
+ private String breedRangeName;
+ @Field(type = FieldType.Keyword)
+ private String postalAddress;
+ @Field(type = FieldType.Keyword)
+ private String pathAddress;
+ //邮政编码
+ @Field(type = FieldType.Keyword)
+ private String postalCode;
+
+ //银行账户号
+ @Field(type = FieldType.Keyword)
+ private String bankAccountName;
+
+ //银行卡号
+ @Field(type = FieldType.Keyword)
+ private String bankCard;
+
+ //开户行
+ @Field(type = FieldType.Keyword)
+ private String bankDeposit;
+ @Field(type = FieldType.Keyword)
+ private String appIdCode;
+
+ @Field(type = FieldType.Keyword)
+ private String competencyLabel;
+
+ @Field(type = FieldType.Keyword)
+ private String competencyLabelName;
+
+ //是否参保
+ @Field(type = FieldType.Integer)
+ private Integer isInsurance;
+ //是否参保
+ private String isInsuranceName;
+ //残疾状态
+ @Field(type = FieldType.Keyword)
+ private String disabilityStatus;
+ //拼音
+ @Field(type = FieldType.Keyword)
+ private String pinyinCode;
+
+ //社区矫正
+ @Field(type = FieldType.Integer)
+ private Integer communityCorrection;
+ private String communityCorrectionName;
+ //刑满解矫
+ @Field(type = FieldType.Integer)
+ private Integer paroleCorrection;
+ private String paroleCorrectionName;
+
+ //单行文本
+ @Field(type = FieldType.Keyword)
+ private String text1;
+ @Field(type = FieldType.Keyword)
+ private String text2;
+ @Field(type = FieldType.Keyword)
+ private String text3;
+ @Field(type = FieldType.Keyword)
+ private String text4;
+ @Field(type = FieldType.Keyword)
+ private String text5;
+ @Field(type = FieldType.Keyword)
+ private String text6;
+ @Field(type = FieldType.Keyword)
+ private String text7;
+ @Field(type = FieldType.Keyword)
+ private String text8;
+ @Field(type = FieldType.Keyword)
+ private String text9;
+ @Field(type = FieldType.Keyword)
+ private String text10;
+ @Field(type = FieldType.Keyword)
+ private String text11;
+ @Field(type = FieldType.Keyword)
+ private String text12;
+ @Field(type = FieldType.Keyword)
+ private String text13;
+ @Field(type = FieldType.Keyword)
+ private String text14;
+ @Field(type = FieldType.Keyword)
+ private String text15;
+ @Field(type = FieldType.Keyword)
+ private String text16;
+ @Field(type = FieldType.Keyword)
+ private String text17;
+ @Field(type = FieldType.Keyword)
+ private String text18;
+ @Field(type = FieldType.Keyword)
+ private String text19;
+ @Field(type = FieldType.Keyword)
+ private String text20;
+ //多行文本
+ @Field(type = FieldType.Keyword)
+ private String multiText1;
+ @Field(type = FieldType.Keyword)
+ private String multiText2;
+ @Field(type = FieldType.Keyword)
+ private String multiText3;
+ @Field(type = FieldType.Keyword)
+ private String multiText4;
+ @Field(type = FieldType.Keyword)
+ private String multiText5;
+ @Field(type = FieldType.Keyword)
+ private String multiText6;
+ @Field(type = FieldType.Keyword)
+ private String multiText7;
+ @Field(type = FieldType.Keyword)
+ private String multiText8;
+ @Field(type = FieldType.Keyword)
+ private String multiText9;
+ @Field(type = FieldType.Keyword)
+ private String multiText10;
+
+ //单选
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect1;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect2;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect3;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect4;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect5;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect6;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect7;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect8;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect9;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect10;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect11;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect12;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect13;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect14;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect15;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect16;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect17;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect18;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect19;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect20;
+
+ private String noOpsSelect1Name;
+ private String noOpsSelect2Name;
+ private String noOpsSelect3Name;
+ private String noOpsSelect4Name;
+ private String noOpsSelect5Name;
+ private String noOpsSelect6Name;
+ private String noOpsSelect7Name;
+ private String noOpsSelect8Name;
+ private String noOpsSelect9Name;
+ private String noOpsSelect10Name;
+ private String noOpsSelect11Name;
+ private String noOpsSelect12Name;
+ private String noOpsSelect13Name;
+ private String noOpsSelect14Name;
+ private String noOpsSelect15Name;
+ private String noOpsSelect16Name;
+ private String noOpsSelect17Name;
+ private String noOpsSelect18Name;
+ private String noOpsSelect19Name;
+ private String noOpsSelect20Name;
+ //多选
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect1;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect2;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect3;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect4;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect5;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect6;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect7;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect8;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect9;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect10;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect11;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect12;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect13;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect14;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect15;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect16;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect17;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect18;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect19;
+ @Field(type = FieldType.Keyword)
+ private String noOpsMultiSelect20;
+ //多选汉字
+ private String noOpsMultiSelect1Name;
+ private String noOpsMultiSelect2Name;
+ private String noOpsMultiSelect3Name;
+ private String noOpsMultiSelect4Name;
+ private String noOpsMultiSelect5Name;
+ private String noOpsMultiSelect6Name;
+ private String noOpsMultiSelect7Name;
+ private String noOpsMultiSelect8Name;
+ private String noOpsMultiSelect9Name;
+ private String noOpsMultiSelect10Name;
+ private String noOpsMultiSelect11Name;
+ private String noOpsMultiSelect12Name;
+ private String noOpsMultiSelect13Name;
+ private String noOpsMultiSelect14Name;
+ private String noOpsMultiSelect15Name;
+ private String noOpsMultiSelect16Name;
+ private String noOpsMultiSelect17Name;
+ private String noOpsMultiSelect18Name;
+ private String noOpsMultiSelect19Name;
+ private String noOpsMultiSelect20Name;
+ //数字
+ @Field(type = FieldType.Double)
+ private Double textNum1;
+ @Field(type = FieldType.Double)
+ private Double textNum2;
+ @Field(type = FieldType.Double)
+ private Double textNum3;
+ @Field(type = FieldType.Double)
+ private Double textNum4;
+ @Field(type = FieldType.Double)
+ private Double textNum5;
+ @Field(type = FieldType.Double)
+ private Double textNum6;
+ @Field(type = FieldType.Double)
+ private Double textNum7;
+ @Field(type = FieldType.Double)
+ private Double textNum8;
+ @Field(type = FieldType.Double)
+ private Double textNum9;
+ @Field(type = FieldType.Double)
+ private Double textNum10;
+ //数字
+ @Field(type = FieldType.Integer)
+ private Integer num1;
+ @Field(type = FieldType.Integer)
+ private Integer num2;
+ @Field(type = FieldType.Integer)
+ private Integer num3;
+ @Field(type = FieldType.Integer)
+ private Integer num4;
+ @Field(type = FieldType.Integer)
+ private Integer num5;
+ @Field(type = FieldType.Integer)
+ private Integer num6;
+ @Field(type = FieldType.Integer)
+ private Integer num7;
+ @Field(type = FieldType.Integer)
+ private Integer num8;
+ @Field(type = FieldType.Integer)
+ private Integer num9;
+ @Field(type = FieldType.Integer)
+ private Integer num10;
+ //日期
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM1;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM2;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM3;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM4;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM5;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM6;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM7;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM8;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM9;
+ @Field(type = FieldType.Date)
+ private Timestamp datetimeWithM10;
+
+ //单选
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect21;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect22;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect23;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect24;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect25;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect26;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect27;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect28;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect29;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect30;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect31;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect32;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect33;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect34;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect35;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect36;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect37;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect38;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect39;
+ @Field(type = FieldType.Integer)
+ private Integer noOpsSelect40;
+
+ private String noOpsSelect21Name;
+ private String noOpsSelect22Name;
+ private String noOpsSelect23Name;
+ private String noOpsSelect24Name;
+ private String noOpsSelect25Name;
+ private String noOpsSelect26Name;
+ private String noOpsSelect27Name;
+ private String noOpsSelect28Name;
+ private String noOpsSelect29Name;
+ private String noOpsSelect30Name;
+ private String noOpsSelect31Name;
+ private String noOpsSelect32Name;
+ private String noOpsSelect33Name;
+ private String noOpsSelect34Name;
+ private String noOpsSelect35Name;
+ private String noOpsSelect36Name;
+ private String noOpsSelect37Name;
+ private String noOpsSelect38Name;
+ private String noOpsSelect39Name;
+ private String noOpsSelect40Name;
+}
diff --git a/src/main/java/com/darkness/repository/PopulationElasticsearchRepository.java b/src/main/java/com/darkness/repository/PopulationElasticsearchRepository.java
new file mode 100644
index 0000000..06574c6
--- /dev/null
+++ b/src/main/java/com/darkness/repository/PopulationElasticsearchRepository.java
@@ -0,0 +1,9 @@
+package com.darkness.repository;
+
+
+import com.darkness.pojo.dto.es.PopulationElasticsearchDto;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+
+public interface PopulationElasticsearchRepository extends ElasticsearchRepository {
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fe668c9..a6a15d5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,9 +2,15 @@ server:
port: 8002
spring:
+ application:
+ name: darkness
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://39.99.244.11:3306/konosuba?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
username: konosuba
password: kKWjPDYDMLtLaLwY
- type: com.zaxxer.hikari.HikariDataSource
\ No newline at end of file
+ type: com.zaxxer.hikari.HikariDataSource
+
+ data:
+ elasticsearch:
+