11

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

@@ -7,6 +7,5 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class StringGroupRequest extends GroupRequest{
   private   String searchQuery;
-  private String groupBy;
 
 }

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

@@ -93,9 +93,9 @@ public class EventController {
 
     @Operation(summary = "分组事件")
     @PostMapping("/groupEvent")
-    public Response groupEvent(StringGroupRequest stringGroupRequest) throws Exception {
+    public Response groupEvent(@RequestBody StringGroupRequest stringGroupRequest) throws Exception {
         Business business = businessFactory.getClass("eventService");
-        GroupVO groupVO = business.getGroup(stringGroupRequest);
+        GroupVO groupVO = business.getGroup(stringGroupRequest,"event");
         return Response.success(groupVO);
     }
 

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) throws Exception;
+    public GroupVO getGroup(GroupRequest groupRequest,String tableName) throws Exception;
 }

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetClientNameOrder.java

@@ -26,14 +26,12 @@ public class GetClientNameOrder implements GetOrderObject {
             ids = JSON.parseArray(json, Integer.class);
         } catch (Exception e) {
         }
+        if(ids.size()==0){
+            return "";
+        }
         String idStr = StringUtils.join(ids, ",");
         String orderStr = " field(" + orderBy + "," + idStr + ")";
-        String re = "";
-        if (orderType.equals(0)) {
-            re = orderStr + " asc";
-        } else {
-            re = orderStr + " desc";
-        }
+        String re = orderStr;
         return re;
     }
 

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetCreateNameOrder.java

@@ -29,12 +29,8 @@ public class GetCreateNameOrder implements GetOrderObject {
         }
         String idStr = StringUtils.join(ids, ",");
         String orderStr = " field(" + orderBy + "," + idStr + ")";
-        String re = "";
-        if (orderType.equals(0)) {
-            re = orderStr + " asc";
-        } else {
-            re = orderStr + " desc";
-        }
+        String re = orderStr;
+
         return re;
     }
 

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetEventProjectNumOrder.java

@@ -33,14 +33,15 @@ public class GetEventProjectNumOrder implements GetOrderObject {
 
         } catch (Exception e) {
         }
+
+        if(ids.size()==0){
+            return "";
+        }
+
         String idStr = StringUtils.join(ids, ",");
         String orderStr = " field(" + orderBy + "," + idStr + ")";
-        String re = "";
-        if (orderType.equals(0)) {
-            re = orderStr + " asc";
-        } else {
-            re = orderStr + " desc";
-        }
+        String re = orderStr;
+
         return re;
     }
 

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetEventReportNumOrder.java

@@ -31,14 +31,13 @@ public class GetEventReportNumOrder implements GetOrderObject {
 
         } catch (Exception e) {
         }
+        if(ids.size()==0){
+            return "";
+        }
         String idStr = StringUtils.join(ids, ",");
         String orderStr = " field(" + orderBy + "," + idStr + ")";
-        String re = "";
-        if (orderType.equals(0)) {
-            re = orderStr + " asc";
-        } else {
-            re = orderStr + " desc";
-        }
+        String re = orderStr;
+
         return re;
     }
 

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetScenarioNameOrder.java

@@ -28,12 +28,7 @@ public class GetScenarioNameOrder implements GetOrderObject {
         }
         String idStr = StringUtils.join(ids, ",");
         String orderStr = " field(" + orderBy + "," + idStr + ")";
-        String re = "";
-        if (orderType.equals(0)) {
-            re = orderStr + " asc";
-        } else {
-            re = orderStr + " desc";
-        }
+        String re = orderStr;
         return re;
     }
 

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

@@ -16,8 +16,9 @@ public class GetComGroup implements QueryGroupImp {
 private EventMapper eventMapper;
 
     @Override
-    public List<String> getGroup(String sql,String tableName,String groupField){
-    List<String> reValues =eventMapper.getGroups(sql,tableName,groupField);
+    public List<String> getGroup(List<String> sqls,String tableName,String groupField){
+        String selectField ="";
+    List<String> reValues =eventMapper.getGroups(sqls,tableName,groupField,selectField);
            return reValues;
     };
 

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

@@ -0,0 +1,25 @@
+package cn.cslg.pas.factorys.reGroupFactory;
+
+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.List;
+
+
+@Slf4j
+@Component
+public class GetTimeGroup implements QueryGroupImp {
+@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;
+    };
+
+}

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

@@ -7,5 +7,5 @@ import java.util.List;
  *
  */
 public interface QueryGroupImp {
-    public List<String> getGroup(String sql, String tableName, String groupField);
+    public List<String> getGroup(List<String> sqls, String tableName, String groupField);
 }

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

@@ -17,6 +17,6 @@ import java.util.List;
 @Repository
 public interface EventMapper extends BaseMapper<Event> {
     public List<EventVO> getEvent(String sql1,String sql2,String sql3);
-    public List<String> getGroups(String sql,String tableName,String groupField);
+    public List<String> getGroups(List<String> sqls,String tableName,String groupField,String selectField);
     public Long getEventCount(String sql);
 }

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

@@ -81,49 +81,14 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
-        String sql1 = "";
-        String sql2 = "";
-        String sql3 = "";
-        //合成检索式
-        StringRequest stringRequest = null;
-        if (queryRequest instanceof MapRequest) {
-
-        } else {
-            stringRequest = (StringRequest) queryRequest;
-        }
-        String condition = stringRequest.getSearchQuery();
-
-        if (condition != null && condition != "") {
-            try {
-                //将检索式转换为二叉树
-                treeNode tree = expressManager.getInstance().Parse(condition, false);
-                //格式化检索式
-                sql1 = formatQueryService.ToString2((operateNode) tree, null);
-            } catch (Exception e) {
-                throw new ConditionException("检索式错误");
-            }
-        }
-
-        //格式化排序
-        if (queryRequest.getOrderDTOList() != null && queryRequest.getOrderDTOList().size() != 0) {
-            String orderSql = formatQueryService.orderToString(queryRequest.getOrderDTOList());
-            sql2 = orderSql;
-        }
-
-        //格式化 分页信息
-        if (queryRequest.getSize() != null && queryRequest.getCurrent() != null) {
-            Long size = queryRequest.getSize();
-            Long current = queryRequest.getCurrent();
-            String page = " limit " + ((current - 1) * size) + "," + size;
-            sql3 = page;
-        }
-
+       List<String> sqls = formatQueryService.reSqls(queryRequest);
         //根据sql查询事件信息
-        List<EventVO> eventVOS = eventMapper.getEvent(sql1, sql2, sql3);
+        List<EventVO> eventVOS = eventMapper.getEvent(sqls.get(0),sqls.get(1),sqls.get(2));
 
         //查询总数
-        Long total = eventMapper.getEventCount(sql1);
+        Long total = eventMapper.getEventCount(sqls.get(0));
 
         //装载事件信息
         this.loadEvent(eventVOS);
@@ -136,6 +101,7 @@ 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;
         //检查事件格式
@@ -209,11 +175,13 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
 
     /**
      * 更新事件接口
+     *
      * @param object
      * @param files
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Object updateMessage(Object object, List<MultipartFile> files) {
 
         EventUpdateDTO eventUpdateDTO = (EventUpdateDTO) object;
@@ -290,48 +258,25 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
      * @return
      * @throws Exception
      */
-    public GroupVO getGroup(GroupRequest groupRequest) throws Exception {
-        String sql = "";
-
-        //合成检索式
-        StringGroupRequest stringGroupRequest = null;
-        if (groupRequest instanceof MapGroupRequest) {
-
-        } else {
-            stringGroupRequest = (StringGroupRequest) groupRequest;
-        }
-        String condition = stringGroupRequest.getSearchQuery();
-        if (condition != null) {
-            //将检索式转换为二叉树
-            treeNode tree = expressManager.getInstance().Parse(condition, false);
-            //格式化检索式
-            sql = formatQueryService.ToString((operateNode) tree);
-        }
+    @Transactional(rollbackFor = Exception.class)
+    public GroupVO getGroup(GroupRequest groupRequest,String tableName) throws Exception {
+        StringRequest stringRequest =new StringRequest();
+        BeanUtils.copyProperties(groupRequest,stringRequest);
+        List<String> sqls = formatQueryService.reSqls(stringRequest);
         //格式化 分组
-        String json = CommonService.readJsonFile("event_group.json");
-        List<GroupConfig> groupConfigs = JSON.parseArray(json, GroupConfig.class);
-        GroupConfig groupConfig = groupConfigs.stream().filter(item -> item.getField().equals(groupRequest.getGroupBy())).findFirst().orElse(null);
-        if (groupConfig != null) {
-            sql += " group by " + groupConfig.getSqlField() + " ";
-        }
-
-        //格式化排序
-        if (groupRequest.getOrderDTOList() != null && groupRequest.getOrderDTOList().size() != 0) {
-            String orderSql = formatQueryService.orderToString(groupRequest.getOrderDTOList());
-            sql += orderSql;
-        }
-
-        //格式化 分页信息
-        if (groupRequest.getSize() != null && groupRequest.getCurrent() != null) {
-            Long size = groupRequest.getSize();
-            Long current = groupRequest.getCurrent();
-            String page = " limit " + ((current - 1) * size) + "," + size;
-            sql += page;
+        GroupConfig groupConfig=null;
+        if (groupRequest.getGroupBy() != null) {
+            String json = CommonService.readJsonFile("event.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) {
+                throw new XiaoShiException("未找到配置");
+            }
         }
 
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
-        List<String> strs = queryGroupImp.getGroup(sql, "event", groupConfig.getSqlField());
+        List<String> strs = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());
 
         //装载数据
         GroupVO groupVO = new GroupVO();

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

@@ -188,7 +188,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
     }
 
     @Override
-    public GroupVO getGroup(GroupRequest groupRequest) throws Exception {
+    public GroupVO getGroup(GroupRequest groupRequest,String name) throws Exception {
         return null;
     }
 }

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

@@ -180,7 +180,7 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
     }
 
     @Override
-    public GroupVO getGroup(GroupRequest groupRequest) throws Exception {
+    public GroupVO getGroup(GroupRequest groupRequest,String tableName) throws Exception {
         return null;
     }
 }

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

@@ -194,7 +194,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
     }
 
     @Override
-    public GroupVO getGroup(GroupRequest groupRequest) throws Exception {
+    public GroupVO getGroup(GroupRequest groupRequest,String tableName) throws Exception {
         return null;
     }
 }

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

@@ -1,10 +1,15 @@
 package cn.cslg.pas.service.query;
 
+import cn.cslg.pas.common.model.cronModel.GroupConfig;
 import cn.cslg.pas.common.model.cronModel.OrderConfig;
 import cn.cslg.pas.common.model.cronModel.SqlObject;
+import cn.cslg.pas.common.model.request.MapRequest;
 import cn.cslg.pas.common.model.request.OrderDTO;
+import cn.cslg.pas.common.model.request.QueryRequest;
+import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.utils.parseQueryToTree.*;
+import cn.cslg.pas.exception.ConditionException;
 import cn.cslg.pas.factorys.getOrderFactory.GetOrderFactory;
 import cn.cslg.pas.factorys.getOrderFactory.GetOrderObject;
 import cn.cslg.pas.factorys.getSqlFactorys.GetSqlFactory;
@@ -107,7 +112,7 @@ public class FormatQueryService {
      */
     public String orderToString(List<OrderDTO> dtos) {
         //读取排序配置类
-        String json = CommonService.readJsonFile("event_order.json");
+        String json = CommonService.readJsonFile("event.json");
         List<OrderConfig> configs = JSON.parseArray(json, OrderConfig.class);
         String re = "order by ";
         List<String> orders = new ArrayList<>();
@@ -115,8 +120,16 @@ public class FormatQueryService {
             OrderConfig orderConfig = configs.stream().filter(tem -> tem.getField().equals(item.getOrderBy())).findFirst().orElse(null);
             GetOrderObject getOrderObject = getOrderFactory.getClass(orderConfig.getOrderClass());
             String order = getOrderObject.getOrderString(orderConfig.getSqlField(), item.getOrderType());
-            orders.add(order);
+
+            if (order != "") {
+                orders.add(order);
+            }
         });
+
+        if(orders.size()==0){
+            return  "";
+        }
+
         String orderStr = StringUtils.join(orders, ",");
         re += orderStr;
         return re;
@@ -143,26 +156,26 @@ public class FormatQueryService {
             optionName = operate1.getCode();
         }
 
-        GetSqlObject getSqlObjectLocal =null;
+        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) + ") " + strCode + " ";
             } else {  //获得栏位名称
                 String field = Left.ToString();
 
                 if (getSqlObject != null) {
-                    strCode = getSqlObject.getSql(field) +strCode+" ";
+                    strCode = getSqlObject.getSql(field) + strCode + " ";
                 } else {
                     strCode = Left.ToString() + " " + strCode;
                     //判断 参数类型
-                    String json = CommonService.readJsonFile("event_sql.json");
+                    String json = CommonService.readJsonFile("event.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) {
                         getSqlObjectLocal = getSqlFactory.getClass(sqlObject.getSqlClass());
                         sqlObject.setOption(optionName);
                         getSqlObjectLocal.setSqlObject(sqlObject);
-                        getSqlObject =getSqlObjectLocal;
+                        getSqlObject = getSqlObjectLocal;
                     }
                 }
             }
@@ -176,14 +189,12 @@ public class FormatQueryService {
                     return rightValue;
                 }
                 strCode = strCode + " (" + rightValue + ") ";
-            }
-            else {
-                if(getSqlObjectLocal!=null){
-                    rightValue =Right.ToString();
-                    strCode =  getSqlObject.getSql(rightValue);
-                }
-               else if (getSqlObject != null) {
-                    rightValue =Right.ToString();
+            } else {
+                if (getSqlObjectLocal != null) {
+                    rightValue = Right.ToString();
+                    strCode = getSqlObject.getSql(rightValue);
+                } else if (getSqlObject != null) {
+                    rightValue = Right.ToString();
                     strCode = strCode + getSqlObject.getSql(rightValue);
                 }
 
@@ -194,5 +205,71 @@ public class FormatQueryService {
         return strCode;
     }
 
+    /**
+     * 格式化分组
+     *
+     * @param groupBy
+     * @return
+     */
+    public String groupToString(String groupBy) {
+        String json = CommonService.readJsonFile("event.json");
+        List<GroupConfig> groupConfigs = JSON.parseArray(json, GroupConfig.class);
+        GroupConfig groupConfig = groupConfigs.stream().filter(item -> item.getField().equals(groupBy)).findFirst().orElse(null);
+        if (groupConfig != null) {
+            return " group by " + groupConfig.getSqlField() + " ";
+        }
+        return "";
+    }
+
+    /**
+     * 返回sql列表
+     *
+     * @param queryRequest
+     * @return
+     */
+    public List<String> reSqls(QueryRequest queryRequest) {
+        List<String> sqls = new ArrayList<>();
+        String sql1 = "";
+        String sql2 = "";
+        String sql3 = "";
+        //合成检索式
+        StringRequest stringRequest = null;
+        if (queryRequest instanceof MapRequest) {
+
+        } else {
+            stringRequest = (StringRequest) queryRequest;
+        }
+        String condition = stringRequest.getSearchQuery();
+
+        if (condition != null && condition != "") {
+            try {
+                //将检索式转换为二叉树
+                treeNode tree = expressManager.getInstance().Parse(condition, false);
+                //格式化检索式
+                sql1 = this.ToString2((operateNode) tree, null);
 
+            } catch (Exception e) {
+                throw new ConditionException("检索式错误");
+            }
+        }
+
+        //格式化排序
+        if (queryRequest.getOrderDTOList() != null && queryRequest.getOrderDTOList().size() != 0) {
+            String orderSql = this.orderToString(queryRequest.getOrderDTOList());
+            sql2 = orderSql;
+
+        }
+
+        //格式化 分页信息
+        if (queryRequest.getSize() != null && queryRequest.getCurrent() != null) {
+            Long size = queryRequest.getSize();
+            Long current = queryRequest.getCurrent();
+            String page = " limit " + ((current - 1) * size) + "," + size;
+            sql3 = page;
+        }
+        sqls.add(sql1);
+        sqls.add(sql2);
+        sqls.add(sql3);
+        return sqls;
+    }
 }

src/main/resources/jsons/event.json

@@ -27,14 +27,18 @@
     "field": "createName",
     "sqlField": "create_id",
     "sqlClass": "getCreateNameSql",
+    "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
     "ifSearch":"true",
-    "ifGroup": "false",
+    "ifGroup": "false"
 
   },
   {"name":"客户",
     "type":"String",
     "value":"clientName",
+    "field": "clientName",
+    "sqlField": "client_id",
+    "orderClass": "getClientNameOrder",
     "ifSearch":"true",
     "ifGroup": "false"
   },
@@ -45,6 +49,7 @@
     "sqlField": "create_time",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
+    "groupClass":"getTimeGroup",
     "ifSearch":"true",
     "ifGroup": "true"
   },
@@ -55,12 +60,17 @@
     "sqlField": "event_Date",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
+    "groupClass":"getTimeGroup",
     "ifSearch":"true",
     "ifGroup": "true"
   },
   {"name":"描述",
     "type":"String",
     "value":"description",
+    "field": "description",
+    "sqlField": "description",
+    "sqlClass": "getComSql",
+    "orderClass": "getComOrder",
     "ifSearch":"true",
     "ifGroup": "false"
   },
@@ -71,6 +81,7 @@
     "sqlField": "scenario_id",
     "sqlClass": "getComSql",
     "orderClass": "getScenarioNameOrder",
+    "groupClass":"getScenarioGroup",
     "ifSearch":"true",
     "ifGroup": "true"
   },

src/main/resources/jsons/event_group.json

@@ -4,7 +4,6 @@
 {"field":"id","sqlField":"id","groupClass":"getComGroup"
 },
 {"field":"createName","sqlField":"create_id","groupClass":"getComGroup"
-
 }
 
 ]

src/main/resources/mapper/Event.xml

@@ -4,22 +4,28 @@
   <select id="getEvent"  resultType="cn.cslg.pas.common.vo.business.EventVO">
    select id,name,description,client_id as clientId,scenario_id as scenarioId,event_date as eventDate,create_id as createId,create_time as createTime from event
 
-      <where>
-          ${sql1}
-      </where>
+
+        <if test="sql1!=''">
+
+        where    ${sql1}
+        </if>
+
+
       ${sql2} ${sql3}
   </select>
 
     <select id="getEventCount" resultType="java.lang.Long">
         select count(*) from event
-        <where>
-            ${sql}
-        </where>
+        <if test="sql!=''">
+
+            where    ${sql}
+        </if>
     </select>
     <select id="getGroups"  resultType="java.lang.String">
-        select ${groupField} from  ${tableName}
-        <where>
-            ${sql}
-        </where>
+        select ${selectField} from  ${tableName}
+        <if test="sqls.get(0)!=''">
+            where    ${sqls.get(0)}
+        </if>
+        ${sqls.get(1)}  group by ${groupField}  ${sqls.get(2)}
     </select>
 </mapper>