11

src/main/java/cn/cslg/pas/domain/es/ApplicantAddr.java

@@ -0,0 +1,48 @@
+package cn.cslg.pas.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 申请人地址
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApplicantAddr {
+    /**
+     * 地址
+     */
+    @JsonProperty("address")
+    String address;
+
+    /**
+     * 市
+     */
+    @JsonProperty("city")
+    String city;
+
+    /**
+     * 国
+     */
+    @JsonProperty("country")
+    String country;
+
+    /**
+     * 区
+     */
+    @JsonProperty("district")
+    String district;
+
+    /**
+     * 省
+     */
+    @JsonProperty("province")
+    String province;
+
+}

src/main/java/cn/cslg/pas/domain/es/GrantManual.java

@@ -0,0 +1,27 @@
+package cn.cslg.pas.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 公开说明书文本
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GrantManual {
+    /**
+     * 说明书
+     */
+    @JsonProperty("manual")
+    private String manual;
+    /**
+     * 说明书译
+     */
+    @JsonProperty("manual_out")
+    private String manualOut;
+}

src/main/java/cn/cslg/pas/domain/es/Patent.java

@@ -6,11 +6,60 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
+/**
+ *
+ */
 @Component
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class Patent {
-    @JsonProperty("")
-    private String patentName;
+    /**
+     * 专利号
+     */
+    @JsonProperty("patent_no")
+    private String patentNo;
+    /**
+     * 标题
+     */
+    @JsonProperty("name")
+    private String name;
+    /**
+     * 标题译
+     */
+    @JsonProperty("name_out")
+    private String name_out;
+
+    /**
+     * 摘要
+     */
+    @JsonProperty("abstract_str")
+    private String abstractStr;
+
+    /**
+     * 摘要译
+     */
+    @JsonProperty("abstract_out")
+    private String abstractOut;
+
+    /**
+     * 审查员
+     */
+    @JsonProperty("examiner")
+    private String examiner;
+
+    /**
+     * 助理审查员
+     */
+    @JsonProperty("aid_examiner")
+    private String aidExaminer;
+
+    /**
+     * 实审日
+     */
+    @JsonProperty("examination_date")
+    private Date examinationDate;
+
 }

src/main/java/cn/cslg/pas/domain/es/PublicManual.java

@@ -0,0 +1,27 @@
+package cn.cslg.pas.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 公开说明书文本
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PublicManual {
+    /**
+     * 说明书
+     */
+    @JsonProperty("manual")
+    private String manual;
+    /**
+     * 说明书译
+     */
+    @JsonProperty("manual_out")
+    private String manualOut;
+}

src/main/java/cn/cslg/pas/domain/es/RightHolderAddr.java

@@ -0,0 +1,48 @@
+package cn.cslg.pas.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 权利人地址
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RightHolderAddr {
+    /**
+     * 地址
+     */
+    @JsonProperty("address")
+    String address;
+
+    /**
+     * 市
+     */
+    @JsonProperty("city")
+    String city;
+
+    /**
+     * 国
+     */
+    @JsonProperty("country")
+    String country;
+
+    /**
+     * 区
+     */
+    @JsonProperty("district")
+    String district;
+
+    /**
+     * 省
+     */
+    @JsonProperty("province")
+    String province;
+
+}

src/main/java/cn/cslg/pas/service/business/EventService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.common.dto.business.EventDTO;
 import cn.cslg.pas.common.dto.business.EventUpdateDTO;
+import cn.cslg.pas.common.dto.business.UpdateEventDTO;
 import cn.cslg.pas.common.model.cronModel.*;
 import cn.cslg.pas.common.model.request.*;
 
@@ -81,7 +82,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Transactional(rollbackFor = Exception.class)
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
 
-       List<String> sqls = formatQueryService.reSqls(queryRequest);
+       List<String> sqls = formatQueryService.reSqls(queryRequest,"event");
         //根据sql查询事件信息
         List<EventVO> eventVOS = eventMapper.getEvent(sqls.get(0),sqls.get(1),sqls.get(2));
 
@@ -182,34 +183,34 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Transactional(rollbackFor = Exception.class)
     public Object updateMessage(Object object, List<MultipartFile> files) {
 
-        EventUpdateDTO eventUpdateDTO = (EventUpdateDTO) object;
+        UpdateEventDTO updateEventDTO = (UpdateEventDTO) object;
         //检查事件格式
-        if (eventUpdateDTO == null || eventUpdateDTO.getId() == null) {
+        if (updateEventDTO == null || updateEventDTO.getId() == null) {
             throw new XiaoShiException("参数错误");
 
         }
-        Event event = this.getById(eventUpdateDTO.getId());
+        Event event = this.getById(updateEventDTO.getId());
         //根据名称查询是否重复
-        eventUpdateDTO.setName(eventUpdateDTO.getName().trim());
-        String name = eventUpdateDTO.getName();
+        updateEventDTO.setName(updateEventDTO.getName().trim());
+        String name = updateEventDTO.getName();
         LambdaQueryWrapper<Event> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Event::getName, name);
         List<Event> events = this.list(queryWrapper);
-        if (eventUpdateDTO.getName() != event.getName() && events.size() != 0) {
+        if (updateEventDTO.getName() != event.getName() && events.size() != 0) {
             throw new XiaoShiException("名称重复");
         }
-        BeanUtils.copyProperties(eventUpdateDTO, event);
+        BeanUtils.copyProperties(updateEventDTO, event);
         event.updateById();
 
         // 根据事件Id查询对应的附件Id
         LambdaQueryWrapper<AssoEventFile> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AssoEventFile::getEventId, eventUpdateDTO.getId());
+        wrapper.eq(AssoEventFile::getEventId, updateEventDTO.getId());
         List<AssoEventFile> assoReportFiles = assoEventFileService.list(wrapper);
         List<String> fileGuIds = assoReportFiles.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
         // 获得事件更新后的附件Id
         List<String> updateFilGuId = new ArrayList<>();
-        if (eventUpdateDTO.getFileGuids() != null && eventUpdateDTO.getFileGuids().size() != 0) {
-            updateFilGuId = eventUpdateDTO.getFileGuids();
+        if (updateEventDTO.getGuids() != null && updateEventDTO.getGuids().size() != 0) {
+            updateFilGuId = updateEventDTO.getGuids();
         }
         fileGuIds.retainAll(updateFilGuId);
         //做差获得被删除的文件Id
@@ -260,11 +261,11 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     public Object getGroup(GroupRequest groupRequest,String tableName) throws Exception {
         StringRequest stringRequest =new StringRequest();
         BeanUtils.copyProperties(groupRequest,stringRequest);
-        List<String> sqls = formatQueryService.reSqls(stringRequest);
+        List<String> sqls = formatQueryService.reSqls(stringRequest,tableName);
         //格式化 分组
         GroupConfig groupConfig=null;
         if (groupRequest.getGroupBy() != null) {
-            String json = CommonService.readJsonFile("event.json");
+            String json = CommonService.readJsonFile(tableName+".json");
             List<GroupConfig> groupConfigs = JSON.parseArray(json, GroupConfig.class);
             groupConfig = groupConfigs.stream().filter(item -> groupRequest.getGroupBy().equals(item.getField())).findFirst().orElse(null);
             if (groupConfig == null) {

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -142,7 +142,7 @@ public class FormatQueryService {
      * @param node
      * @return
      */
-    public String ToString2(operateNode node, GetSqlObject getSqlObject) {
+    public String ToString2(operateNode node, GetSqlObject getSqlObject,String tableName) {
         operate operate1 = node.getoperate();
         treeNode Left = node.getLeft();
         treeNode Right = node.getRight();
@@ -159,7 +159,7 @@ public class FormatQueryService {
         GetSqlObject getSqlObjectLocal = null;
         if (Left != null) {
             if ((operate1.gettype() == enuType.Logic || operate1.gettype() == enuType.Assignment) && (Left instanceof operateNode)) {
-                strCode = "(" + this.ToString2((operateNode) Left, getSqlObject) + ") " + strCode + " ";
+                strCode = "(" + this.ToString2((operateNode) Left, getSqlObject,tableName) + ") " + strCode + " ";
             } else {  //获得栏位名称
                 String field = Left.ToString();
 
@@ -168,7 +168,7 @@ public class FormatQueryService {
                 } else {
                     strCode = Left.ToString() + " " + strCode;
                     //判断 参数类型
-                    String json = CommonService.readJsonFile("event.json");
+                    String json = CommonService.readJsonFile(tableName+".json");
                     List<SqlObject> sqlObjects = JSON.parseArray(json, SqlObject.class);
                     SqlObject sqlObject = sqlObjects.stream().filter(item -> item.getField().equals(field)).findFirst().orElse(null);
                     if (sqlObject != null) {
@@ -184,7 +184,7 @@ public class FormatQueryService {
         if (Right != null) {
             String rightValue = "";
             if ((operate1.gettype() == enuType.Logic || operate1.gettype() == enuType.Assignment) && (Right instanceof operateNode)) {
-                rightValue = this.ToString2((operateNode) Right, getSqlObject);
+                rightValue = this.ToString2((operateNode) Right, getSqlObject,tableName);
                 if (getSqlObject != null) {
                     return rightValue;
                 }
@@ -227,7 +227,7 @@ public class FormatQueryService {
      * @param queryRequest
      * @return
      */
-    public List<String> reSqls(QueryRequest queryRequest) {
+    public List<String> reSqls(QueryRequest queryRequest,String tableName) {
         List<String> sqls = new ArrayList<>();
         String sql1 = "";
         String sql2 = "";
@@ -242,7 +242,7 @@ public class FormatQueryService {
         String condition = stringRequest.getSearchQuery();
 
         if(queryRequest.getGroupField()!=null){
-            if(condition!=null) {
+            if(condition!=null&&condition!="") {
                 condition += " AND " + queryRequest.getGroupField() + "=" + queryRequest.getGroupFieldValue();
             }
             else {
@@ -256,7 +256,7 @@ public class FormatQueryService {
                 //将检索式转换为二叉树
                 treeNode tree = expressManager.getInstance().Parse(condition, false);
                 //格式化检索式
-                sql1 = this.ToString2((operateNode) tree, null);
+                sql1 = this.ToString2((operateNode) tree, null,tableName);
 
             } catch (Exception e) {
                 throw new ConditionException("检索式错误");