事件查询配置修改

src/main/java/cn/cslg/pas/common/dto/FMSDeleteFileDTO.java

@@ -15,7 +15,7 @@ public class FMSDeleteFileDTO {
     /**
      * 文件ids
      */
-    private List<Integer> ids;
+    private List<String> guids;
 
     /**
      * 删除类型（2物理删除 1逻辑删除）

src/main/java/cn/cslg/pas/common/dto/business/EventUpdateDTO.java

@@ -0,0 +1,37 @@
+package cn.cslg.pas.common.dto.business;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 事件DTO类
+ * </p>
+ *
+ * @author 李仁杰
+ * @since 2022-10-20
+ */
+@Data
+/*数据库中的表对应的类
+ */
+public class EventUpdateDTO {
+    @Schema(description = "id")
+    private Integer id;
+    @Schema(description = "名称")
+ private String name;
+    @Schema(description = "描述")
+    private String description;
+    @Schema(description = "客户id")
+ private Integer clientId;
+    @Schema(description = "场景id")
+ private Integer scenarioId;
+    @Schema(description = "发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date eventDate;
+
+}

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

@@ -0,0 +1,14 @@
+package cn.cslg.pas.common.model.cronModel;
+
+import cn.cslg.pas.common.vo.business.EventVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Records {
+    Object data;
+    Long total;
+    Long current;
+    Long size;
+}

src/main/java/cn/cslg/pas/common/utils/Response.java

@@ -84,6 +84,22 @@ public class Response {
         return JsonUtils.objectToJson(response);
     }
 
+
+    public static Response unLogin(String message) {
+        Response response = new Response();
+        response.setCode(ResponseEnum.UNAUTHORIZED.getCode());
+        response.setData(Boolean.FALSE);
+        response.setMessage(message);
+        return response;
+    }
+
+    public static Response conditionError(String message) {
+        Response response = new Response();
+        response.setCode(ResponseEnum.CONDITION_ERROR.getCode());
+        response.setData(Boolean.FALSE);
+        response.setMessage(message);
+        return response;
+    }
     public static String error(ResponseEnum responseEnum) {
         Response response = new Response();
         response.setResultEnum(responseEnum);

src/main/java/cn/cslg/pas/common/utils/ResponseEnum.java

@@ -3,28 +3,14 @@ package cn.cslg.pas.common.utils;
 public enum ResponseEnum {
 
     SUCCESS(200, "请求成功"),
-    WEB_SOCKET_SUCCESS(2, "WebSocket请求成功"),
-    BATCH_UPLOAD_INSTRUCTION_TASK_SUCCESS(900, "WebSocket请求成功"),
-    PROJECT_IMPORT_TASK_SUCCESS(901, "WebSocket请求成功"),
-    PROJECT_EXPORT_TASK_SUCCESS(902, "WebSocket请求成功"),
-    PATENT_IMPORT_TASK_SUCCESS(903, "WebSocket请求成功"),
-    PATENT_EXPORT_TASK_SUCCESS(904, "WebSocket请求成功"),
     UNAUTHORIZED(401, "未登录"),
     NOT_PERMISSION(402, "无操作权限"),
-    FORBIDDEN(403, "拒绝访问"),
-    USERNAME_ERROR(0, "用户名不存在"),
-    PASSWORD_ERROR(0, "密码错误"),
-    VERIFY_CODE_ERROR(0, "验证码错误"),
-    QUERY_CACHE_ERROR(0, "专利检索缓存失效，请重试"),
-    BATCH_UPLOAD_INSTRUCTION_TASK_ERROR(800, "导入说明书失败"),
-    PROJECT_EXPORT_TASK_ERROR(802, "专题库数据导出失败"),
-    PATENT_IMPORT_TASK_ERROR(803, "专利导入专利失败"),
-    PATENT_EXPORT_TASK_ERROR(804, "专利导出专利失败"),
     SYSTEM_ERROR(500, "系统异常"),
     SUCCESSBUT(200, "请求成功"),
     ERROR(0, "请求失败"),
     NO_PERMISSION(201,"无权限"),
-    PARAMS_ERROR(202,"参数错误")
+    PARAMS_ERROR(202,"参数错误"),
+    CONDITION_ERROR(203, "检索式错误")
     ;
 
     private Integer code;

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

@@ -3,10 +3,12 @@ package cn.cslg.pas.controller;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.dto.business.EventDTO;
 import cn.cslg.pas.common.model.cronModel.GroupVO;
+import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.StringGroupRequest;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
-import cn.cslg.pas.common.vo.business.EventVO;
+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;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
@@ -37,8 +39,8 @@ public class EventController {
     @PostMapping("/queryEvent")
     public Response queryEvent(@RequestBody StringRequest stringRequest) throws Exception {
         Business business = businessFactory.getClass("eventService");
-     List<EventVO> eventVOS =  (List<EventVO>)business.queryMessage(stringRequest);
-        return Response.success(eventVOS);
+     Records records =  (Records)business.queryMessage(stringRequest);
+        return Response.success(records);
     }
 
 
@@ -56,6 +58,12 @@ public class EventController {
                 if(e instanceof XiaoShiException) {
                     return Response.error(e.getMessage());
                 }
+                else if (e instanceof UnLoginException) {
+                    return Response.unLogin(e.getMessage());
+                }
+                else if (e instanceof ConditionException) {
+                    return Response.conditionError(e.getMessage());
+                }
             }
             return Response.success(id);
         } else {
@@ -78,7 +86,7 @@ public class EventController {
 
     @Operation(summary = "删除事件")
     @PostMapping("/deleteEvent")
-    public String queryEvent(@RequestBody List<Integer> ids) throws Exception {
+    public String deleteEvent(@RequestBody List<Integer> ids) throws Exception {
         Business business = businessFactory.getClass("eventService");
         business.deleteMessage(ids);
         return Response.success();

src/main/java/cn/cslg/pas/domain/business/Event.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.joda.time.DateTime;
 
+import java.util.Date;
+
 /**
  * <p>
  * 事件表
@@ -27,7 +29,7 @@ public class Event extends BaseEntity<Event> {
     @TableField(value = "scenario_id")
     private Integer scenarioId;
     @TableField(value = "event_date")
-    private DateTime eventDate;
+    private Date eventDate;
     @TableField(value = "event_id")
     private Integer eventId;
     @TableField(value = "description")

src/main/java/cn/cslg/pas/exception/ConditionException.java

@@ -0,0 +1,15 @@
+package cn.cslg.pas.exception;
+
+/**
+ * 整个项目通用异常类
+ *
+ * @Author chenyu
+ * @Date 2023/3/7
+ */
+public class ConditionException extends RuntimeException {
+
+    public ConditionException(String message) {
+        super(message);
+    }
+
+}

src/main/java/cn/cslg/pas/exception/UnLoginException.java

@@ -0,0 +1,15 @@
+package cn.cslg.pas.exception;
+
+/**
+ * 整个项目通用异常类
+ *
+ * @Author chenyu
+ * @Date 2023/3/7
+ */
+public class UnLoginException extends RuntimeException {
+
+    public UnLoginException(String message) {
+        super(message);
+    }
+
+}

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

@@ -5,12 +5,13 @@ import cn.cslg.pas.common.model.request.GroupRequest;
 import cn.cslg.pas.common.model.request.QueryRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface Business {
     public Object queryMessage(QueryRequest queryRequest) throws Exception;
     public Object addMessage(Object object,List<MultipartFile> files);
-    public Object deleteMessage(List<Integer> ids);
+    public Object deleteMessage(List<Integer> ids) throws IOException;
     public Object updateMessage(Object object,List<MultipartFile> files);
     public GroupVO getGroup(GroupRequest groupRequest) throws Exception;
 }

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

@@ -0,0 +1,51 @@
+package cn.cslg.pas.factorys.getSqlFactorys;
+
+import cn.cslg.pas.common.model.cronModel.SqlObject;
+import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.service.permissions.PermissionService;
+import com.alibaba.fastjson.JSON;
+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;
+
+
+@Slf4j
+@Component
+public class GetClientNameSql implements GetSqlObject{
+    private SqlObject sqlObject ;
+  @Autowired
+  private PermissionService permissionService;
+    @Override
+    public String getSql( String value) {
+        //根据名称查询人员id
+        List<Integer> ids = null;
+        if(sqlObject.getOption()=="=")
+        {
+            sqlObject.setOption(" in ");
+        }
+       else if(sqlObject.getOption()=="!=")
+        {
+            sqlObject.setOption(" not in ");
+        }
+       //根据名称查询
+        try {
+          String json =  permissionService.getClientIdByNamePCS(value);
+           ids = JSON.parseArray(json,Integer.class);
+        }catch (Exception e){
+        }
+        if(ids==null||ids.size()==0){
+            ids =new ArrayList<>();
+            ids.add(0);
+        }
+        String idStr = StringUtils.join(ids,",");
+        String re = sqlObject.getSqlField()+sqlObject.getOption()+"("+idStr+")";
+        return re;
+    }
+    @Override
+    public void setSqlObject(SqlObject sqlObject){
+        this.sqlObject =sqlObject;
+    };
+}

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

@@ -28,7 +28,7 @@ public class GetComSql  implements GetSqlObject{
     public String getSql(String value) {
       String filed= sqlObject.getSqlField();
       String option =sqlObject.getOption();
-       return filed+option+value;
+       return  filed+option+"'"+value+"'";
     }
 
     public void setSqlObject(SqlObject sqlObject){

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

@@ -0,0 +1,25 @@
+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 GetDateTimeSql implements GetSqlObject{
+
+ private SqlObject sqlObject ;
+    @Override
+    public String getSql(String value) {
+        String re ="";
+      String filed= sqlObject.getSqlField();
+      String option =sqlObject.getOption();
+        re=filed+option+"'"+value+"'";
+       return re;
+    }
+
+    public void setSqlObject(SqlObject sqlObject){
+        this.sqlObject=sqlObject;
+    }
+}

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

@@ -0,0 +1,29 @@
+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 GetLikeSql implements GetSqlObject{
+
+ private SqlObject sqlObject ;
+    @Override
+    public String getSql(String value) {
+        String re ="";
+      String filed= sqlObject.getSqlField();
+      String option =sqlObject.getOption();
+        re=filed+option+value;
+      if(option.equals("=")){
+          re= filed+" like '%"+value+"%'";
+      }
+
+       return re;
+    }
+
+    public void setSqlObject(SqlObject sqlObject){
+        this.sqlObject=sqlObject;
+    }
+}

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

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

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

@@ -4,6 +4,8 @@ import cn.cslg.pas.common.dto.business.EventDTO;
 import cn.cslg.pas.common.model.cronModel.*;
 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;
@@ -12,6 +14,8 @@ 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;
 import cn.cslg.pas.factorys.reGroupFactory.QueryGroupFactory;
@@ -65,13 +69,21 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Autowired
     private AssoProjectEventMapper assoProjectEventMapper;
 
+    @Autowired
+    private CacheUtils cacheUtils;
+    @Autowired
+    private LoginUtils loginUtils;
+
     public String getEvent(String sql) {
-        eventMapper.getEvent(sql);
+//        eventMapper.getEvent(sql);
         return "";
     }
 
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
+        String sql1 ="";
+        String sql2="";
+        String sql3 ="";
         //合成检索式
         StringRequest stringRequest = null;
         if (queryRequest instanceof MapRequest) {
@@ -81,16 +93,22 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         }
         String condition = stringRequest.getSearchQuery();
 
-        //将检索式转换为二叉树
-        treeNode tree = expressManager.getInstance().Parse(condition, false);
-
-        //格式化检索式
-        String sql = formatQueryService.ToString((operateNode) tree);
+        if(condition!=null&&condition!="") {
+            try {
+                //将检索式转换为二叉树
+                treeNode tree = expressManager.getInstance().Parse(condition, false);
+                //格式化检索式
+                sql1 = formatQueryService.ToString((operateNode) tree);
+            }
+            catch (Exception e){
+                throw new ConditionException("检索式错误");
+            }
+            }
 
         //格式化排序
         if (queryRequest.getOrderDTOList() != null && queryRequest.getOrderDTOList().size() != 0) {
             String orderSql = formatQueryService.orderToString(queryRequest.getOrderDTOList());
-            sql += orderSql;
+            sql2= orderSql;
         }
 
         //格式化 分页信息
@@ -98,15 +116,23 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
             Long size = queryRequest.getSize();
             Long current = queryRequest.getCurrent();
             String page = " limit " + ((current - 1) * size) + "," + size;
-            sql += page;
+            sql3= page;
         }
 
         //根据sql查询事件信息
-        List<EventVO> eventVOS = eventMapper.getEvent(sql);
+        List<EventVO> eventVOS = eventMapper.getEvent(sql1,sql2,sql3);
+
+        //查询总数
+        Long total = eventMapper.getEventCount(sql1);
 
         //装载事件信息
         this.loadEvent(eventVOS);
-        return eventVOS;
+        Records records = new Records();
+        records.setCurrent(queryRequest.getCurrent());
+        records.setSize(queryRequest.getSize());
+        records.setData(eventVOS);
+        records.setTotal(total);
+        return records;
     }
 
     @Override
@@ -117,6 +143,16 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
             throw new XiaoShiException("参数错误");
         }
 
+        //获取登录人信息
+        PersonnelVO personnelVO =new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        }
+        catch (Exception e)
+        {
+            throw  new UnLoginException("未登录");
+        }
+
         //根据名称查询是否重复
         eventDTO.setName(eventDTO.getName().trim());
         String name = eventDTO.getName();
@@ -130,18 +166,21 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         //事件入库
         Event event = new Event();
         BeanUtils.copyProperties(eventDTO, event);
+        event.setCreateId(personnelVO.getId());
+        event.setTenantId(personnelVO.getTenantId());
         event.insert();
         if (files != null && files.size() != 0) {
             try {
                 List<String> guids = fileManagerService.uploadFileGetGuid(files);
                 List<AssoEventFile> assoEventFiles = new ArrayList<>();
-                guids.forEach(item -> {
-                    AssoEventFile assoEventFile = new AssoEventFile();
-                    assoEventFile.setEventId(event.getId());
-                    assoEventFile.setFileGuid(item);
-                    assoEventFile.setCreateId(1);
-                    assoEventFiles.add(assoEventFile);
-                });
+                    for(String item:guids) {
+                        AssoEventFile assoEventFile = new AssoEventFile();
+                        assoEventFile.setEventId(event.getId());
+                        assoEventFile.setFileGuid(item);
+                        assoEventFile.setCreateId(personnelVO.getId());
+                        assoEventFiles.add(assoEventFile);
+                    }
+
                 if (assoEventFiles != null && assoEventFiles.size() != 0) {
                     assoEventFileService.saveBatch(assoEventFiles);
                 }
@@ -153,17 +192,20 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Object deleteMessage(List<Integer> ids) {
-        //根据事件id删除事件
-        this.removeBatchByIds(ids);
+    public Object deleteMessage(List<Integer> ids) throws IOException {
         //根据事件id删除事件和文件关联
         LambdaQueryWrapper<AssoEventFile> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(AssoEventFile::getId, ids);
+        queryWrapper.in(AssoEventFile::getEventId, ids);
         List<AssoEventFile> assoEventFiles = assoEventFileService.list(queryWrapper);
         List<String> guids = assoEventFiles.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
         //TODO 根据guid删除文件
+        if(guids.size()!=0) {
+            fileManagerService.deleteFileFromFMS(guids);
+        }
         //删除事件和文件关联表
         assoEventFiles.remove(queryWrapper);
+        //根据事件id删除事件
+        this.removeBatchByIds(ids);
         return ids;
     }
 
@@ -330,7 +372,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         //查询关联报告或专题库
 
         //查询应用场景
-        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList("INVESTIGATION_TYPE"));
+        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList("ENTERPRISE_APPLICATION_SCENARIO"));
 
         //查询专题库数量
 
@@ -339,7 +381,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
             //装载人员信息
             Personnel personnel = personnels.stream().filter(item -> item.getId().equals(eventVO.getCreateId())).findFirst().orElse(null);
             if (personnel != null) {
-                eventVO.setName(personnel.getPersonnelName());
+                eventVO.setCreateName(personnel.getPersonnelName());
             }
 
             //装载客户信息

src/main/java/cn/cslg/pas/service/common/FileManagerService.java

@@ -127,9 +127,9 @@ public class FileManagerService {
      *
      * @param ids 需要删除的文件ids
      */
-    public String deleteFileFromFMS(List<Integer> ids) throws IOException {
+    public String deleteFileFromFMS(List<String> ids) throws IOException {
         FMSDeleteFileDTO fmsDeleteFileDTO = new FMSDeleteFileDTO();
-        fmsDeleteFileDTO.setIds(ids);
+        fmsDeleteFileDTO.setGuids(ids);
         fmsDeleteFileDTO.setType(2);
         String param = new Gson().toJson(fmsDeleteFileDTO);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);

src/main/java/cn/cslg/pas/service/permissions/PermissionService.java

@@ -93,4 +93,19 @@ public class PermissionService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+
+    /**
+     * 根据名称模糊查询客户接口
+     * @param clientName
+     * @return
+     * @throws IOException
+     */
+    public String getClientIdByNamePCS(String clientName) throws IOException {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(PCSUrl + "/permission/api/system/getPersonIdByName?clientName=" + clientName)
+                .get()
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
 }

src/main/resources/application-dev.yml

@@ -1,16 +1,17 @@
 spring:
-  redis:
-    host: 192.168.1.24
-    port: 6379
-    database: 3
-    password: Xx0GWxdWQJxx6Swe
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 20
-        min-idle: 0
-        max-wait: -1ms
-    timeout: 2000ms
+  data:
+   redis:
+     host: 192.168.1.24
+     port: 6379
+     database: 3
+     password: Xx0GWxdWQJxx6Swe
+     lettuce:
+       pool:
+         max-active: 20
+         max-idle: 20
+         min-idle: 0
+         max-wait: -1ms
+     timeout: 2000ms
   datasource:
     url: jdbc:mysql://192.168.1.24:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root

src/main/resources/jsons/event_group.json

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

src/main/resources/jsons/event_sql.json

@@ -2,7 +2,7 @@
   {
     "field": "name",
     "sqlField": "name",
-    "sqlClass": "getComSql"
+    "sqlClass": "getLikeSql"
   },
   {
     "field": "id",
@@ -17,21 +17,26 @@
   {
     "field": "createTime",
     "sqlField": "create_time",
-    "sqlClass": "getComSql"
+    "sqlClass": "getDateTimeSql"
   },
   {
     "field": "eventDate",
-    "sqlField": "eventDate_time",
-    "sqlClass": "getComSql"
+    "sqlField": "event_Date",
+    "sqlClass": "getDateTimeSql"
   },
   {
     "field": "description",
     "sqlField": "description",
-    "sqlClass": "getComSql"
+    "sqlClass": "getLikeSql"
   },
   {
   "field": "scenarioId",
   "sqlField": "scenario_id",
   "sqlClass": "getComSql"
-}
+},
+  {
+    "field": "clientName",
+    "sqlField": "client_id",
+    "sqlClass": "getClientNameSql"
+  }
 ]

src/main/resources/mapper/Event.xml

@@ -2,13 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.EventMapper">
   <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 from event
-       <where>
-       ${sql}
-    </where>
+   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>
+      ${sql2} ${sql3}
   </select>
 
-    <select id="getEventCount" resultType="java.lang.Integer">
+    <select id="getEventCount" resultType="java.lang.Long">
         select count(*) from event
         <where>
             ${sql}