4 Commits d2c720187f ... a8b46eaa5a

Author SHA1 Message Date
  lyq a8b46eaa5a 解密 1 month ago
  lyq 9fc1b6aa23 1 1 month ago
  lyq 316b799503 铁塔事件变更 1 month ago
  lyq 016e5759eb 铁塔事件上报 1 month ago

+ 6 - 0
pom.xml

@@ -119,6 +119,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.24</version>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 33 - 0
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/AlarmEventController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.dahua.DaHuaFireEventVO;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.dahua.DaHuaOtherEventVO;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.HaiKangEventVo;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.tower.TowerEventVo;
 import com.sooka.sponest.event.centereventteventcatalogue.service.AlarmEventService;
 import com.sooka.sponest.event.centereventtreportmessage.domain.CentereventTReportmessage;
 import com.sooka.sponest.event.centereventtreportmessage.service.ICentereventTReportmessageService;
@@ -170,4 +171,36 @@ public class AlarmEventController {
         }
         return R.ok(i);// 3951
     }
+
+    /**
+     * 铁塔事件上报
+     *
+     * @param jsonStr
+     * @return R
+     */
+    @PostMapping("/insertTowerEvent")
+    public R insertTowerEvent(@RequestBody String jsonStr) {
+        String eventCode = null;
+        TowerEventVo towerEventVo = new TowerEventVo();
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+            towerEventVo = JSONObject.parseObject(jsonObject.getJSONObject("data").toJSONString(), TowerEventVo.class);
+            eventCode = alarmEventService.insertTowerEvent(towerEventVo);
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+        if (StringUtils.isBlank(eventCode)) {
+            eventCode = String.valueOf(System.currentTimeMillis());
+        }
+        try {
+            CentereventTReportmessage tReportMessage = new CentereventTReportmessage();
+            tReportMessage.setId(eventCode);
+            tReportMessage.setSource("铁塔-" + towerEventVo.getAlarmType());
+            tReportMessage.setContext(jsonStr);
+            centereventTReportmessageService.insertCentereventTReportmessage(tReportMessage);
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+        return R.ok();
+    }
 }

+ 80 - 0
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/tower/TowerEventVo.java

@@ -0,0 +1,80 @@
+package com.sooka.sponest.event.centereventteventcatalogue.domain.tower;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+@Data
+public class TowerEventVo {
+
+    private String alarmBody;
+
+    private String eventLatitude;
+
+    private String frontAlarmPicUrl;
+
+    private String regionName;
+
+    private String warningOrderId;
+
+    private String tilt;
+
+    private String alarmCode;
+
+    private String deviceName;
+
+    private String deviceLatitude;
+
+    private String regionCode;
+
+    private String originalPictureUrl;
+
+    private String alarmPictureUrl;
+
+    private String pan;
+
+    private String channelCode;
+
+    private String eventLongitude;
+
+    private String address;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date alarmTime;
+
+    private String frontAlarmVedioUrl;
+
+    private String zoom;
+
+    private String deviceCode;
+
+    private String alarmType;
+
+    private String alarmVideoUrl;
+
+    private String presetName;
+
+    private String channelName;
+
+    private String location;
+
+    private String deviceLongitude;
+
+    private String presetId;
+
+    public String toString() {
+        String toString = new ToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE)
+                .append("行政区:", getRegionName())
+                .append("瞭望塔:", getChannelName())
+//                .append("方向:", getDirection(getAngle()))
+//                .append("距离:", getStr(getDistance()))
+//                .append("高程:", getStr(getElevation()))
+                .append("经度:", getEventLongitude())
+                .append("纬度:", getEventLatitude())
+                .toString().replaceAll("=", "");
+        return toString.substring(1, toString.length() - 1);
+    }
+}

+ 4 - 0
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/AlarmEventService.java

@@ -7,6 +7,7 @@ import com.sooka.sponest.event.centereventteventcatalogue.domain.dahua.DaHuaOthe
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.EventsVo;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.HaiKangEventVo;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.sensor.SensorEventVo;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.tower.TowerEventVo;
 
 public interface AlarmEventService {
 
@@ -26,6 +27,9 @@ public interface AlarmEventService {
     // 大华5300事件
     String insertDaHuaOtherEvent(DaHuaOtherEventVO daHuaOtherEventVO);
 
+    // 铁塔事件
+    String insertTowerEvent(TowerEventVo towerEventVo);
+
 
     // 传感器事件
     String insertSensorEvent(SensorEventVo sensorEventVo);

+ 77 - 0
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -18,6 +18,7 @@ import com.sooka.sponest.event.centereventteventcatalogue.domain.dahua.*;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.EventsVo;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.HaiKangEventVo;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.sensor.SensorEventVo;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.tower.TowerEventVo;
 import com.sooka.sponest.event.centereventteventcatalogue.service.AlarmEventService;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTEventcatalogueService;
 import com.sooka.sponest.event.centereventteventtype.domain.CentereventTEventtype;
@@ -26,6 +27,7 @@ import com.sooka.sponest.event.centereventtfirelog.domain.CentereventTFireLog;
 import com.sooka.sponest.event.centereventtfirelog.service.ICentereventTFireLogService;
 import com.sooka.sponest.event.remoteapi.RemoteDataService;
 import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
+import com.sooka.sponest.event.utils.GWHttpUtilsTest65;
 import com.sooka.sponest.event.utils.RemoteApiUtil;
 import com.sooka.sponest.monitor.api.RemoteMonitorService;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
@@ -421,6 +423,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         return "请刷新后重试";
     }
 
+    @Transactional
     @Override
     public String insertDaHuaOtherEvent(DaHuaOtherEventVO daHuaOtherEventVO) {
         // 验证是否配置摄像头通道
@@ -474,6 +477,80 @@ public class AlarmEventServiceImpl implements AlarmEventService {
 
     @Transactional
     @Override
+    public String insertTowerEvent(TowerEventVo towerEventVo) {
+        // 验证是否配置摄像头
+        CenterdataTCamera centerdataTCamera = SpringUtils.getBean(RemoteMonitorService.class).getCameraByChinaTowerDeviceCode(towerEventVo.getDeviceCode());
+        if (StringUtils.isNull(centerdataTCamera)) {
+            logger.info("无法匹配相关设备!铁塔摄像头为:{}", towerEventVo.getDeviceCode());
+            return "";
+        }
+        // 验证是否配置指挥中心
+        List<CenterdataTAidevicedept> listDept = SpringUtils.getBean(RemoteMonitorService.class).listForCommandCenter(centerdataTCamera.getId(), "1", "1").getData();
+        if (StringUtils.isEmpty(listDept)) {
+            logger.info(ERROR_MSG_DEPT, towerEventVo.getDeviceCode());
+            return "";
+        }
+        // 验证事件类型是否配置对应报文码值--只能从数据库配
+        CentereventTEventtype centereventTEventtype = centereventTEventtypeService.selectCentereventTEventtypeByCodeTower(towerEventVo.getAlarmType());
+        if (StringUtils.isNull(centereventTEventtype)) {
+            logger.info("无法匹配相关事件!报文码值为:{}", towerEventVo.getAlarmType());
+            return "";
+        }
+        // 事件目录
+        String eventType = centereventTEventtype.getParentId();
+        String eventTypeXl = centereventTEventtype.getId();
+        String eventName = towerEventVo.getDeviceName() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, towerEventVo.getAlarmTime()) + centereventTEventtype.getEventTypeName();
+        String eventDescription = towerEventVo.toString();
+        String longitude = towerEventVo.getEventLongitude();
+        String latitude = towerEventVo.getEventLatitude();
+        String reportor = towerEventVo.getDeviceName();
+        Date reportTime = towerEventVo.getAlarmTime();
+        String address = towerEventVo.getAddress();
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
+        // 事件部门
+        this.insertEventDept(centereventTEventcatalogue, listDept);
+        // 事件日志
+        String logId = this.insertEventLog(centereventTEventcatalogue);
+        String orderCode = SpringUtils.getBean(RemoteMonitorService.class).getOrderCodeByChinaTowerDeviceCode(towerEventVo.getDeviceCode());
+        if (StringUtils.isNotBlank(towerEventVo.getOriginalPictureUrl())) {
+            String[] pictures = towerEventVo.getOriginalPictureUrl().split(",");
+            for (String picture : pictures) {
+                CenterdataTAttach tAttach = new CenterdataTAttach();
+                tAttach.setBusId(logId);
+                tAttach.setAttachPath(GWHttpUtilsTest65.encrypt(picture, orderCode));
+                tAttach.setBusIndx(BUS_INDEX_2);
+                tAttach.setBusSource("TT_1");
+                tAttach.setFileType(FILE_TYPE_1);
+                remoteDataService.insertAttach(tAttach);
+            }
+        }
+        if (StringUtils.isNotBlank(towerEventVo.getAlarmPictureUrl())) {
+            String[] pictures = towerEventVo.getAlarmPictureUrl().split(",");
+            for (String picture : pictures) {
+                CenterdataTAttach tAttach = new CenterdataTAttach();
+                tAttach.setBusId(logId);
+                tAttach.setAttachPath(GWHttpUtilsTest65.encrypt(picture, orderCode));
+                tAttach.setBusIndx(BUS_INDEX_2);
+                tAttach.setBusSource("TT_1");
+                tAttach.setFileType(FILE_TYPE_1);
+                remoteDataService.insertAttach(tAttach);
+            }
+        }
+        if (StringUtils.isNotBlank(towerEventVo.getAlarmVideoUrl())) {
+            CenterdataTAttach tAttach = new CenterdataTAttach();
+            tAttach.setBusId(logId);
+            tAttach.setAttachPath(GWHttpUtilsTest65.encrypt(towerEventVo.getAlarmVideoUrl(), orderCode));
+            tAttach.setBusIndx(BUS_INDEX_2);
+            tAttach.setBusSource("TT_1");
+            tAttach.setFileType(FILE_TYPE_2);
+            remoteDataService.insertAttach(tAttach);
+        }
+        return centereventTEventcatalogue.getEventCode();
+    }
+
+    @Transactional
+    @Override
     public String insertSensorEvent(SensorEventVo sensorEventVo) {
         // 验证是否配置指挥中心
         List<CenterdataTAidevicedept> listDept = SpringUtils.getBean(RemoteMonitorService.class).listForCommandCenter(sensorEventVo.getSensorId(), "1", "1").getData();

+ 11 - 3
src/main/java/com/sooka/sponest/event/centereventteventtype/mapper/CentereventTEventtypeMapper.java

@@ -39,6 +39,14 @@ public interface CentereventTEventtypeMapper {
     CentereventTEventtype selectCentereventTEventtypeByCode(String code);
 
     /**
+     * 查询事件类型
+     *
+     * @param code 事件类型编码
+     * @return 事件类型
+     */
+    CentereventTEventtype selectCentereventTEventtypeByCodeTower(String code);
+
+    /**
      * 新增事件类型
      *
      * @param centereventTEventtype 事件类型
@@ -63,14 +71,14 @@ public interface CentereventTEventtypeMapper {
     int deleteCentereventTEventtypeByIds(String[] ids);
 
     /**
-     *查询事件类型树结构
+     * 查询事件类型树结构
      *
      * @author hanfucheng
      * @date 2023/4/10 10:53
      */
-    List<Map<String,Object>> getCentereventTEventtypeTree();
-    List<Map<String,Object>> getCentereventTEventtypeTreeLx(CentereventTEventtype centereventTEventtype);
+    List<Map<String, Object>> getCentereventTEventtypeTree();
 
+    List<Map<String, Object>> getCentereventTEventtypeTreeLx(CentereventTEventtype centereventTEventtype);
 
 
     long getReminderTimeById(CentereventTEventcatalogue centereventTEventcatalogue);

+ 10 - 1
src/main/java/com/sooka/sponest/event/centereventteventtype/service/ICentereventTEventtypeService.java

@@ -33,12 +33,20 @@ public interface ICentereventTEventtypeService {
     /**
      * 查询事件类型
      *
-     * @param id 事件类型主键
+     * @param code 事件类型主键
      * @return 事件类型
      */
     CentereventTEventtype selectCentereventTEventtypeByCode(String code);
 
     /**
+     * 查询事件类型
+     *
+     * @param code 事件类型主键
+     * @return 事件类型
+     */
+    CentereventTEventtype selectCentereventTEventtypeByCodeTower(String code);
+
+    /**
      * 新增事件类型
      *
      * @param centereventTEventtype 事件类型
@@ -69,6 +77,7 @@ public interface ICentereventTEventtypeService {
      * @date 2023/4/10 10:53
      */
     List<Map<String, Object>> getCentereventTEventtypeTree();
+
     List<Map<String, Object>> getCentereventTEventtypeTreeLx(CentereventTEventtype centereventTEventtype);
 
     long getReminderTimeById(CentereventTEventcatalogue centereventTEventcatalogue);

+ 11 - 0
src/main/java/com/sooka/sponest/event/centereventteventtype/service/impl/CentereventTEventtypeServiceImpl.java

@@ -64,6 +64,17 @@ public class CentereventTEventtypeServiceImpl implements ICentereventTEventtypeS
     }
 
     /**
+     * 查询事件类型
+     *
+     * @param code 事件类型编码
+     * @return 事件类型
+     */
+    @Override
+    public CentereventTEventtype selectCentereventTEventtypeByCodeTower(String code) {
+        return centereventTEventtypeMapper.selectCentereventTEventtypeByCodeTower(code);
+    }
+
+    /**
      * 新增事件类型
      *
      * @param centereventTEventtype 事件类型

+ 1 - 0
src/main/java/com/sooka/sponest/event/utils/EventConstants.java

@@ -44,6 +44,7 @@ public class EventConstants {
 
     // 文件类型
     public static final String FILE_TYPE_1 = "image";
+    public static final String FILE_TYPE_2 = "video";
 
     // 文件前缀
     public static final String FILE_PREFIX_LOCAL = "fileUrl";

+ 198 - 0
src/main/java/com/sooka/sponest/event/utils/GWHttpUtilsTest65.java

@@ -0,0 +1,198 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sooka.sponest.event.utils;
+
+import cn.hutool.core.util.HexUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @Description: demo.
+ * @Author: newland
+ * 发生订购鉴权失败时请先仔细阅读一下内容:
+ * 首先可以让运管这边推送订购关系,由你们提供接收接口,运管可以进行订购关系推送
+ * 然后由于新接入的平台,没有订单关系,所以目前运管这边采取的是推送其他平台的订单
+ * 在这样的情况下,AK,SK,仍然是使用你们自己的,但是 appCode 则需要使用该订单本身的 appCode,不然网关这边鉴权过不去
+ */
+@Slf4j
+public class GWHttpUtilsTest65 {
+
+    /**
+     * 新网关
+     */
+    static String HOST_IP = "https://sl-neimenggu.chinatowercom.cn:9997";
+
+    /**
+     * AK 由运管这边提供
+     */
+    static String AK = "012626d75ab147858ff7fdf9ea44b74d";
+
+    /**
+     * SK 由运管这边提供
+     */
+    static String SK = "dce85f55cad140498936e7832e6528ad";
+
+    /**
+     * 行业编码 由运管这边提供
+     * 当发送订购鉴权失败时,请阅读最上面的解释,然后可以向运管那边提供订单号获得该订单正确的 appCode
+     * 当调试完成后,即可换成自己的 appCode
+     */
+    static String appCode = "700002";
+
+    /**
+     * 订购客户编码,用于订购鉴权,需要一一对应
+     */
+    static String customer = "124012301";
+
+    /**
+     * 订单号,用于订购鉴权,需要一一对应
+     */
+//    static String orderCode = "PO124012301202504047918802915328";
+//    static String orderCode = "PO124012301202503303260509147136";
+
+    /**
+     * 用户编码,暂可以填随意值
+     */
+    static String userCode = "0a97fb806ab24ca8bc788dc6ace3d4c2";
+
+    /**
+     * 访问方法路径
+     * /devices/{deviceCode}/channels/{channelCode}/getVideoRealtimeUrl
+     * 注: 这个路径在下面要参与到 sign加密,路径前面不要加服务名,比如 boot-out
+     * 例子:路径中的{deviceCode}、{channelCode},用于订购鉴权,需要一一对应
+     */
+    static String servicePath = "/file/obsFiles/getObsEncryptUrls";
+
+
+    public static String encrypt(String path, String orderCode) {
+        // 请求参数
+        String json = "{\n" +
+                "    \"fileUrls\": [\n\"" +
+//                "        \"/15000000005/ThirdAlarm/pic/ZGTT-1717140001_d9b78c489b0f4263b2accee140f12d83a8e66c4bc69c4d70b929762f033c63d5_02_001.jpg\",\n" +
+                path +
+                "\"    ]\n" +
+                "}";
+        return callServer(json, orderCode);
+    }
+
+    /**
+     * 服务调用
+     */
+    public static String callServer(String json, String orderCode) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        // 这里的 url是发送请求拼接url
+        String url = HOST_IP + servicePath;
+        String msgId = UUID.randomUUID().toString().replace("-", "");
+        String requestTime = dateFormat.format(new Date());
+        System.out.println(requestTime);
+
+        // 下面两步是通过 AK,SK,servicePath 等参数生产 sign
+        // 注:加密方式尽量参考本例中的加密
+        // 大部分报错 signature value is error! 都是加密失败造成的,请仔细检查 AK, SK, path 是否正确
+        String signContext = getSignContext(servicePath, AK, msgId, requestTime, customer, userCode);
+        String sign = getGenerateSign(SK, signContext);
+        System.out.println("=========sign=====:" + sign);
+
+        // ********模拟请求头参数,以下参数为通用必填参数************
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("X-AppKey", AK);
+        headerMap.put("X-Signature", sign);
+        headerMap.put("X-MsgId", msgId);
+        headerMap.put("X-RequestTime", requestTime);
+        headerMap.put("X-CustomerCode", customer);
+        headerMap.put("X-UserCode", userCode);
+        headerMap.put("X-AppCode", appCode);
+        headerMap.put("X-OrderCode", orderCode);
+        HttpResponse response = postObject(url, json, headerMap);
+        JSONObject jsonObject = JSONObject.parseObject(response.body());
+        return jsonObject.getJSONArray("data").getJSONObject(0).getString("encryptUrl");
+    }
+
+    /**
+     * 组装 post调用的header和请求体 .
+     *
+     * @param appAddress 发送地址 .
+     * @param params     参数 .
+     * @return postObject.
+     */
+    public static HttpResponse postObject(String appAddress, String params, Map<String, String> headerMap) {
+        HttpResponse result = null;
+        try {
+            result = HttpRequest.post(appAddress)
+                    .headerMap(headerMap, true)
+                    .body(params)
+                    .timeout(30000)
+                    .execute();
+            log.info("\n请求地址{},\n返回状态:{},\n返回信息{}", appAddress, result.getStatus(), result.body());
+        } catch (Exception e) {
+            log.error("地址{},参数{},发送异常:{}", appAddress, params, e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 签名
+     *
+     * @param secret
+     * @param signContext
+     * @return
+     */
+    public static String getGenerateSign(final String secret, final String signContext) {
+        String sign = null;
+        try {
+            Mac hmacSha256 = Mac.getInstance("HmacSHA1");
+            byte[] keyBytes = secret.getBytes();
+            hmacSha256.init(new SecretKeySpec(keyBytes, 0, keyBytes.length, "HmacSHA1"));
+            sign = HexUtil.encodeHexStr(hmacSha256.doFinal(signContext.getBytes()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return sign;
+    }
+
+    /**
+     * 签名字符串生成规则.
+     *
+     * @param appkey .
+     * @return 待签名字符串
+     */
+    private static String getSignContext(String path, String appkey, String msgId, String requestTime,
+                                         String customerCode, String userCode) {
+        StringBuilder append = new StringBuilder(path)
+                .append(appkey)
+                .append(msgId)
+                .append(requestTime);
+        if (customerCode != null) {
+            append.append(customerCode);
+        }
+        if (userCode != null) {
+            append.append(userCode);
+        }
+        System.out.println(append);
+        return append.toString().toUpperCase();
+    }
+}

+ 6 - 0
src/main/resources/mapper/centereventteventcatalogue/CenterEventViewMapper.xml

@@ -364,6 +364,9 @@
                     #{eventTypeIdDl}
                 </foreach>
             </if>
+            <if test="eventName != null and eventName != ''">
+                and event_name like concat('%', #{eventName},'%')
+            </if>
             <if test="longitude != null and longitude!='' and latitude != null and latitude != '' and distance != null">
                 having distance &lt; #{distance}
             </if>
@@ -392,6 +395,9 @@
                 #{eventTypeId}
             </foreach>
         </if>
+        <if test="eventName != null and eventName != ''">
+            and event_name like concat('%', #{eventName},'%')
+        </if>
         <if test="longitude != null and longitude!='' and latitude != null and latitude != '' and distance != null">
             having distance &lt; #{distance}
         </if>

+ 5 - 0
src/main/resources/mapper/centereventteventtype/CentereventTEventtypeMapper.xml

@@ -44,6 +44,11 @@
         from centerevent_t_eventtype where code = #{code}
     </select>
 
+    <select id="selectCentereventTEventtypeByCodeTower" parameterType="String" resultMap="CentereventTEventtypeResult">
+        <include refid="selectCentereventTEventtypeVo"/>
+        from centerevent_t_eventtype where code_tower = #{code}
+    </select>
+
     <insert id="insertCentereventTEventtype" parameterType="CentereventTEventtype">
         insert into centerevent_t_eventtype
         <trim prefix="(" suffix=")" suffixOverrides=",">