新增：

pom.xml

@@ -12,6 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-boot.version>3.0.2</spring-boot.version>
+        <hibernate.version>6.6.0.Final</hibernate.version>
     </properties>
     <dependencies>
         <dependency>
@@ -44,8 +45,8 @@
         </dependency>
         <dependency>
             <groupId>com.dameng</groupId>
-            <artifactId>DmDialect-for-hibernate6.1</artifactId>
-            <version>8.1.4.6</version>
+            <artifactId>DmDialect-for-hibernate6.6</artifactId>
+            <version>8.1.4.93</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

src/main/java/org/aircas/entitylist/controller/EntityListController.java

 package org.aircas.entitylist.controller;
 
 import jakarta.annotation.Resource;
-import org.aircas.entitylist.entity.DEvent;
-import org.aircas.entitylist.entity.DTO.DEventDTO;
+import org.aircas.entitylist.entity.*;
+import org.aircas.entitylist.entity.VO.DEventVO;
+import org.aircas.entitylist.entity.VO.EventEntityDetailVO;
+import org.aircas.entitylist.entity.VO.EventEntityVO;
 import org.aircas.entitylist.service.EntityListService;
+import org.aircas.entitylist.util.Result;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -13,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/application_system")
@@ -24,16 +27,63 @@ public class EntityListController {
     @Resource
     private EntityListService entityListService;
 
+    /**
+     * 查询`event_type`为`实体清单`的事件
+     * @param page
+     * @param size
+     * @param sortBy
+     * @return
+     */
     @GetMapping("/risk_list")
-    public Page<DEventDTO> getRiskList(@RequestParam(defaultValue = "0") int page,
-                                       @RequestParam(defaultValue = "10") int size,
-                                       @RequestParam(defaultValue = "id") String sortBy) {
+    public Result<Page<DEventVO>> getRiskList(@RequestParam(defaultValue = "0") int page,
+                                              @RequestParam(defaultValue = "10") int size,
+                                              @RequestParam(defaultValue = "id") String sortBy) {
         // 仅查询`event_type`为`实体清单`的事件
         DEvent dEvent = new DEvent();
         dEvent.setEventType(Event_Type);
         Pageable pageable = PageRequest.of(page, size, Sort.by(sortBy));
         Page<DEvent> riskList = entityListService.getRiskList(dEvent, pageable);
-        return riskList.map(DEventDTO::new);
+        return Result.ok(riskList.map(DEventVO::new));
     }
 
+    /**
+     * 获取指定事件下的实体清单
+     *
+     * @param event_id
+     * @param page
+     * @param size
+     * @param sortBy
+     * @return
+     */
+    @GetMapping("/event_entity_list")
+    public Result getEventEntityList(@RequestParam String event_id,
+                                     @RequestParam(defaultValue = "0") int page,
+                                     @RequestParam(defaultValue = "10") int size,
+                                     @RequestParam(defaultValue = "id") String sortBy) {
+        // 获取指定event_id下的实体清单
+        DEntity dEntity = new DEntity();
+        dEntity.setEvent_id(event_id);
+        Pageable pageable = PageRequest.of(page, size, Sort.by(sortBy));
+        Page<DEntity> eventEntityPage = entityListService.getEntityList(dEntity, pageable);
+        return Result.ok(eventEntityPage.map(EventEntityVO::new));
+    }
+
+    /**
+     * 获取指定实体的详细信息
+     *
+     * // todo : event_entity_id的含义
+     * @param event_entity_id 实体id
+     * @return
+     */
+    @GetMapping("/event_entity_detail")
+    public Result getEventEntityDetail(@RequestParam String event_entity_id) {
+        DEntity dEntity = new DEntity();
+        dEntity.setId(event_entity_id);
+        DEntity entity = Optional.of(entityListService.getEntityList(dEntity, Pageable.unpaged()).getContent().get(0)).orElse(null);
+        List<DDomain> domain = entityListService.getdomainByEntityId(entity.getId());
+        List<DAddress> address = entityListService.getAddressByEntityId(entity.getId());
+        List<DAlias> alias = entityListService.getAliasByEntityId(entity.getId());
+        EventEntityDetailVO eventEntityDetailDTO = new EventEntityDetailVO(entity, domain, alias, address);
+        return Result.ok(eventEntityDetailDTO);
+    }
 }

src/main/java/org/aircas/entitylist/entity/DAddress.java

@@ -23,20 +23,25 @@ public class DAddress {
     // 城市
     private String city;
     // 城市_中文
-    private String city_zh;
+    @Column(name = "city_zh")
+    private String cityZh;
     // 省份
     private String province;
     // 省份_中文
-    private String province_zh;
+    @Column(name = "province_zh")
+    private String provinceZh;
     // 国家
     private String country;
     // 国家_中文
-    private String country_zh;
+    @Column(name = "country_zh")
+    private String countryZh;
     // 地址对应的实体编号
-    private String entity_id;
+    @Column(name = "entity_id")
+    private String entityId;
     // 实体所处的清单类别
     private String type;
     // 创建时间
+    @Column(name = "created_time")
     private LocalDateTime createdTime;
 
 }

src/main/java/org/aircas/entitylist/entity/DAlias.java

 package org.aircas.entitylist.entity;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
@@ -20,7 +21,8 @@ public class DAlias {
     // 实体所处的清单类别
     private String type;
     // 实体id
-    private String entity_id;
+    @Column(name = "ENTITY_ID")
+    private String entityId;
     // 创建时间
     private LocalDateTime createdTime;
 }

src/main/java/org/aircas/entitylist/entity/DDomain.java

 package org.aircas.entitylist.entity;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
@@ -14,7 +15,9 @@ public class DDomain {
     @Id
     private String id;
     private String name;
-    private String entity_id;
+    @Column(name = "entity_id")
+    private String entityId;
     private String type;
+    @Column(name = "created_time")
     private LocalDateTime createdTime;
 }

src/main/java/org/aircas/entitylist/entity/DEntity.java

@@ -30,6 +30,6 @@ public class DEntity {
     private String status;
     // 创建时间
     private LocalDateTime createdTime;
-    // 实体id
+    // 实体id todo:这个字段与id有什么区别
     private String entityId;
 }

src/main/java/org/aircas/entitylist/entity/DTO/DEventDTO.java → src/main/java/org/aircas/entitylist/entity/VO/DEventVO.java

-package org.aircas.entitylist.entity.DTO;
+package org.aircas.entitylist.entity.VO;
 
 import lombok.Data;
 import org.aircas.entitylist.entity.DEvent;
 
 @Data
 
-public class DEventDTO {
+public class DEventVO {
     private String event_id;
     private String title;
     private String title_en;
     private String type;
     private String date;
 
-    public DEventDTO(DEvent event) {
+    public DEventVO(DEvent event) {
         this.event_id = event.getId();
         this.title = event.getTitle();
         this.title_en = event.getTitle_en();

src/main/java/org/aircas/entitylist/entity/VO/EventEntityDetailVO.java

+package org.aircas.entitylist.entity.VO;
+
+import lombok.Data;
+import org.aircas.entitylist.entity.DAddress;
+import org.aircas.entitylist.entity.DAlias;
+import org.aircas.entitylist.entity.DDomain;
+import org.aircas.entitylist.entity.DEntity;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Data
+public class EventEntityDetailVO {
+    private String entity_id;
+    private String name;
+    private String entity_type;
+    private String status;
+    private String sanction_reason;
+    private List<DomainVO> domains;
+    private List<AddressVO> addresses;
+    private List<AliasVO> aliases;
+
+    public EventEntityDetailVO(DEntity dEntity, List<DDomain> dDomains, List<DAlias> dAliases, List<DAddress> dAddresses) {
+        this.entity_id = dEntity.getId();
+        this.name = dEntity.getName();
+        this.entity_type = dEntity.getEntity_type();
+        this.status = dEntity.getStatus();
+        this.domains = dDomains.stream().map(DomainVO::new).collect(Collectors.toList());
+        this.addresses = dAddresses.stream().map(AddressVO::new).collect(Collectors.toList());
+        this.aliases = dAliases.stream().map(AliasVO::new).collect(Collectors.toList());
+    }
+}
+
+@Data
+class DomainVO {
+    private String id;
+    private String name;
+    public DomainVO(DDomain dDomain) {
+        this.id = dDomain.getId();
+        this.name = dDomain.getName();
+    }
+}
+
+@Data
+class AddressVO {
+    private String id;
+    private String text;
+    private String text_zh;
+    private String province;
+    private String city;
+    private String province_zh;
+    private String city_zh;
+    
+    public AddressVO(DAddress dAddress) { 
+        if (dAddress != null) {
+            this.id = dAddress.getId();
+            this.text = dAddress.getText();
+            this.text_zh = dAddress.getText_zh();
+            this.province = dAddress.getProvince();
+            this.city = dAddress.getCity();
+            this.province_zh = dAddress.getProvinceZh();
+            this.city_zh = dAddress.getCityZh();
+        }
+    }
+}
+
+@Data
+class AliasVO {
+    private String id;
+    private String name;
+    private String name_zh;
+
+    public AliasVO(DAlias dAlias) {
+        this.id = dAlias.getId();
+        this.name = dAlias.getName();
+        this.name_zh = dAlias.getName_zh();
+    }
+}

src/main/java/org/aircas/entitylist/entity/VO/EventEntityVO.java

+package org.aircas.entitylist.entity.VO;
+
+import lombok.Data;
+import org.aircas.entitylist.entity.DEntity;
+
+@Data
+public class EventEntityVO {
+    private String event_entity_id;
+    private String entity_name;
+    private String entity_type;
+    private String status;
+
+    public EventEntityVO(DEntity dEntity) {
+        this.event_entity_id = dEntity.getId();
+        this.entity_name = dEntity.getName();
+        this.entity_type = dEntity.getEntity_type();
+        this.status = dEntity.getStatus();
+    }
+}

src/main/java/org/aircas/entitylist/repository/DAddressRepository.java

+package org.aircas.entitylist.repository;
+
+import org.aircas.entitylist.entity.DAddress;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface DAddressRepository extends JpaRepository<DAddress, String>, JpaSpecificationExecutor<DAddress> {
+    List<DAddress> findByEntityId(String entityId);
+}

src/main/java/org/aircas/entitylist/repository/DAliasRepository.java

+package org.aircas.entitylist.repository;
+
+import org.aircas.entitylist.entity.DAlias;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface DAliasRepository extends JpaRepository<DAlias, String>, JpaSpecificationExecutor<DAlias> {
+    List<DAlias> findByEntityId(String entityId);
+}

src/main/java/org/aircas/entitylist/repository/DDomainRepository.java

+package org.aircas.entitylist.repository;
+
+import org.aircas.entitylist.entity.DDomain;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface DDomainRepository extends JpaRepository<DDomain, String>, JpaSpecificationExecutor<DDomain> {
+    List<DDomain> findByEntityId(String entityId);
+}

src/main/java/org/aircas/entitylist/repository/DEntityRepository.java

+package org.aircas.entitylist.repository;
+
+import org.aircas.entitylist.entity.DEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DEntityRepository extends JpaRepository<DEntity, String>, JpaSpecificationExecutor<DEntity> {
+
+}

src/main/java/org/aircas/entitylist/service/EntityListService.java

 package org.aircas.entitylist.service;
 
-import org.aircas.entitylist.entity.DEvent;
+import org.aircas.entitylist.entity.*;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -8,4 +8,13 @@ import java.util.List;
 
 public interface EntityListService {
     Page<DEvent> getRiskList(DEvent dEvent, Pageable pageable);
+
+    Page<DEntity> getEntityList(DEntity dEntity, Pageable pageable);
+
+    List<DDomain> getdomainByEntityId(String entityId);
+
+    List<DAddress> getAddressByEntityId(String entityId);
+
+    List<DAlias> getAliasByEntityId(String entityId);
+
 }

src/main/java/org/aircas/entitylist/service/serviceImpl/EntityListServiceImpl.java

 package org.aircas.entitylist.service.serviceImpl;
 
 import jakarta.annotation.Resource;
-import org.aircas.entitylist.entity.DEvent;
-import org.aircas.entitylist.repository.DEventRepository;
+import org.aircas.entitylist.entity.*;
+import org.aircas.entitylist.repository.*;
 import org.aircas.entitylist.service.EntityListService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -18,10 +18,25 @@ public class EntityListServiceImpl implements EntityListService {
     @Resource
     private DEventRepository dEventRepository;
 
+    @Resource
+    private DEntityRepository dEntityRepository;
+
+    @Resource
+    private DAliasRepository dAliasRepository;
+
+    @Resource
+    private DDomainRepository dDomainRepository;
+
+    @Resource
+    private DAddressRepository dAddressRepository;
+
     @Override
     public Page<DEvent> getRiskList(DEvent dEvent, Pageable pageable) {
         Specification<DEvent> specification = (root, query, criteriaBuilder) -> {
             List<Predicate> predicates = new ArrayList<>();
+            if (dEvent.getId() != null) {
+                predicates.add(criteriaBuilder.equal(root.get("id"), dEvent.getId()));
+            }
             if (dEvent.getTitle() != null) {
                 predicates.add(criteriaBuilder.like(root.get("title"), "%" + dEvent.getTitle() + "%"));
             }
@@ -42,4 +57,44 @@ public class EntityListServiceImpl implements EntityListService {
         return dEventRepository.findAll(specification, pageable);
     }
 
+    @Override
+    public Page<DEntity> getEntityList(DEntity dEntity, Pageable pageable) {
+        Specification<DEntity> specification = (root, query, criteriaBuilder) -> {
+            List<Predicate> predicates = new ArrayList<>();
+            if (dEntity.getId() != null) {
+                predicates.add(criteriaBuilder.equal(root.get("id"), dEntity.getId()));
+            }
+            if (dEntity.getName() != null) {
+                predicates.add(criteriaBuilder.like(root.get("title"), "%" + dEntity.getName() + "%"));
+            }
+            if (dEntity.getEntity_type() != null) {
+                predicates.add(criteriaBuilder.like(root.get("title_en"), "%" + dEntity.getEntity_type() + "%"));
+            }
+            if (dEntity.getEntityId() != null) {
+                predicates.add(criteriaBuilder.equal(root.get("eventType"), dEntity.getEntityId()));
+            }
+            if (dEntity.getPostDate() != null) {
+                predicates.add(criteriaBuilder.equal(root.get("postDate"), dEntity.getPostDate()));
+            }
+            return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+        };
+        return dEntityRepository.findAll(specification, pageable);
+    }
+
+    @Override
+    public List<DDomain> getdomainByEntityId(String entityId) {
+        return dDomainRepository.findByEntityId(entityId);
+    }
+
+    @Override
+    public List<DAddress> getAddressByEntityId(String entityId) {
+        return dAddressRepository.findByEntityId(entityId);
+    }
+
+    @Override
+    public List<DAlias> getAliasByEntityId(String entityId) {
+        return dAliasRepository.findByEntityId(entityId);
+    }
+
+
 }

src/main/java/org/aircas/entitylist/util/Result.java

+package org.aircas.entitylist.util;
+
+import lombok.Data;
+
+@Data
+public class Result<T> {
+    private Integer code;
+    private String msg;
+    private T data;
+
+    public Result() {
+        super();
+    }
+
+    public Result(Integer code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public static Result ok() {
+        Result result = new Result();
+        result.setCode(ResultConstant.SUCCESS_CODE);
+        result.setMsg(ResultConstant.SUCCESS_MSG);
+        return result;
+    }
+
+    public static Result ok(String msg) {
+        Result result = new Result();
+        result.setCode(ResultConstant.SUCCESS_CODE);
+        result.setMsg(msg);
+        return result;
+    }
+
+    public static Result ok(Object data) {
+        Result result = new Result();
+        result.setCode(ResultConstant.SUCCESS_CODE);
+        result.setMsg(ResultConstant.SUCCESS_MSG);
+        result.setData(data);
+        return result;
+    }
+
+    public static Result ok(Object data, String msg) {
+        Result result = new Result();
+        result.setCode(ResultConstant.SUCCESS_CODE);
+        result.setMsg(msg);
+        result.setData(data);
+        return result;
+    }
+
+    public static Result queryError(String msg) {
+        Result result = new Result();
+        result.setCode(ResultConstant.QUERY_ERROR_CODE);
+        result.setMsg(msg);
+        return result;
+    }
+
+    public static Result failure() {
+        Result result = new Result();
+        result.setCode(ResultConstant.FAILURE_CODE);
+        result.setMsg(ResultConstant.FAILURE_MSG);
+        return result;
+    }
+
+    public static Result failure(String msg) {
+        Result result = new Result();
+        result.setCode(ResultConstant.FAILURE_CODE);
+        result.setMsg(msg);
+        return result;
+    }
+
+    public static Result failure(Object data) {
+        Result result = new Result();
+        result.setCode(ResultConstant.FAILURE_CODE);
+        result.setMsg(ResultConstant.FAILURE_MSG);
+        result.setData(data);
+        return result;
+    }
+}

src/main/java/org/aircas/entitylist/util/ResultConstant.java

+package org.aircas.entitylist.util;
+
+/**
+ * @description 结果状态码封装
+ */
+public class ResultConstant {
+
+    public static final int SUCCESS_CODE = 200;
+
+    public static final int FAILURE_CODE = 400;
+
+    public static final int QUERY_ERROR_CODE = 500;
+
+    public static final String SUCCESS_MSG = "success";
+
+    public static final String FAILURE_MSG = "failed";
+}