From bfd7201c84e250e88b9a83ba55317b16f08c7a38 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 15 九月 2023 12:00:24 +0800
Subject: [PATCH] 定义了EsModel作为报错到es的数据模型，每个表要存储的是每个表的表明 表对应的主键，以及要被检索的字段
---
zhang-content/src/main/java/com/ruoyi/mapper/EsRepository.java | 11 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 24 +++
zhang-content/src/main/java/com/ruoyi/service/impl/esServiceImpl.java | 38 ++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 70 +++++++++++
ruoyi-admin/src/main/resources/application-druid.yml | 4
ruoyi-admin/src/test/java/com/ruoyi/esTest.java | 50 ++++++++
ruoyi-admin/src/test/java/com/ruoyi/insertData.java | 62 +++++-----
zhang-content/src/main/java/com/ruoyi/service/esService.java | 7 +
zhang-content/pom.xml | 16 ++
ruoyi-admin/src/main/resources/application.yml | 6
ruoyi-common/pom.xml | 38 ++++++
11 files changed, 287 insertions(+), 39 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 045d564..b2e66b2 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,8 +6,8 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: ZhangApp123!
# password: 123456
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index c1e73e8..a971a6d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -49,6 +49,10 @@
# Spring閰嶇疆
spring:
+ #es閰嶇疆
+ elasticsearch:
+ rest:
+ uris: http://47.93.189.255:8087
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
@@ -124,7 +128,7 @@
pathMapping: /dev-api
# 闃叉XSS鏀诲嚮
-xss:
+xss:
# 杩囨护寮�鍏�
enabled: true
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/esTest.java b/ruoyi-admin/src/test/java/com/ruoyi/esTest.java
new file mode 100644
index 0000000..623bc79
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/esTest.java
@@ -0,0 +1,50 @@
+package com.ruoyi;
+
+
+
+
+
+import com.ruoyi.service.esService;
+import org.elasticsearch.client.IndicesClient;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = esTest.class)
+
+@SpringBootTest
+public class esTest {
+ @Autowired
+ private esService ess;
+ @Autowired
+ private ElasticSearchConfig elas;
+ @Test
+ public void esUser()
+ {
+ // 鎿嶄綔绱㈠紩鐨勫璞�
+ // this.elas = new ElasticSearchConfig();
+ System.out.println(elas);
+
+ IndicesClient indices = elas.client().indices();
+ System.out.println(indices);
+
+
+ // CreateIndexRequest request = new CreateIndexRequest("ysx_course");
+
+ // request.settings(Settings.builder().put("number_of_shards", "1").put("number_of_replicas", "0"));
+ }
+ @Test
+ public void esUs()
+ {
+ // 鎿嶄綔绱㈠紩鐨勫璞�
+ System.out.println(ess);
+
+ // ess.insertTable("lis");
+
+
+
+ }
+
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/insertData.java b/ruoyi-admin/src/test/java/com/ruoyi/insertData.java
index e67f869..e68210b 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/insertData.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/insertData.java
@@ -40,27 +40,27 @@
public void insert() {
List<String> people = Arrays.asList("寮犱笁锛屽紶寮猴紝寮犲姏", "寮犺悓锛屽紶钂�", "寮犳椇锛屽紶鐐癸紝寮犲彲", "寮犵珷锛屽紶甯�", "寮犵拠锛屽紶涓猴紝寮犲己锛屽紶鍔�");
List<String> address = Arrays.asList("鑺卞洯", "娴锋哗", "鍏洯", "娓镐箰鍦�", "鐢板洯", "鍐滃簞");
-
- ZfEvent zfEvent = null;
-
- for (int i = 0; i < 200; i++) {
- zfEvent = new ZfEvent();
- int peopleRandom = new Random().nextInt(5);//0-4鐨勯殢鏈烘暟
- int addressRandom = new Random().nextInt(6);//0-5鐨勯殢鏈烘暟
-
- String base = "abcdefghijklmnopqrstuvwxyz";
- int strRandom1 = new Random().nextInt(16);//0-15鐨勯殢鏈烘暟
- int strRandom2 = new Random().nextInt(16);//0-15鐨勯殢鏈烘暟
- String title = base.substring(strRandom1, strRandom1 + 8);
- String remark = base.substring(strRandom2, strRandom2 + 8);
-
- zfEvent.setPeople(people.get(peopleRandom));
- zfEvent.setAddress(address.get(addressRandom));
- zfEvent.setTitle(title);
- zfEvent.setRemark(remark);
- zfEventService.save(zfEvent);
-
- }
+ System.out.println(zfEventService);
+// ZfEvent zfEvent = null;
+//
+// for (int i = 0; i < 200; i++) {
+// zfEvent = new ZfEvent();
+// int peopleRandom = new Random().nextInt(5);//0-4鐨勯殢鏈烘暟
+// int addressRandom = new Random().nextInt(6);//0-5鐨勯殢鏈烘暟
+//
+// String base = "abcdefghijklmnopqrstuvwxyz";
+// int strRandom1 = new Random().nextInt(16);//0-15鐨勯殢鏈烘暟
+// int strRandom2 = new Random().nextInt(16);//0-15鐨勯殢鏈烘暟
+// String title = base.substring(strRandom1, strRandom1 + 8);
+// String remark = base.substring(strRandom2, strRandom2 + 8);
+//
+// zfEvent.setPeople(people.get(peopleRandom));
+// zfEvent.setAddress(address.get(addressRandom));
+// zfEvent.setTitle(title);
+// zfEvent.setRemark(remark);
+// zfEventService.save(zfEvent);
+//
+// }
}
@@ -157,7 +157,7 @@
zfCollection.setPrice(l6.get(typeNum));
zfCollection.setLocation(l7.get(typeNum));
zfCollection.setRemark(l8.get(typeNum));
- zfCollection.setFamilyId("4");
+ //zfCollection.setFamilyId(4);
zfCollection.setUrl("profile/upload/2023/03/19/test7_20230319222030A007.jpg");
zfCollectionService.save(zfCollection);
@@ -193,14 +193,14 @@
zfEconomy = new ZfEconomy();
zfEconomy.setCreateTime(simpleDateFormat.parse(l1.get(timeNum)));
- zfEconomy.setType(l6.get(typeNum));
- zfEconomy.setPrice(l2.get(typeNum));
- zfEconomy.setUseFor(l3.get(typeNum));
- zfEconomy.setUsePeople(l4.get(typeNum));
- zfEconomy.setKind(l6.get(typeNum));
- zfEconomy.setBalance(l5.get(typeNum));
- zfEconomy.setRemark(l3.get(typeNum));
- zfEconomy.setFamilyId(l9.get(familyNum));
+// zfEconomy.setType(l6.get(typeNum));
+// zfEconomy.setPrice(l2.get(typeNum));
+// zfEconomy.setUseFor(l3.get(typeNum));
+// zfEconomy.setUsePeople(l4.get(typeNum));
+// zfEconomy.setKind(l6.get(typeNum));
+// zfEconomy.setBalance(l5.get(typeNum));
+// zfEconomy.setRemark(l3.get(typeNum));
+// zfEconomy.setFamilyId(l9.get(familyNum));
zfEconomy.setUrl("profile/upload/2023/03/19/test7_20230319222030A007.jpg");
zfEconomyService.save(zfEconomy);
@@ -239,7 +239,7 @@
zfClean.setLocation(l6.get(count));
zfClean.setRemark(l9.get(count));
zfClean.setUrl("profile/upload/2023/03/19/test7_20230319222030A007.jpg");
- zfClean.setFamilyId(l7.get(familyNum));
+ // zfClean.setFamilyId(l7.get(familyNum));
zfCleanService.save(zfClean);
}
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 68dd539..15eb4c0 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -16,6 +16,27 @@
</description>
<dependencies>
+ <!--寮曞叆es鐨勫潗鏍�-->
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-high-level-client</artifactId>
+ <version>7.15.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-client</artifactId>
+ <version>7.15.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>7.15.1</version>
+
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+ </dependency>
<!-- Spring妗嗘灦鍩烘湰鐨勬牳蹇冨伐鍏� -->
<dependency>
@@ -142,6 +163,23 @@
<artifactId>easyexcel</artifactId>
<version>2.2.6</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid</artifactId>
+ <version>1.2.16</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>8.8.0</version>
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
new file mode 100644
index 0000000..d32642f
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
@@ -0,0 +1,70 @@
+package com.ruoyi.common.core.domain.entity;
+
+
+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 java.util.Date;
+
+/**
+ * Es 绱㈠紩搴撳疄浣�
+ *
+ * @author feige
+ * @date 2023-09-14
+ */
+@Document(indexName = "allsearch")
+@Data
+public class EsModel {
+
+ /*** 绱㈠紩id*/
+ @Id
+ @Field(type = FieldType.Text)
+ private String id;
+
+ /**** es涓搴旂殑鏁版嵁搴撲笟鍔″崟鎹甶d*/
+ @Field(analyzer = "ik_max_word")
+ private Long ctId;
+
+ /**** es涓笟鍔℃暟鎹� 瀵瑰簲鐨勪笟鍔℃暟鎹簱琛ㄥ悕绉�*/
+ @Field(analyzer = "ik_max_word")
+ private String ctTableName;
+
+ /**** es涓笟鍔℃暟鎹� 瀵瑰簲鐨� 涓氬姟绠�绉�*/
+ @Field(analyzer = "ik_max_word")
+ private String ctName;
+
+
+ /**** es涓笟鍔℃暟鎹� 瀵瑰簲鐨� 涓氬姟鍐呭璇︾粏淇℃伅*/
+ @Field(analyzer = "ik_max_word")
+ private String ctContent;
+
+
+ /** 澶囨敞 */
+ @Field(analyzer = "ik_max_word")
+ private String remark;
+
+ /** 澶囩敤1 */
+ @Field(analyzer = "ik_max_word")
+ private String by1;
+
+ /** 澶囩敤2 */
+ @Field(analyzer = "ik_max_word")
+ private String by2;
+
+ /** 澶囩敤3 */
+ @Field(analyzer = "ik_max_word")
+ private String by3;
+
+ /** 澶囩敤4 */
+ @Field(analyzer = "ik_max_word")
+ private String by4;
+
+ /** 澶囩敤5 */
+ @Field(analyzer = "ik_max_word")
+ private String by5;
+
+}
diff --git a/zhang-content/pom.xml b/zhang-content/pom.xml
index ef877c5..1e4d07c 100644
--- a/zhang-content/pom.xml
+++ b/zhang-content/pom.xml
@@ -43,6 +43,22 @@
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/EsRepository.java b/zhang-content/src/main/java/com/ruoyi/mapper/EsRepository.java
new file mode 100644
index 0000000..4643a25
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/EsRepository.java
@@ -0,0 +1,11 @@
+package com.ruoyi.mapper;
+
+import com.ruoyi.common.core.domain.entity.EsModel;
+
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface EsRepository extends ElasticsearchRepository<EsModel, String> {
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/esService.java b/zhang-content/src/main/java/com/ruoyi/service/esService.java
new file mode 100644
index 0000000..2be3556
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/esService.java
@@ -0,0 +1,7 @@
+package com.ruoyi.service;
+
+import com.ruoyi.common.core.domain.entity.EsModel;
+
+public interface esService {
+ public int insertTable(EsModel esModel);
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index bb15fc9..f1e480a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -14,10 +15,7 @@
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZfEventMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfEventService;
-import com.ruoyi.service.ZfLogService;
+import com.ruoyi.service.*;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -51,7 +49,9 @@
@Resource
ZAuthorityService zAuthorityService;
-
+ //鍔犲叆鍒癳s涓�
+ @Resource
+ private esService esSer;
private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEvent::getCreateTime);
@@ -343,6 +343,20 @@
}
if (save(zfEvent)) {
+ // 椋� 鍔犲叆
+ EsModel esModel = new EsModel();
+ Integer inte = zfEvent.getId();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtName(zfEvent.getTitle());
+ esModel.setCtContent(zfEvent.getAddress());
+ esModel.setBy1(zfEvent.getRemark());
+
+ // esModel.setCtTableName("tb_ajk");
+ // esModel.setCtName("澶у");
+ // esModel.setCtContent("澶у濂斤紝鎵嶆槸鐪熺殑濂�");//澶勪簨鐢�
+ esSer.insertTable(esModel);
return AjaxResult.success();
} else {
return AjaxResult.error();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/esServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/esServiceImpl.java
new file mode 100644
index 0000000..ff2cbbd
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/esServiceImpl.java
@@ -0,0 +1,38 @@
+package com.ruoyi.service.impl;
+
+import com.ruoyi.common.core.domain.entity.EsModel;
+import com.ruoyi.mapper.EsRepository;
+import com.ruoyi.service.esService;
+
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class esServiceImpl implements esService {
+ @Resource
+ private EsRepository esRepository;
+ @Override
+ public int insertTable(EsModel esModel) {
+ // EsModel esModel = new EsModel();
+ // Integer integer = new Integer(123);
+ // esModel.setId(Long.valueOf(integer));
+ // esModel.setCtId(Long.valueOf(integer));
+ // esModel.setCtTableName("tb_ajk");
+ // esModel.setCtName("澶у");
+ // esModel.setCtContent("澶у濂斤紝鎵嶆槸鐪熺殑濂�");//澶勪簨鐢�
+// esModel.setBy1(tbAjk.getLaay());//妗堢敱
+// esModel.setBy2(tbAjk.getAjlb());//绫诲埆
+// esModel.setBy3(tbAjk.getCjnr());//鍐呭
+// esModel.setBy4(tbAjk.getContent());//鍑哄唴瀹�
+// esModel.setBy5(tbAjk.getCbpcs());//鎵垮姙
+// esModel.setRemark(tbAjk.getJyaq());//绠�瑕佹儏
+ try {
+ esRepository.save(esModel);
+ } catch (Exception e) {
+ System.out.println("dddddddddddd");
+ // throw new Exception("ES鏁版嵁鍚屾澶辫触锛岃鑱旂郴绠＄悊鍛樺鐞嗭紒");
+ }
+ return 0;
+ }
+}
--
Gitblit v1.9.1