shs 1 year atrás
parent
commit
27bede24a5
22 changed files with 1346 additions and 5 deletions
  1. 9 5
      aidex-system/src/main/java/com/aidex/common/app/server/impl/AppService.java
  2. 23 0
      aidex-system/src/main/java/com/aidex/common/gps/domain/PushAlarmEntity.java
  3. 19 0
      aidex-system/src/main/java/com/aidex/common/gps/domain/PushLocationEntity.java
  4. 122 0
      aidex-system/src/main/java/com/aidex/common/plush/domain/GpsAlarmPlush.java
  5. 237 0
      aidex-system/src/main/java/com/aidex/common/plush/domain/GpsLocationPlush.java
  6. 113 0
      aidex-system/src/main/java/com/aidex/common/plush/domain/SysShipExtend.java
  7. 16 0
      aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsAlarmPlushMapper.java
  8. 190 0
      aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsAlarmPlushMapper.xml
  9. 16 0
      aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsLocationPlushMapper.java
  10. 176 0
      aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsLocationPlushMapper.xml
  11. 17 0
      aidex-system/src/main/java/com/aidex/common/plush/mapper/SysShipExtendMapper.java
  12. 168 0
      aidex-system/src/main/java/com/aidex/common/plush/mapper/SysShipExtendMapper.xml
  13. 14 0
      aidex-system/src/main/java/com/aidex/common/plush/service/GpsAlarmPlushService.java
  14. 15 0
      aidex-system/src/main/java/com/aidex/common/plush/service/GpsLocationPlushService.java
  15. 15 0
      aidex-system/src/main/java/com/aidex/common/plush/service/SysShipExtendService.java
  16. 27 0
      aidex-system/src/main/java/com/aidex/common/plush/service/impl/GpsAlarmPlushServiceImpl.java
  17. 23 0
      aidex-system/src/main/java/com/aidex/common/plush/service/impl/GpsLocationPlushServiceImpl.java
  18. 27 0
      aidex-system/src/main/java/com/aidex/common/plush/service/impl/SysShipExtendServiceImpl.java
  19. 62 0
      aidex-ui/src/api/gps/gpsLocationPlush.js
  20. 19 0
      sql/GpsAlarmPlushMenu.sql
  21. 19 0
      sql/GpsLocationPlushMenu.sql
  22. 19 0
      sql/SysShipExtendMenu.sql

+ 9 - 5
aidex-system/src/main/java/com/aidex/common/app/server/impl/AppService.java

@@ -13,8 +13,10 @@ import com.aidex.common.utils.StringUtils;
 import com.aidex.common.utils.dist.CalcDist;
 import com.aidex.framework.cache.ConfigUtils;
 import com.aidex.system.domain.SysNotice;
+import com.aidex.system.domain.SysShip;
 import com.aidex.system.domain.SysWharf;
 import com.aidex.system.service.SysNoticeService;
+import com.aidex.system.service.SysShipService;
 import com.aidex.system.service.SysWharfService;
 import org.apache.ibatis.javassist.expr.NewArray;
 import org.springframework.beans.BeanUtils;
@@ -38,6 +40,9 @@ public class AppService implements IAppService {
     @Autowired
     private IGpsService iGpsService;
 
+    @Autowired
+    private SysShipService sysShipService;
+
 
     public List<SysNotice> getCarouselList(){
 
@@ -63,9 +68,9 @@ public class AppService implements IAppService {
     * */
     public List<LocationEntity> findAllLocation(Boolean direction){
         // 全部船只信息
-        List<MyGpsEntity> allMyGps = iGpsService.findMyGps();
+        List<SysShip> allMyGps = sysShipService.findList(new SysShip(){{setStatus("1");}});
         // 全部在线设备
-        String macIds = allMyGps.stream().filter(gps -> gps.getStatus().equals("1")).map(MyGpsEntity::getMacid).collect(Collectors.joining(","));
+        String macIds = allMyGps.stream().map(SysShip::getShipNum).collect(Collectors.joining(","));
         List<LocationEntity> locationEntities = iGpsService.getLocationBatchByMac(macIds);
         if(locationEntities.size() <= 0)
             throw new SysException(8821,"暂无运行船只");
@@ -118,10 +123,9 @@ public class AppService implements IAppService {
         if(!wharf.getStatus().equals("0"))
             throw new SysException(4442, wharf.getWharfNanme()+" 已经停用!请更换其他站点");
 
-        // 全部船只信息
-        List<MyGpsEntity> allMyGps = iGpsService.findMyGps();
+        List<SysShip> allMyGps = sysShipService.findList(new SysShip(){{setStatus("1");}});
         // 全部在线设备
-        String macIds = allMyGps.stream().filter(gps -> gps.getStatus().equals("1")).map(MyGpsEntity::getMacid).collect(Collectors.joining(","));
+        String macIds = allMyGps.stream().map(SysShip::getShipNum).collect(Collectors.joining(","));
         List<LocationEntity> locationEntities = iGpsService.getLocationBatchByMac(macIds);
 
 

+ 23 - 0
aidex-system/src/main/java/com/aidex/common/gps/domain/PushAlarmEntity.java

@@ -0,0 +1,23 @@
+package com.aidex.common.gps.domain;
+
+import lombok.Data;
+
+@Data
+public class PushAlarmEntity {
+
+    private String Id;
+    private String Macid;
+    private String FullName;
+    private String PTime;
+    private String AddTime;
+    private String Lat;
+    private String Lon;
+    private String MapLat;
+    private String MapLon;
+    private String Speed;
+    private String Dir;
+    private String Classify;
+    private String Describe;
+    private String Notea;
+
+}

+ 19 - 0
aidex-system/src/main/java/com/aidex/common/gps/domain/PushLocationEntity.java

@@ -0,0 +1,19 @@
+package com.aidex.common.gps.domain;
+
+import lombok.Data;
+
+@Data
+public class PushLocationEntity {
+
+    private String Macid;
+    private String GpsTime;
+    private String HeartTime;
+    private String UpdTime;
+    private String Speed;
+    private String Dir;
+    private String Lat;
+    private String Lon;
+    private String  Stats;
+    private String Value;
+
+}

+ 122 - 0
aidex-system/src/main/java/com/aidex/common/plush/domain/GpsAlarmPlush.java

@@ -0,0 +1,122 @@
+package com.aidex.common.plush.domain;
+
+import lombok.Data;
+import com.aidex.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.aidex.common.utils.log.annotation.FieldRemark;
+import com.aidex.common.utils.log.annotation.LogField;
+import com.aidex.common.annotation.Excel;
+
+/**
+ * 报警信息推送表对象 gps_alarm_plush
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+@Data
+public class GpsAlarmPlush
+{
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    /** 所属用户名称 */
+    @Excel(name = "所属用户名称")
+    @LogField
+    @FieldRemark(name = "所属用户名称",field = "userName")
+    private String userName;
+
+    /** 设备编号[在GPS系统的唯一ID,即设备IMEI号] */
+    @Excel(name = "设备编号[在GPS系统的唯一ID,即设备IMEI号]")
+    @LogField
+    @FieldRemark(name = "设备编号[在GPS系统的唯一ID,即设备IMEI号]",field = "macid")
+    private String macid;
+
+    /** 设备名称(车牌号) */
+    @Excel(name = "设备名称(车牌号)")
+    @LogField
+    @FieldRemark(name = "设备名称(车牌号)",field = "fullName")
+    private String fullName;
+
+    /** 报警时间(utc) 毫秒数时间戳 */
+    @Excel(name = "报警时间(utc) 毫秒数时间戳")
+    @LogField
+    @FieldRemark(name = "报警时间(utc) 毫秒数时间戳",field = "pTime")
+    private Long pTime;
+
+    /** 添加时间(utc) 毫秒数时间戳 */
+    @Excel(name = "添加时间(utc) 毫秒数时间戳")
+    @LogField
+    @FieldRemark(name = "添加时间(utc) 毫秒数时间戳",field = "addTime")
+    private Long addTime;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    @LogField
+    @FieldRemark(name = "纬度",field = "lat")
+    private String lat;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    @LogField
+    @FieldRemark(name = "经度",field = "lon")
+    private String lon;
+
+    /** 地图纬度,默认百度纬度 */
+    @LogField
+    @FieldRemark(name = "地图纬度,默认百度纬度",field = "mapLat")
+    private String mapLat;
+
+    /** 地图经度,默认百度经度 */
+    @LogField
+    @FieldRemark(name = "地图经度,默认百度经度",field = "mapLon")
+    private String mapLon;
+
+    /** 速度 */
+    @LogField
+    @FieldRemark(name = "速度",field = "speed")
+    private Long speed;
+
+    /** 方向 */
+    @LogField
+    @FieldRemark(name = "方向",field = "dir")
+    private Long dir;
+
+    /** 报警类型[参照报警字段对应表] */
+    @LogField
+    @FieldRemark(name = "报警类型[参照报警字段对应表]",field = "classify")
+    private Long classify;
+
+    /** 报警类型[扩展] */
+    @LogField
+    @FieldRemark(name = "报警类型[扩展]",field = "describe")
+    private Long describe;
+
+    /** 描述信息 */
+    @LogField
+    @FieldRemark(name = "描述信息",field = "notea")
+    private String notea;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userName", getUserName())
+            .append("macid", getMacid())
+            .append("fullName", getFullName())
+            .append("pTime", getPTime())
+            .append("addTime", getAddTime())
+            .append("lat", getLat())
+            .append("lon", getLon())
+            .append("mapLat", getMapLat())
+            .append("mapLon", getMapLon())
+            .append("speed", getSpeed())
+            .append("dir", getDir())
+            .append("classify", getClassify())
+            .append("describe", getDescribe())
+            .append("notea", getNotea())
+            .append("id", getId())
+            .toString();
+    }
+}

+ 237 - 0
aidex-system/src/main/java/com/aidex/common/plush/domain/GpsLocationPlush.java

@@ -0,0 +1,237 @@
+package com.aidex.common.plush.domain;
+
+import lombok.Data;
+import com.aidex.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.aidex.common.utils.log.annotation.FieldRemark;
+import com.aidex.common.utils.log.annotation.LogField;
+import com.aidex.common.annotation.Excel;
+
+/**
+ * GPS位置信息推送数据对象 gps_location_plush
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+@Data
+public class GpsLocationPlush
+{
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    /** 设备编号[在GPS系统的唯一ID,即设备IMEI号] */
+    @Excel(name = "设备编号[在GPS系统的唯一ID,即设备IMEI号]")
+    @LogField
+    @FieldRemark(name = "设备编号[在GPS系统的唯一ID,即设备IMEI号]",field = "macid")
+    private String macid;
+
+    /** Gps时间 utc 毫秒时间戳; wifi、Lbs定位或状态、心跳则最后一次Gps时间;未上传过为0; */
+    @Excel(name = "Gps时间 utc 毫秒时间戳")
+    @LogField
+    @FieldRemark(name = "Gps时间 utc 毫秒时间戳",field = "gpsTime")
+    private Long gpsTime;
+
+    /** 信号时间 utc 毫秒时间戳 */
+    @Excel(name = "信号时间 utc 毫秒时间戳")
+    @LogField
+    @FieldRemark(name = "信号时间 utc 毫秒时间戳",field = "heartTime")
+    private Long heartTime;
+
+    /** 最后一次更新位置[gps\wifi\LBS都会更新]时间 utc 毫秒时间戳; 只有位置有改变才更新时间,静止状态时间不变; */
+    @Excel(name = "最后一次更新位置")
+    @LogField
+    @FieldRemark(name = "最后一次更新位置",field = "updTime")
+    private Long updTime;
+
+    /** 速度 */
+    @Excel(name = "速度")
+    @LogField
+    @FieldRemark(name = "速度",field = "speed")
+    private String speed;
+
+    /** 方向 */
+    @Excel(name = "方向")
+    @LogField
+    @FieldRemark(name = "方向",field = "dir")
+    private String dir;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    @LogField
+    @FieldRemark(name = "纬度",field = "lat")
+    private String lat;
+
+    /** 经度 */
+    @LogField
+    @FieldRemark(name = "经度",field = "lon")
+    private String lon;
+
+    /** 地图纬度,默认百度纬度 */
+    @LogField
+    @FieldRemark(name = "地图纬度,默认百度纬度",field = "mapLat")
+    private String mapLat;
+
+    /** 地图经度,默认百度经度 */
+    @LogField
+    @FieldRemark(name = "地图经度,默认百度经度",field = "mapLon")
+    private String mapLon;
+
+    /** 状态逗号分割(不支持为空):
+---第一位:acc状 1 开,0关 ---第二位:设防状态,1设防,0撤防
+---第三位:油路,1 接通,0是断开
+---第四位:已删除,
+---第五位:门状态, 1 开,0关 ---第六位:定位状态,1为GPS定位,0为LBS\WIFI等其它定位 ---第七位:主电状态 */
+    @LogField
+    @FieldRemark(name = "状态逗号分割(不支持为空)",field = "stats")
+    private String stats;
+
+    /** 数值状态逗号分割(不支持为空):
--第一位: 里程【米】
--第二位: 油量, 主油箱油量【L】
--第三位:重量,
--第四位:温度1, 多路用 ‘|’ 分隔开( ̊C) --第五位:备用电池电量,(大于100需要-100为V,其它为百分比) --第六位:主电源电压
+--第七位:GPS颗数(gpscount), --第八位: gsm信号强度(gsmlevel), --第九位: 正反转(ClockwiseState), --第十位: 车载状态(VehicleState), --第十一位:龙锁数(lockcnt) , --第十二位:副油箱油量(ViceOil) --第十三位:已删除 --第十四位:已删除 --第十五位:高度 (height)
+--第十六位:定位信号类型(SignalType) // 0:GPS,16:LBS(基站) --第十七位:步数(StepNumber)
+ */
+    @LogField
+    @FieldRemark(name = "数值状态逗号分割(不支持为空)",field = "value")
+    private String value;
+
+    public void setMacid(String macid)
+    {
+        this.macid = macid;
+    }
+
+    public String getMacid()
+    {
+        return macid;
+    }
+
+    public void setGpsTime(Long gpsTime)
+    {
+        this.gpsTime = gpsTime;
+    }
+
+    public Long getGpsTime()
+    {
+        return gpsTime;
+    }
+
+    public void setHeartTime(Long heartTime)
+    {
+        this.heartTime = heartTime;
+    }
+
+    public Long getHeartTime()
+    {
+        return heartTime;
+    }
+
+    public void setUpdTime(Long updTime)
+    {
+        this.updTime = updTime;
+    }
+
+    public Long getUpdTime()
+    {
+        return updTime;
+    }
+
+    public void setSpeed(String speed)
+    {
+        this.speed = speed;
+    }
+
+    public String getSpeed()
+    {
+        return speed;
+    }
+
+    public void setDir(String dir)
+    {
+        this.dir = dir;
+    }
+
+    public String getDir()
+    {
+        return dir;
+    }
+
+    public void setLat(String lat)
+    {
+        this.lat = lat;
+    }
+
+    public String getLat()
+    {
+        return lat;
+    }
+
+    public void setLon(String lon)
+    {
+        this.lon = lon;
+    }
+
+    public String getLon()
+    {
+        return lon;
+    }
+
+    public void setMapLat(String mapLat)
+    {
+        this.mapLat = mapLat;
+    }
+
+    public String getMapLat()
+    {
+        return mapLat;
+    }
+
+    public void setMapLon(String mapLon)
+    {
+        this.mapLon = mapLon;
+    }
+
+    public String getMapLon()
+    {
+        return mapLon;
+    }
+
+    public void setStats(String stats)
+    {
+        this.stats = stats;
+    }
+
+    public String getStats()
+    {
+        return stats;
+    }
+
+    public void setValue(String value)
+    {
+        this.value = value;
+    }
+
+    public String getValue()
+    {
+        return value;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("macid", getMacid())
+            .append("gpsTime", getGpsTime())
+            .append("heartTime", getHeartTime())
+            .append("updTime", getUpdTime())
+            .append("speed", getSpeed())
+            .append("dir", getDir())
+            .append("lat", getLat())
+            .append("lon", getLon())
+            .append("mapLat", getMapLat())
+            .append("mapLon", getMapLon())
+            .append("stats", getStats())
+            .append("value", getValue())
+            .append("id", getId())
+            .toString();
+    }
+}

+ 113 - 0
aidex-system/src/main/java/com/aidex/common/plush/domain/SysShipExtend.java

@@ -0,0 +1,113 @@
+package com.aidex.common.plush.domain;
+
+import javax.validation.constraints.NotBlank;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.aidex.common.utils.log.annotation.FieldRemark;
+import com.aidex.common.utils.log.annotation.LogField;
+import com.aidex.common.annotation.Excel;
+
+/**
+ * 船只信息扩展(查询站点数据使用)对象 sys_ship_extend
+ * @author shs
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+@Data
+public class SysShipExtend
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 船只Id */
+    @Excel(name = "船只Id")
+    @NotBlank(message = "船只Id不允许为空")
+    @LogField
+    @FieldRemark(name = "船只Id",field = "shipId")
+    private String shipId;
+
+    /** 设备MacId */
+    @Excel(name = "设备MacId")
+    @NotBlank(message = "设备MacId不允许为空")
+    @LogField
+    @FieldRemark(name = "设备MacId",field = "macId")
+    private String macId;
+
+    /** 船只运行速度 */
+    @Excel(name = "船只运行速度")
+    @LogField
+    @FieldRemark(name = "船只运行速度",field = "speed")
+    private String speed;
+
+    /** 船只是否停靠(0:未停靠;1已停靠) */
+    @Excel(name = "船只是否停靠(0:未停靠;1已停靠)")
+    @LogField
+    @FieldRemark(name = "船只是否停靠(0:未停靠;1已停靠)",field = "isStop")
+    private Long isStop;
+
+    /** 船只方位(默认从西到东) */
+    @Excel(name = "船只方位")
+    @NotBlank(message = "船只方位(默认从西到东)不允许为空")
+    @LogField
+    @FieldRemark(name = "船只方位",field = "dir")
+    private String dir;
+
+    /** 预计到达站点 */
+    @Excel(name = "预计到达站点")
+    @LogField
+    @FieldRemark(name = "预计到达站点",field = "nextWharf")
+    private String nextWharf;
+
+    /** 停靠的站点 */
+    @Excel(name = "停靠的站点")
+    @LogField
+    @FieldRemark(name = "停靠的站点",field = "wharfStop")
+    private String wharfStop;
+
+    /** 纬度(默认停靠名城广场码头) */
+    @NotBlank(message = "纬度(默认停靠名城广场码头)不允许为空")
+    @LogField
+    @FieldRemark(name = "纬度",field = "lat")
+    private String lat;
+
+    /** 经度(默认停靠名城广场码头) */
+    @NotBlank(message = "经度(默认停靠名城广场码头)不允许为空")
+    @LogField
+    @FieldRemark(name = "经度",field = "lon")
+    private String lon;
+
+    /** 船只行驶里程 */
+    @NotBlank(message = "船只行驶里程不允许为空")
+    @LogField
+    @FieldRemark(name = "船只行驶里程",field = "mileage")
+    private String mileage;
+
+    /** 船只行驶方向(1正向,2反向) */
+    @LogField
+    @FieldRemark(name = "船只行驶方向",field = "travel")
+    private Long travel;
+
+    private String id;
+    private String delFlag;
+
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shipId", getShipId())
+            .append("macId", getMacId())
+            .append("speed", getSpeed())
+            .append("isStop", getIsStop())
+            .append("dir", getDir())
+            .append("nextWharf", getNextWharf())
+            .append("wharfStop", getWharfStop())
+            .append("lat", getLat())
+            .append("lon", getLon())
+            .append("mileage", getMileage())
+            .append("travel", getTravel())
+            .append("id", getId())
+            .append("delFlag", getDelFlag())
+            .toString();
+    }
+}

+ 16 - 0
aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsAlarmPlushMapper.java

@@ -0,0 +1,16 @@
+package com.aidex.common.plush.mapper;
+
+import com.aidex.common.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.aidex.common.plush.domain.GpsAlarmPlush;
+
+/**
+ * 报警信息推送表Mapper接口
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+public interface GpsAlarmPlushMapper extends BaseMapper<GpsAlarmPlush>
+{
+
+}

+ 190 - 0
aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsAlarmPlushMapper.xml

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aidex.common.plush.mapper.GpsAlarmPlushMapper">
+
+    <sql id="gpsAlarmPlushColumns">
+        a.user_name as "userName",
+
+        a.macid as "macid",
+
+        a.full_name as "fullName",
+
+        a.p_time as "pTime",
+
+        a.add_time as "addTime",
+
+        a.lat as "lat",
+
+        a.lon as "lon",
+
+        a.map_lat as "mapLat",
+
+        a.map_lon as "mapLon",
+
+        a.speed as "speed",
+
+        a.dir as "dir",
+
+        a.classify as "classify",
+
+        a.describe as "describe",
+
+        a.notea as "notea",
+
+        a.remark as "remark",
+
+        a.id as "id",
+
+    </sql>
+
+    <sql id="gpsAlarmPlushJoins">
+    </sql>
+
+    <select id="get" resultType="GpsAlarmPlush">
+        SELECT
+            <include refid="gpsAlarmPlushColumns"/>
+        FROM gps_alarm_plush a
+        <include refid="gpsAlarmPlushJoins"/>
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="GpsAlarmPlush">
+        SELECT
+            <include refid="gpsAlarmPlushColumns"/>
+        FROM gps_alarm_plush a
+        <include refid="gpsAlarmPlushJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="userName != null and userName != ''">
+                and a.user_name like concat('%', #{userName}, '%')
+            </if>
+            <if test="macid != null and macid != ''">
+                and a.macid like concat('%', #{macid}, '%')
+            </if>
+            <if test="fullName != null and fullName != ''">
+                and a.full_name like concat('%', #{fullName}, '%')
+            </if>
+            <if test="pTime != null ">
+                AND a.p_time = #{pTime}
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="findListWithUnique" resultType="GpsAlarmPlush">
+        SELECT
+            a.id
+        FROM gps_alarm_plush a
+        <include refid="gpsAlarmPlushJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="notEqualId != null and notEqualId != ''">
+                AND id != #{notEqualId}
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insert">
+        INSERT INTO gps_alarm_plush(
+            user_name,
+
+            macid,
+
+            full_name,
+
+            p_time,
+
+            add_time,
+
+            lat,
+
+            lon,
+
+            map_lat,
+
+            map_lon,
+
+            speed,
+
+            dir,
+
+            classify,
+
+            describe,
+
+            notea,
+
+            remark,
+
+            id
+
+        ) VALUES (
+            #{userName},
+
+            #{macid},
+
+            #{fullName},
+
+            #{pTime},
+
+            #{addTime},
+
+            #{lat},
+
+            #{lon},
+
+            #{mapLat},
+
+            #{mapLon},
+
+            #{speed},
+
+            #{dir},
+
+            #{classify},
+
+            #{describe},
+
+            #{notea},
+
+            #{remark},
+
+            #{id}
+
+        )
+    </insert>
+
+    <update id="update">
+        UPDATE gps_alarm_plush SET
+            user_name = #{userName},
+            macid = #{macid},
+            full_name = #{fullName},
+            p_time = #{pTime},
+            add_time = #{addTime},
+            lat = #{lat},
+            lon = #{lon},
+            map_lat = #{mapLat},
+            map_lon = #{mapLon},
+            speed = #{speed},
+            dir = #{dir},
+            classify = #{classify},
+            describe = #{describe},
+            notea = #{notea}
+        WHERE id = #{id}
+    </update>
+
+
+    <update id="delete">
+        UPDATE gps_alarm_plush SET
+            del_flag = #{DEL_FLAG_DELETE}
+        WHERE id = #{id}
+    </update>
+
+</mapper>

+ 16 - 0
aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsLocationPlushMapper.java

@@ -0,0 +1,16 @@
+package com.aidex.common.plush.mapper;
+
+import com.aidex.common.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.aidex.common.plush.domain.GpsLocationPlush;
+
+/**
+ * GPS位置信息推送数据Mapper接口
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+public interface GpsLocationPlushMapper extends BaseMapper<GpsLocationPlush>
+{
+
+}

+ 176 - 0
aidex-system/src/main/java/com/aidex/common/plush/mapper/GpsLocationPlushMapper.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aidex.common.plush.mapper.GpsLocationPlushMapper">
+
+    <sql id="gpsLocationPlushColumns">
+        a.macid as "macid",
+
+        a.gps_time as "gpsTime",
+
+        a.heart_time as "heartTime",
+
+        a.upd_time as "updTime",
+
+        a.speed as "speed",
+
+        a.dir as "dir",
+
+        a.lat as "lat",
+
+        a.lon as "lon",
+
+        a.map_lat as "mapLat",
+
+        a.map_lon as "mapLon",
+
+        a.stats as "stats",
+
+        a.value as "value",
+
+        a.id as "id"
+
+    </sql>
+
+    <sql id="gpsLocationPlushJoins">
+    </sql>
+
+    <select id="get" resultType="GpsLocationPlush">
+        SELECT
+            <include refid="gpsLocationPlushColumns"/>
+        FROM gps_location_plush a
+        <include refid="gpsLocationPlushJoins"/>
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="GpsLocationPlush">
+        SELECT
+            <include refid="gpsLocationPlushColumns"/>
+        FROM gps_location_plush a
+        <include refid="gpsLocationPlushJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="macid != null and macid != ''">
+                and a.macid like concat('%', #{macid}, '%')
+            </if>
+            <if test="gpsTime != null ">
+                AND a.gps_time = #{gpsTime}
+            </if>
+            <if test="heartTime != null ">
+                AND a.heart_time = #{heartTime}
+            </if>
+            <if test="updTime != null ">
+                AND a.upd_time = #{updTime}
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="findListWithUnique" resultType="GpsLocationPlush">
+        SELECT
+            a.id
+        FROM gps_location_plush a
+        <include refid="gpsLocationPlushJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="notEqualId != null and notEqualId != ''">
+                AND id != #{notEqualId}
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insert">
+        INSERT INTO gps_location_plush(
+            macid,
+
+            gps_time,
+
+            heart_time,
+
+            upd_time,
+
+            speed,
+
+            dir,
+
+            lat,
+
+            lon,
+
+            map_lat,
+
+            map_lon,
+
+            stats,
+
+            value,
+
+            id
+
+        ) VALUES (
+            #{macid},
+
+            #{gpsTime},
+
+            #{heartTime},
+
+            #{updTime},
+
+            #{speed},
+
+            #{dir},
+
+            #{lat},
+
+            #{lon},
+
+            #{mapLat},
+
+            #{mapLon},
+
+            #{stats},
+
+            #{value},
+
+            #{id}
+
+        )
+    </insert>
+
+    <update id="update">
+        UPDATE gps_location_plush SET
+            macid = #{macid},
+            gps_time = #{gpsTime},
+            heart_time = #{heartTime},
+            upd_time = #{updTime},
+            speed = #{speed},
+            dir = #{dir},
+            lat = #{lat},
+            lon = #{lon},
+            map_lat = #{mapLat},
+            map_lon = #{mapLon},
+            stats = #{stats},
+            value = #{value}
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateStatus">
+        UPDATE gps_location_plush SET
+            status = #{status},
+            version = version + 1
+        WHERE id = #{id}
+    </update>
+
+    <update id="delete">
+        UPDATE gps_location_plush SET
+            del_flag = #{DEL_FLAG_DELETE}
+        WHERE id = #{id}
+    </update>
+
+</mapper>

+ 17 - 0
aidex-system/src/main/java/com/aidex/common/plush/mapper/SysShipExtendMapper.java

@@ -0,0 +1,17 @@
+package com.aidex.common.plush.mapper;
+
+import com.aidex.common.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.aidex.common.plush.domain.SysShipExtend;
+
+/**
+ * 船只信息扩展(查询站点数据使用)Mapper接口
+ * @author shs
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+public interface SysShipExtendMapper extends BaseMapper<SysShipExtend>
+{
+
+
+}

+ 168 - 0
aidex-system/src/main/java/com/aidex/common/plush/mapper/SysShipExtendMapper.xml

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aidex.common.plush.mapper.SysShipExtendMapper">
+
+    <sql id="sysShipExtendColumns">
+        a.ship_id as "shipId",
+
+        a.mac_id as "macId",
+
+        a.speed as "speed",
+
+        a.is_stop as "isStop",
+
+        a.dir as "dir",
+
+        a.next_wharf as "nextWharf",
+
+        a.wharf_stop as "wharfStop",
+
+        a.lat as "lat",
+
+        a.lon as "lon",
+
+        a.mileage as "mileage",
+
+        a.travel as "travel",
+
+        a.remark as "remark",
+
+        a.id as "id",
+
+        a.update_time as "updateTime",
+
+        a.del_flag as "delFlag"
+
+    </sql>
+
+    <sql id="sysShipExtendJoins">
+    </sql>
+
+    <select id="get" resultType="SysShipExtend">
+        SELECT
+            <include refid="sysShipExtendColumns"/>
+        FROM sys_ship_extend a
+        <include refid="sysShipExtendJoins"/>
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="SysShipExtend">
+        SELECT
+            <include refid="sysShipExtendColumns"/>
+        FROM sys_ship_extend a
+        <include refid="sysShipExtendJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="shipId != null and shipId != ''">
+                AND a.ship_id = #{shipId}
+            </if>
+            <if test="macId != null and macId != ''">
+                AND a.mac_id = #{macId}
+            </if>
+        </where>
+    </select>
+
+    <select id="findListWithUnique" resultType="SysShipExtend">
+        SELECT
+            a.id
+        FROM sys_ship_extend a
+        <include refid="sysShipExtendJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="notEqualId != null and notEqualId != ''">
+                AND id != #{notEqualId}
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insert">
+        INSERT INTO sys_ship_extend(
+            ship_id,
+
+            mac_id,
+
+            speed,
+
+            is_stop,
+
+            dir,
+
+            next_wharf,
+
+            wharf_stop,
+
+            lat,
+
+            lon,
+
+            mileage,
+
+            travel,
+
+            remark,
+
+            id,
+
+            update_time,
+
+            del_flag
+
+        ) VALUES (
+            #{shipId},
+
+            #{macId},
+
+            #{speed},
+
+            #{isStop},
+
+            #{dir},
+
+            #{nextWharf},
+
+            #{wharfStop},
+
+            #{lat},
+
+            #{lon},
+
+            #{mileage},
+
+            #{travel},
+
+            #{remark},
+
+            #{id},
+
+            #{updateTime},
+
+            #{delFlag}
+
+        )
+    </insert>
+
+    <update id="update">
+        UPDATE sys_ship_extend SET
+            mac_id = #{macId},
+            speed = #{speed},
+            is_stop = #{isStop},
+            dir = #{dir},
+            next_wharf = #{nextWharf},
+            wharf_stop = #{wharfStop},
+            lat = #{lat},
+            lon = #{lon},
+            mileage = #{mileage},
+            travel = #{travel},
+            update_time = #{updateTime},
+        WHERE mac_id = #{macId}
+    </update>
+
+
+    <update id="delete">
+        UPDATE sys_ship_extend SET
+            del_flag = #{DEL_FLAG_DELETE}
+        WHERE ship_id = #{id}
+    </update>
+
+</mapper>

+ 14 - 0
aidex-system/src/main/java/com/aidex/common/plush/service/GpsAlarmPlushService.java

@@ -0,0 +1,14 @@
+package com.aidex.common.plush.service;
+
+import com.aidex.common.core.service.BaseService;
+import com.aidex.common.plush.domain.GpsAlarmPlush;
+
+/**
+ * 报警信息推送表Service接口
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+public interface GpsAlarmPlushService {
+
+}

+ 15 - 0
aidex-system/src/main/java/com/aidex/common/plush/service/GpsLocationPlushService.java

@@ -0,0 +1,15 @@
+package com.aidex.common.plush.service;
+
+import com.aidex.common.core.service.BaseService;
+import com.aidex.common.plush.domain.GpsLocationPlush;
+
+/**
+ * GPS位置信息推送数据Service接口
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+public interface GpsLocationPlushService {
+
+
+}

+ 15 - 0
aidex-system/src/main/java/com/aidex/common/plush/service/SysShipExtendService.java

@@ -0,0 +1,15 @@
+package com.aidex.common.plush.service;
+
+import com.aidex.common.core.service.BaseService;
+import com.aidex.common.plush.domain.SysShipExtend;
+
+/**
+ * 船只信息扩展(查询站点数据使用)Service接口
+ * @author shs
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+public interface SysShipExtendService {
+
+
+}

+ 27 - 0
aidex-system/src/main/java/com/aidex/common/plush/service/impl/GpsAlarmPlushServiceImpl.java

@@ -0,0 +1,27 @@
+package com.aidex.common.plush.service.impl;
+
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.github.pagehelper.PageInfo;
+import com.aidex.common.core.domain.BaseEntity;
+import com.aidex.common.core.service.BaseServiceImpl;
+import com.aidex.common.plush.mapper.GpsAlarmPlushMapper;
+import com.aidex.common.plush.domain.GpsAlarmPlush;
+import com.aidex.common.plush.service.GpsAlarmPlushService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 报警信息推送表Service业务层处理
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+@Service
+@Transactional(readOnly = true)
+public class GpsAlarmPlushServiceImpl implements GpsAlarmPlushService {
+
+    private static final Logger log = LoggerFactory.getLogger(GpsAlarmPlushServiceImpl.class);
+
+}

+ 23 - 0
aidex-system/src/main/java/com/aidex/common/plush/service/impl/GpsLocationPlushServiceImpl.java

@@ -0,0 +1,23 @@
+package com.aidex.common.plush.service.impl;
+
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.aidex.common.plush.service.GpsLocationPlushService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * GPS位置信息推送数据Service业务层处理
+ * @author gshk
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+@Service
+@Transactional(readOnly = true)
+public class GpsLocationPlushServiceImpl  implements GpsLocationPlushService {
+
+    private static final Logger log = LoggerFactory.getLogger(GpsLocationPlushServiceImpl.class);
+
+
+}

+ 27 - 0
aidex-system/src/main/java/com/aidex/common/plush/service/impl/SysShipExtendServiceImpl.java

@@ -0,0 +1,27 @@
+package com.aidex.common.plush.service.impl;
+
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.github.pagehelper.PageInfo;
+import com.aidex.common.core.domain.BaseEntity;
+import com.aidex.common.core.service.BaseServiceImpl;
+import com.aidex.common.plush.mapper.SysShipExtendMapper;
+import com.aidex.common.plush.domain.SysShipExtend;
+import com.aidex.common.plush.service.SysShipExtendService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 船只信息扩展(查询站点数据使用)Service业务层处理
+ * @author shs
+ * @email shs@woshs.com
+ * @date 2024-03-27
+ */
+@Service
+@Transactional(readOnly = true)
+public class SysShipExtendServiceImpl implements SysShipExtendService {
+
+    private static final Logger log = LoggerFactory.getLogger(SysShipExtendServiceImpl.class);
+
+}

+ 62 - 0
aidex-ui/src/api/gps/gpsLocationPlush.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询GPS位置信息推送数据列表
+export function listGpsLocationPlush (query) {
+  return request({
+    url: '/gps/gpsLocationPlush/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询GPS位置信息推送数据详细
+export function getGpsLocationPlush (id) {
+  return request({
+    url: '/gps/gpsLocationPlush/' + id,
+    method: 'get'
+  })
+}
+
+// 新增GPS位置信息推送数据
+export function addGpsLocationPlush (data) {
+  return request({
+    url: '/gps/gpsLocationPlush',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改GPS位置信息推送数据
+export function updateGpsLocationPlush (data) {
+  return request({
+    url: '/gps/gpsLocationPlush',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除GPS位置信息推送数据
+export function delGpsLocationPlush (id) {
+  return request({
+    url: '/gps/gpsLocationPlush/' + id,
+    method: 'delete'
+  })
+}
+
+
+// 导出GPS位置信息推送数据
+export function exportGpsLocationPlush (query) {
+  return request({
+    url: '/gps/gpsLocationPlush/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取初始化数据
+export function getInitData (dictTypes) {
+  return request({
+    url: '/gps/gpsLocationPlush/getInitData/' + dictTypes,
+    method: 'get'
+  })
+}

+ 19 - 0
sql/GpsAlarmPlushMenu.sql

@@ -0,0 +1,19 @@
+-- 菜单 SQL
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('495079656e6a4ff79e8e074829e90099', 'gpsAlarmPlush', '报警信息推送表', '50', 'gpsAlarmPlush', 'gpsalarm/gpsalarmplush/index', 1, 0, 'C', 0, 'gpsalarm:gpsAlarmPlush:list', '#', '3', '3/495079656e6a4ff79e8e074829e90099', '50', '000030/000050', '2', 'n', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+-- 按钮 SQL
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('03b29fc19ddc474b8f4695a616d8ba31', 'gpsAlarmPlushQuery', '报警信息推送表查询', '10', '#', '', 1, 0, 'F', 0, 'gpsalarm:gpsAlarmPlush:query', '#', '495079656e6a4ff79e8e074829e90099', '3/495079656e6a4ff79e8e074829e90099/03b29fc19ddc474b8f4695a616d8ba31', '10', '000030/000050/000010', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('61a5dbb2feb04ba7b13a756bb79832fa', 'gpsAlarmPlushAdd', '报警信息推送表新增', '20', '#', '', 1, 0, 'F', 0, 'gpsalarm:gpsAlarmPlush:add', '#', '495079656e6a4ff79e8e074829e90099', '3/495079656e6a4ff79e8e074829e90099/61a5dbb2feb04ba7b13a756bb79832fa', '20', '000030/000050/000020', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('df2dcb853f7245f6a841301394bec4a3', 'gpsAlarmPlushEdit', '报警信息推送表修改', '30', '#', '', 1, 0, 'F', 0, 'gpsalarm:gpsAlarmPlush:edit', '#', '495079656e6a4ff79e8e074829e90099', '3/495079656e6a4ff79e8e074829e90099/df2dcb853f7245f6a841301394bec4a3', '30', '000030/000050/000030', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('4b7894fc7a4a4ef3a0ed6b57dcc67a56', 'gpsAlarmPlushRemove', '报警信息推送表删除', '10', '#', '', 1, 0, 'F', 0, 'gpsalarm:gpsAlarmPlush:remove', '#', '495079656e6a4ff79e8e074829e90099', '3/495079656e6a4ff79e8e074829e90099/4b7894fc7a4a4ef3a0ed6b57dcc67a56', '40', '000030/000050/000040', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('188c8a20b14448d691082228ae7a4f93', 'gpsAlarmPlushExport', '报警信息推送表查询', '50', '#', '', 1, 0, 'F', 0, 'gpsalarm:gpsAlarmPlush:export', '#', '495079656e6a4ff79e8e074829e90099', '3/495079656e6a4ff79e8e074829e90099/188c8a20b14448d691082228ae7a4f93', '50', '000030/000050/000050', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+

+ 19 - 0
sql/GpsLocationPlushMenu.sql

@@ -0,0 +1,19 @@
+-- 菜单 SQL
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('5f6c41adc6e94627a73ab7faa066e019', 'gpsLocationPlush', 'GPS位置信息推送数据', '50', 'gpsLocationPlush', 'gps/gpslocationplush/index', 1, 0, 'C', 0, 'gps:gpsLocationPlush:list', '#', '3', '3/5f6c41adc6e94627a73ab7faa066e019', '50', '000030/000050', '2', 'n', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+-- 按钮 SQL
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('8651434be89a4fc9b672cc49fa1b6b2c', 'gpsLocationPlushQuery', 'GPS位置信息推送数据查询', '10', '#', '', 1, 0, 'F', 0, 'gps:gpsLocationPlush:query', '#', '5f6c41adc6e94627a73ab7faa066e019', '3/5f6c41adc6e94627a73ab7faa066e019/8651434be89a4fc9b672cc49fa1b6b2c', '10', '000030/000050/000010', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('f8fe352afd38488784308e79ef0d6737', 'gpsLocationPlushAdd', 'GPS位置信息推送数据新增', '20', '#', '', 1, 0, 'F', 0, 'gps:gpsLocationPlush:add', '#', '5f6c41adc6e94627a73ab7faa066e019', '3/5f6c41adc6e94627a73ab7faa066e019/f8fe352afd38488784308e79ef0d6737', '20', '000030/000050/000020', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('306d2bec66a148fabf209a3daa7de891', 'gpsLocationPlushEdit', 'GPS位置信息推送数据修改', '30', '#', '', 1, 0, 'F', 0, 'gps:gpsLocationPlush:edit', '#', '5f6c41adc6e94627a73ab7faa066e019', '3/5f6c41adc6e94627a73ab7faa066e019/306d2bec66a148fabf209a3daa7de891', '30', '000030/000050/000030', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('fdc63e81ba454f5fa2b692a33bafb37a', 'gpsLocationPlushRemove', 'GPS位置信息推送数据删除', '10', '#', '', 1, 0, 'F', 0, 'gps:gpsLocationPlush:remove', '#', '5f6c41adc6e94627a73ab7faa066e019', '3/5f6c41adc6e94627a73ab7faa066e019/fdc63e81ba454f5fa2b692a33bafb37a', '40', '000030/000050/000040', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('ec163aa2e46f4e33bfc70e05de54d1ec', 'gpsLocationPlushExport', 'GPS位置信息推送数据查询', '50', '#', '', 1, 0, 'F', 0, 'gps:gpsLocationPlush:export', '#', '5f6c41adc6e94627a73ab7faa066e019', '3/5f6c41adc6e94627a73ab7faa066e019/ec163aa2e46f4e33bfc70e05de54d1ec', '50', '000030/000050/000050', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+

+ 19 - 0
sql/SysShipExtendMenu.sql

@@ -0,0 +1,19 @@
+-- 菜单 SQL
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('bfd3722ea02a44919aba4bfd35e7c2c5', 'sysShipExtend', '船只信息扩展(查询站点数据使用)', '50', 'sysShipExtend', 'exptend/sysshipextend/index', 1, 0, 'C', 0, 'exptend:sysShipExtend:list', '#', '3', '3/bfd3722ea02a44919aba4bfd35e7c2c5', '50', '000030/000050', '2', 'n', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+-- 按钮 SQL
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('5847f9b02c6848d59960a6b8bd3d4470', 'sysShipExtendQuery', '船只信息扩展(查询站点数据使用)查询', '10', '#', '', 1, 0, 'F', 0, 'exptend:sysShipExtend:query', '#', 'bfd3722ea02a44919aba4bfd35e7c2c5', '3/bfd3722ea02a44919aba4bfd35e7c2c5/5847f9b02c6848d59960a6b8bd3d4470', '10', '000030/000050/000010', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('3b7bff01b53f4a89bf757d026863cff1', 'sysShipExtendAdd', '船只信息扩展(查询站点数据使用)新增', '20', '#', '', 1, 0, 'F', 0, 'exptend:sysShipExtend:add', '#', 'bfd3722ea02a44919aba4bfd35e7c2c5', '3/bfd3722ea02a44919aba4bfd35e7c2c5/3b7bff01b53f4a89bf757d026863cff1', '20', '000030/000050/000020', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('a7caac53c7284e02a0eb85fb916130c6', 'sysShipExtendEdit', '船只信息扩展(查询站点数据使用)修改', '30', '#', '', 1, 0, 'F', 0, 'exptend:sysShipExtend:edit', '#', 'bfd3722ea02a44919aba4bfd35e7c2c5', '3/bfd3722ea02a44919aba4bfd35e7c2c5/a7caac53c7284e02a0eb85fb916130c6', '30', '000030/000050/000030', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('6d3fbe9b05b74ac6901fe18604d20369', 'sysShipExtendRemove', '船只信息扩展(查询站点数据使用)删除', '10', '#', '', 1, 0, 'F', 0, 'exptend:sysShipExtend:remove', '#', 'bfd3722ea02a44919aba4bfd35e7c2c5', '3/bfd3722ea02a44919aba4bfd35e7c2c5/6d3fbe9b05b74ac6901fe18604d20369', '40', '000030/000050/000040', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+
+insert into sys_menu (id, menu_code, menu_name, sort, path, component, is_frame, is_cache, menu_type, visible, perms, icon, parent_id, parent_ids, tree_sort, tree_sorts, tree_level, tree_leaf, status, create_by, create_time, update_by, update_time, create_dept, update_ip, version, remark, del_flag)
+values('1366e7bed7244019986d813fcd26ad5f', 'sysShipExtendExport', '船只信息扩展(查询站点数据使用)查询', '50', '#', '', 1, 0, 'F', 0, 'exptend:sysShipExtend:export', '#', 'bfd3722ea02a44919aba4bfd35e7c2c5', '3/bfd3722ea02a44919aba4bfd35e7c2c5/1366e7bed7244019986d813fcd26ad5f', '50', '000030/000050/000050', '3', 'y', '0', '1', sysdate(), '1', sysdate(), '', '127.0.0.1', 0, '', '0');
+