Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/config/ElasticSearchClientConfig.java

@@ -26,7 +26,6 @@ public class ElasticSearchClientConfig {
 
     @Configuration
     public class ElasticSearchConfig {
-
         //注入IOC容器
         @Bean
         public ElasticsearchClient elasticsearchClient() throws Exception {

src/main/java/cn/cslg/pas/common/model/cronModel/GroupVO.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.common.model.cronModel;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 获得排序配置类
@@ -13,6 +14,6 @@ public class GroupVO {
      * ID
      */
     private String field;
-    private List<String> values;
+    private List<Map<String,Object>> values;
 
 }

src/main/java/cn/cslg/pas/common/model/cronModel/QueryConfig.java

@@ -0,0 +1,41 @@
+package cn.cslg.pas.common.model.cronModel;
+
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 委托方表
+ * </p>
+ *
+ * @author 王岩
+ * @since 2022-02-17
+ */
+@Data
+public class QueryConfig {
+    /**
+     * 检索条件
+     */
+    private String conditonSql;
+
+
+    /**
+     * 排序条件
+     */
+    private String  orderSql;
+
+
+    /**
+     * 分页条件
+     */
+    private String pageSql;
+
+    /**
+     * 分组后查询条件
+     */
+    private String groupHavingSql;
+
+
+   private String groupField;
+
+}

src/main/java/cn/cslg/pas/common/model/cronModel/ReGroupDataVO.java

@@ -0,0 +1,19 @@
+package cn.cslg.pas.common.model.cronModel;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 获得排序配置类
+ */
+@Data
+public class ReGroupDataVO {
+    /**
+     * ID
+     */
+    private Long total;
+    private List<Map<String,Object>> values;
+
+}

src/main/java/cn/cslg/pas/common/model/request/QueryRequest.java

@@ -12,5 +12,7 @@ public class QueryRequest {
 
     private Long current;
     private Long size;
+    private String groupField;
+    private String groupFieldValue;
     private List<OrderDTO> orderDTOList;
 }

src/main/java/cn/cslg/pas/common/vo/ConditionVO.java

@@ -12,5 +12,6 @@ public class ConditionVO {
     private String value;
     private Boolean ifSearch;
     private Boolean ifGroup;
+    private Boolean ifShow;
 
 }

src/main/java/cn/cslg/pas/controller/EventController.java

@@ -95,8 +95,8 @@ public class EventController {
     @PostMapping("/groupEvent")
     public Response groupEvent(@RequestBody StringGroupRequest stringGroupRequest) throws Exception {
         Business business = businessFactory.getClass("eventService");
-        GroupVO groupVO = business.getGroup(stringGroupRequest,"event");
-        return Response.success(groupVO);
+        Records records = (Records)business.getGroup(stringGroupRequest,"event");
+        return Response.success(records);
     }
 
 }

src/main/java/cn/cslg/pas/domain/School.java

@@ -1,8 +1,10 @@
 package cn.cslg.pas.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class School {
-    private String name;
+    @JsonProperty("name")
+    private String name_test;
 }

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

@@ -0,0 +1,16 @@
+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 Patent {
+    @JsonProperty("")
+    private String patentName;
+}

src/main/java/cn/cslg/pas/factorys/businessFactory/Business.java

@@ -13,5 +13,5 @@ public interface Business {
     public Object addMessage(Object object,List<MultipartFile> files);
     public Object deleteMessage(List<Integer> ids) throws IOException;
     public Object updateMessage(Object object,List<MultipartFile> files);
-    public GroupVO getGroup(GroupRequest groupRequest,String tableName) throws Exception;
+    public Object getGroup(GroupRequest groupRequest,String tableName) throws Exception;
 }

src/main/java/cn/cslg/pas/factorys/getSqlFactorys/GetDateTimeMonthSql.java

@@ -0,0 +1,28 @@
+package cn.cslg.pas.factorys.getSqlFactorys;
+
+import cn.cslg.pas.common.model.cronModel.SqlObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+
+@Slf4j
+@Component
+public class GetDateTimeMonthSql implements GetSqlObject{
+
+ private SqlObject sqlObject ;
+    @Override
+    public String getSql(String value) {
+        String re ="";
+      String filed= sqlObject.getSqlField();
+      String option =sqlObject.getOption();
+        re="DATE_FORMAT("+filed+",'%Y%m')"+option+"'"+value+"'";
+       return re;
+    }
+
+    public void setSqlObject(SqlObject sqlObject){
+        this.sqlObject=sqlObject;
+    }
+    public SqlObject getSqlObject(){
+        return sqlObject;
+    }
+}

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetComGroup.java

@@ -1,12 +1,14 @@
 package cn.cslg.pas.factorys.reGroupFactory;
 
-import cn.cslg.pas.factorys.getOrderFactory.GetOrderObject;
+import cn.cslg.pas.common.model.cronModel.ReGroupDataVO;
 import cn.cslg.pas.mapper.EventMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 @Slf4j
@@ -16,10 +18,12 @@ public class GetComGroup implements QueryGroupImp {
 private EventMapper eventMapper;
 
     @Override
-    public List<String> getGroup(List<String> sqls,String tableName,String groupField){
+    public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField){
+        ReGroupDataVO reGroupDataVO =new ReGroupDataVO();
+        List<Map<String, Object>> maps = new ArrayList<>();
         String selectField ="";
     List<String> reValues =eventMapper.getGroups(sqls,tableName,groupField,selectField);
-           return reValues;
+        return reGroupDataVO;
     };
 
 }

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetScenarioGroup.java

@@ -0,0 +1,51 @@
+package cn.cslg.pas.factorys.reGroupFactory;
+
+import cn.cslg.pas.common.model.cronModel.ReGroupDataVO;
+import cn.cslg.pas.domain.business.SystemDict;
+import cn.cslg.pas.mapper.EventMapper;
+import cn.cslg.pas.service.business.SystemDictService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+
+@Slf4j
+@Component
+public class GetScenarioGroup implements QueryGroupImp {
+    @Autowired
+    private EventMapper eventMapper;
+    @Autowired
+    private SystemDictService systemDictService;
+
+    @Override
+    public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField) {
+        ReGroupDataVO reGroupDataVO =new ReGroupDataVO();
+        List<Map<String, Object>> maps = new ArrayList<>();
+        List<String> reValues =new ArrayList<>();
+        String selectField = groupField;
+        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList("ENTERPRISE_APPLICATION_SCENARIO"));
+
+        //分组查询应用场景
+        List<String> scenarioIds = eventMapper.getGroups(sqls, tableName, groupField, selectField);
+        Long total =eventMapper.getGroupsCount(sqls, tableName, groupField, selectField);
+        //装载应用场景名称
+        scenarioIds.forEach(item->{
+     SystemDict systemDict = systemDictList.stream().filter(tem->tem.getValue().equals(item)).findFirst().orElse(null);
+            if(systemDict!=null)
+            {reValues.add(systemDict.getLabel());
+                Map<String,Object> map =new HashMap<>();
+                map.put("name",systemDict.getLabel());
+                map.put("value",systemDict.getValue());
+                maps.add(map);
+            }
+        });
+        reGroupDataVO.setValues(maps);
+        reGroupDataVO.setTotal(total);
+        return reGroupDataVO;
+    }
+
+    ;
+
+}

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetTimeGroup.java

@@ -1,25 +1,47 @@
 package cn.cslg.pas.factorys.reGroupFactory;
 
+import cn.cslg.pas.common.model.cronModel.ReGroupDataVO;
 import cn.cslg.pas.mapper.EventMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @Slf4j
 @Component
 public class GetTimeGroup implements QueryGroupImp {
-@Autowired
-private EventMapper eventMapper;
+    @Autowired
+    private EventMapper eventMapper;
+
 
     @Override
-    public List<String> getGroup(List<String> sqls,String tableName,String groupField){
-        String selectField ="DATE_FORMAT("+groupField+",'%Y%m')";
-         groupField =selectField;
-    List<String> reValues =eventMapper.getGroups(sqls,tableName,groupField,selectField);
-           return reValues;
-    };
+    public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField) {
+        ReGroupDataVO reGroupDataVO =new ReGroupDataVO();
+        List<Map<String, Object>> maps = new ArrayList<>();
+        String selectField = "DATE_FORMAT(" + groupField + ",'%Y%m')";
+        groupField = selectField;
+        List<String> reValues = eventMapper.getGroups(sqls, tableName, groupField, selectField);
+        Long total =eventMapper.getGroupsCount(sqls, tableName, groupField, selectField);
+        reValues.forEach(
+                item->{
+                    Map<String,Object> map =new HashMap<>();
+                    if(item!=null) {
+                        map.put("name", item);
+                        map.put("value", item);
+                        maps.add(map);
+                    }
+                }
+        );
+        reGroupDataVO.setValues(maps);
+        reGroupDataVO.setTotal(total);
+        return reGroupDataVO;
+    }
+
+    ;
 
 }

src/main/java/cn/cslg/pas/factorys/reGroupFactory/QueryGroupFactory.java

@@ -1,6 +1,5 @@
 package cn.cslg.pas.factorys.reGroupFactory;
 
-import cn.cslg.pas.factorys.getSqlFactorys.GetSqlObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

src/main/java/cn/cslg/pas/factorys/reGroupFactory/QueryGroupImp.java

@@ -1,11 +1,14 @@
 package cn.cslg.pas.factorys.reGroupFactory;
 
 
+import cn.cslg.pas.common.model.cronModel.ReGroupDataVO;
+
 import java.util.List;
+import java.util.Map;
 
 /**分组查询接口类
  *
  */
 public interface QueryGroupImp {
-    public List<String> getGroup(List<String> sqls, String tableName, String groupField);
+    public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField);
 }

src/main/java/cn/cslg/pas/mapper/EventMapper.java

@@ -19,4 +19,5 @@ public interface EventMapper extends BaseMapper<Event> {
     public List<EventVO> getEvent(String sql1,String sql2,String sql3);
     public List<String> getGroups(List<String> sqls,String tableName,String groupField,String selectField);
     public Long getEventCount(String sql);
+    public Long getGroupsCount(List<String> sqls,String tableName,String groupField,String selectField);
 }

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

@@ -7,15 +7,11 @@ import cn.cslg.pas.common.model.request.*;
 
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
-import cn.cslg.pas.common.utils.parseQueryToTree.expressManager;
-import cn.cslg.pas.common.utils.parseQueryToTree.operateNode;
-import cn.cslg.pas.common.utils.parseQueryToTree.treeNode;
 import cn.cslg.pas.common.vo.business.EventCountVO;
 import cn.cslg.pas.common.vo.business.EventVO;
 import cn.cslg.pas.domain.business.AssoEventFile;
 import cn.cslg.pas.domain.business.Event;
 import cn.cslg.pas.domain.business.SystemDict;
-import cn.cslg.pas.exception.ConditionException;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
@@ -41,6 +37,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -83,6 +80,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
+
        List<String> sqls = formatQueryService.reSqls(queryRequest);
         //根据sql查询事件信息
         List<EventVO> eventVOS = eventMapper.getEvent(sqls.get(0),sqls.get(1),sqls.get(2));
@@ -103,9 +101,9 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer addMessage(Object object, List<MultipartFile> files) {
-        EventUpdateDTO eventUpdateDTO = (EventUpdateDTO) object;
+        EventDTO eventDTO = (EventDTO) object;
         //检查事件格式
-        if (eventUpdateDTO.getScenarioId() == null) {
+        if (eventDTO.getScenarioId() == null) {
             throw new XiaoShiException("参数错误");
         }
 
@@ -118,8 +116,8 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         }
 
         //根据名称查询是否重复
-        eventUpdateDTO.setName(eventUpdateDTO.getName().trim());
-        String name = eventUpdateDTO.getName();
+        eventDTO.setName(eventDTO.getName().trim());
+        String name = eventDTO.getName();
         LambdaQueryWrapper<Event> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Event::getName, name);
         List<Event> events = this.list(queryWrapper);
@@ -129,7 +127,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
 
         //事件入库
         Event event = new Event();
-        BeanUtils.copyProperties(eventUpdateDTO, event);
+        BeanUtils.copyProperties(eventDTO, event);
         event.setCreateId(personnelVO.getId());
         event.setTenantId(personnelVO.getTenantId());
         event.insert();
@@ -259,7 +257,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
      * @throws Exception
      */
     @Transactional(rollbackFor = Exception.class)
-    public GroupVO getGroup(GroupRequest groupRequest,String tableName) throws Exception {
+    public Object getGroup(GroupRequest groupRequest,String tableName) throws Exception {
         StringRequest stringRequest =new StringRequest();
         BeanUtils.copyProperties(groupRequest,stringRequest);
         List<String> sqls = formatQueryService.reSqls(stringRequest);
@@ -276,13 +274,18 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
 
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
-        List<String> strs = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());
+        ReGroupDataVO  reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());
 
         //装载数据
         GroupVO groupVO = new GroupVO();
         groupVO.setField(groupRequest.getGroupBy());
-        groupVO.setValues(strs);
-        return groupVO;
+        groupVO.setValues(reGroupDataVO.getValues());
+        Records records = new Records();
+        records.setCurrent(groupRequest.getCurrent());
+        records.setSize(groupRequest.getSize());
+        records.setData(groupVO);
+        records.setTotal(reGroupDataVO.getTotal());
+        return records;
     }
 
     /**

src/main/java/cn/cslg/pas/service/EsService.java

@@ -1,4 +1,4 @@
-package cn.cslg.pas.service;
+package cn.cslg.pas.service.business.es;
 
 import cn.cslg.pas.domain.School;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
@@ -14,7 +14,7 @@ public class EsService {
  private final ElasticsearchClient client;
     public void addDoc() throws Exception {
         School user = new School();
-        user.setName("广西111");
+        user.setName_test("广西6");
         IndexResponse indexResponse = client.index(i -> i
                 .index("school")
                 //设置id

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

@@ -241,6 +241,16 @@ public class FormatQueryService {
         }
         String condition = stringRequest.getSearchQuery();
 
+        if(queryRequest.getGroupField()!=null){
+            if(condition!=null) {
+                condition += " AND " + queryRequest.getGroupField() + "=" + queryRequest.getGroupFieldValue();
+            }
+            else {
+                condition = queryRequest.getGroupField() + "=" + queryRequest.getGroupFieldValue();
+            }
+        }
+
+        //检索式格式化
         if (condition != null && condition != "") {
             try {
                 //将检索式转换为二叉树
@@ -267,6 +277,9 @@ public class FormatQueryService {
             String page = " limit " + ((current - 1) * size) + "," + size;
             sql3 = page;
         }
+
+        //格式化分组信息
+
         sqls.add(sql1);
         sqls.add(sql2);
         sqls.add(sql3);

src/main/resources/jsons/event.json

@@ -8,7 +8,8 @@
     "orderClass": "getComOrder",
     "groupClass":"getComGroup",
     "ifSearch":"false",
-    "ifGroup": "false"
+    "ifGroup": "false",
+    "ifShow":"true"
   },
   {"name":"事件名称",
   "type":"String",
@@ -19,7 +20,8 @@
     "orderClass": "getComOrder",
     "groupClass":"getComGroup",
   "ifSearch":"true",
-  "ifGroup": "false"
+  "ifGroup": "false",
+    "ifShow":"true"
 },
   {"name":"创建人",
     "type":"String",
@@ -30,7 +32,8 @@
     "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
     "ifSearch":"true",
-    "ifGroup": "false"
+    "ifGroup": "false",
+    "ifShow":"true"
 
   },
   {"name":"客户",
@@ -40,7 +43,8 @@
     "sqlField": "client_id",
     "orderClass": "getClientNameOrder",
     "ifSearch":"true",
-    "ifGroup": "false"
+    "ifGroup": "false",
+    "ifShow":"true"
   },
   {"name":"创建时间",
     "type":"DateTime",
@@ -51,7 +55,20 @@
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
     "ifSearch":"true",
-    "ifGroup": "true"
+    "ifGroup": "false",
+    "ifShow":"true"
+  },
+  {"name":"创建月份",
+    "type":"DateTime",
+    "value":"createTimeMonth",
+    "field": "createTimeMonth",
+    "sqlField": "create_time",
+    "sqlClass": "getDateTimeMonthSql",
+    "orderClass": "getComOrder",
+    "groupClass":"getTimeGroup",
+    "ifSearch":"false",
+    "ifGroup": "true",
+    "ifShow":"false"
   },
   {"name":"发生时间",
     "type":"DateTime",
@@ -62,7 +79,20 @@
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
     "ifSearch":"true",
-    "ifGroup": "true"
+    "ifGroup": "true",
+    "ifShow":"true"
+  },
+  {"name":"发生月份",
+    "type":"DateTime",
+    "value":"eventDateMonth",
+    "field": "eventDateMonth",
+    "sqlField": "event_Date",
+    "sqlClass": "getDateTimeMonthSql",
+    "orderClass": "getComOrder",
+    "groupClass":"getTimeGroup",
+    "ifSearch":"false",
+    "ifGroup": "true",
+    "ifShow":"false"
   },
   {"name":"描述",
     "type":"String",
@@ -72,7 +102,9 @@
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"true",
-    "ifGroup": "false"
+    "ifGroup": "false",
+    "ifShow":"true"
+
   },
   {"name":"应用场景",
     "type":"Integer",
@@ -83,17 +115,8 @@
     "orderClass": "getScenarioNameOrder",
     "groupClass":"getScenarioGroup",
     "ifSearch":"true",
-    "ifGroup": "true"
-  },
-  {"name":"委托方",
-    "type":"String",
-    "value":"clientName",
-    "field": "clientName",
-    "sqlField": "client_id",
-    "sqlClass": "getClientNameSql",
-    "orderClass": "getClientNameOrder",
-    "ifSearch":"false",
-    "ifGroup": "false"
+    "ifGroup": "true",
+    "ifShow":"true"
   },
   {
     "name":"报告数量",
@@ -103,7 +126,9 @@
     "sqlField": "event_id",
     "orderClass": "getEventReportNumOrder",
     "ifSearch":"false",
-    "ifGroup": "false"
+    "ifGroup": "false",
+    "ifShow":"true"
+
   },
   {
     "name":"专题库数量",
@@ -113,6 +138,7 @@
     "sqlField": "event_id",
     "orderClass": "getEventProjectNumOrder",
     "ifSearch":"false",
-    "ifGroup": "false"
+    "ifGroup": "false",
+    "ifShow":"true"
   }
 ]

src/main/resources/mapper/Event.xml

@@ -26,6 +26,15 @@
         <if test="sqls.get(0)!=''">
             where    ${sqls.get(0)}
         </if>
-        ${sqls.get(1)}  group by ${groupField}  ${sqls.get(2)}
+          group by ${groupField} ${sqls.get(1)}  ${sqls.get(2)}
+    </select>
+
+    <select id="getGroupsCount"  resultType="java.lang.Long">
+        select count(*) from (select ${selectField} from ${tableName}
+        <if test="sqls.get(0)!=''">
+            where ${sqls.get(0)}
+        </if>
+         group by ${groupField}
+        ) as c
     </select>
 </mapper>

src/test/java/cn/cslg/pas/service/CommonServiceTests.java

@@ -29,7 +29,7 @@ public class CommonServiceTests {
     private CommonController commonController;
     @Test
     void test() throws Exception {
-     String aa=   permissionService.getPersonIdByNamePCS("朱");
+     String aa=   permissionService.getPersonIdByNamePCS("朱",false);
      System.out.println(aa);
     }
 

src/test/java/cn/cslg/pas/service/EsServiceTests.java

@@ -0,0 +1,30 @@
+package cn.cslg.pas.service;
+
+import cn.cslg.pas.controller.CommonController;
+import cn.cslg.pas.controller.EventController;
+import cn.cslg.pas.service.business.es.EsService;
+import cn.cslg.pas.service.permissions.PermissionService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author chenyu
+ * @date 2023/9/6
+ */
+@SpringBootTest
+public class EsServiceTests {
+    @Autowired
+    private EsService esService;
+
+    @Test
+    void addIoc() throws Exception {
+        List<String> list =new ArrayList<>();
+        list.add("event");
+        esService.addDoc();
+    }
+
+}