diff --git a/smartFishingPort-admin/src/main/resources/application-local.yml b/smartFishingPort-admin/src/main/resources/application-local.yml new file mode 100644 index 0000000..b30f089 --- /dev/null +++ b/smartFishingPort-admin/src/main/resources/application-local.yml @@ -0,0 +1,111 @@ +# 数据源配置 +spring: + data: + solr: + host: http://192.168.2.253:8983/solr + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.highgo.jdbc.Driver + druid: + # 主库数据源 + # master: + # url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + # username: root + # password: password + master: + url: jdbc:highgo://192.168.2.253:5866/haishiju?currentSchema=public # 端口5866，指定schema + username: sysdba # 翰高用户名 + password: Hello@1234 # 翰高密码 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true +url: + picFile: http://198.16.74.209:6060 +sdk: + loginDHUrl: http://192.168.1.18:6450/dhsdk/rest/sdk/init + attachTrafficDHUrl: http://192.168.1.18:6450/dhsdk/rest/sdk/attachTraffic + attachAlarmChanDHByAccountUrl: http://localhost:6450/dhsdk/rest/sdk/attachAlarmChanByAccount + attachAlarmChanHKByAccountUrl: http://localhost:6350/hksdk/rest/sdk/attachAlarmChanByAccount + hk: + getPtzCfgUrl: http://198.16.74.211:6350/hksdk/rest/sdk/getPtzCfg + setPtzCfgUrl: http://198.16.74.211:6350/hksdk/rest/sdk/setPtzCfg + setupAlarmChanUrl: http://198.16.74.211:6350/hksdk/rest/sdk/setupAlarmChan +file: + base: /file + image: /file/image + kml: /files/kml/ + +sysLog: + logFilePath: file/log/ # 系统操作日志备份文件夹 +path: + rootPath: file/ # 文件存储的跟路径,绝对路径-直接使用,相对路径-项目运行目录下 + filePattern: YYYY-MM/ # 存储目录的格式,日期格式YYYYMMddHHmmss,按照日期格式化来进行,为根目录下的一级 + mysqlhome: J://MYSQL5.7//bin// + sql: ${server.servlet.context-path}/file/sql + +#数据库备份时间间隔 +database: + backup: + interval: 3 # 单位天 +jwt: + tokenKey: Auth + duration: 18000 +drone: + url: http://198.16.74.210:30812/openapi/v0.1/ + key: eyJhbGciOiJIUzUxMiIsImNyaXQiOlsidHlwIiwiYWxnIiwia2lkIl0sImtpZCI6IjU3YmQyNmEwLTYyMDktNGE5My1hNjg4LWY4NzUyYmU1ZDE5MSIsInR5cCI6IkpXVCJ9.eyJhY2NvdW50IjoiIiwiZXhwIjoyMDc1OTQ3NzIyLCJuYmYiOjE3NjA0MTQ5MjIsIm9yZ2FuaXphdGlvbl91dWlkIjoiOWRmMjlmYTgtNGI5OS00MThlLWJhMmQtMGY5ZWY5ZWVlMzkyIiwicHJvamVjdF91dWlkIjoiIiwic3ViIjoiZmgyIiwidXNlcl9pZCI6IjE3NjA0MTQxMDkzNTcwMDI0MjkifQ.DC_aS37W2fkqOjCtfvysDfhTn-4XVn3_IrXBnPD9rICGyrIBKBG3oPldeW_pqele5H_gCn1EgM0KXcbDgvq-dw + url2: http://198.16.74.210:30812/openapi/v0.9/ + url3: http://198.16.74.210:63302/ +rocketmq: + name-server: 192.168.2.253:9876 + producer: + group: collect + topic: point-topic +# 温州大致范围 +geoJson: 119.6203422546387,27.68292003880313;119.800415040,27.962869020;119.948730470,27.999251730;120.132751460,27.999251730;120.305786130,28.011376570;120.375137330,28.144659670;120.337371830,28.336417060;120.321578980,28.378110320;120.312652590,28.425825960;120.336685180,28.440921370;120.4183960,28.574271040;120.443801880,28.592962710;120.490493770,28.58874230;120.568771360,28.547132060;120.628509520,28.584521720;120.701293950,28.619487110;120.747299190,28.62069260;120.797424320,28.596580060;120.957412720,28.520589410;121.098175050,28.544719370;121.168212890,28.518779440;121.259536740,28.41072840;121.242657720,28.38772010;121.222457890,28.374787540;121.214561460,28.349410190;121.210098270,28.325840080;121.202459340,28.273166160;121.153106690,28.266287160;121.149673460,28.214869550;121.139373780,28.153741130;121.058349610,28.038652480;121.127700810,28.013195180;121.260223390,27.99682660;121.198425290,27.827842780;121.18194580,27.72486720;121.254730220,27.610538530;121.140747070,27.414442970;120.886688230,27.004078760;120.40191650,27.137368360;120.252227780,27.372986830;120.0503540,27.315654240;119.766082760,27.286366590;119.6733856201172,27.43455578758766;119.6150207519531,27.59350062636446;119.6126174926758,27.63396131658914;119.6151924133301,27.65935568886939;119.6203422546387,27.68292003880313 \ No newline at end of file diff --git a/smartFishingPort-admin/src/main/resources/application.yml b/smartFishingPort-admin/src/main/resources/application.yml index b0cabe2..3c0db5a 100644 --- a/smartFishingPort-admin/src/main/resources/application.yml +++ b/smartFishingPort-admin/src/main/resources/application.yml @@ -56,7 +56,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: highgoprod + active: local # 文件上传 servlet: multipart: diff --git a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/dto/VideoIdentificationDto.java b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/dto/VideoIdentificationDto.java index 4d13101..2671c43 100644 --- a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/dto/VideoIdentificationDto.java +++ b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/dto/VideoIdentificationDto.java @@ -102,6 +102,8 @@ public class VideoIdentificationDto implements Serializable { @ExcelProperty(value = "识别类型") @ApiModelProperty(value = "识别类型（船脸识别、船牌识别）") private String identificationType; + @ApiModelProperty(value = "是否有船号 1:有 2:没有") + private Integer isHasBoatName; @ApiModelProperty("页容量") private Integer pageSize; diff --git a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/service/impl/VideoIdentificationServiceImpl.java b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/service/impl/VideoIdentificationServiceImpl.java index 84857bb..f83864d 100644 --- a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/service/impl/VideoIdentificationServiceImpl.java +++ b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/service/impl/VideoIdentificationServiceImpl.java @@ -68,6 +68,11 @@ public class VideoIdentificationServiceImpl extends ServiceImpl pageResult = baseMapper.selectPage(pageParam, queryWrapper); List videoIdentifications = pageResult.getRecords();