diff --git a/smartFishingPort-admin/pom.xml b/smartFishingPort-admin/pom.xml index 540e4f7..16c76b5 100644 --- a/smartFishingPort-admin/pom.xml +++ b/smartFishingPort-admin/pom.xml @@ -43,10 +43,12 @@ test - + + - mysql - mysql-connector-java + com.highgo + HgdbJdbc + 6.2.4 diff --git a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CaptchaController.java b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CaptchaController.java index 4a84ee0..06f8622 100644 --- a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CaptchaController.java +++ b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CaptchaController.java @@ -1,7 +1,7 @@ package com.ltgk.smartFishingPort.web.controller.common; import com.google.code.kaptcha.Producer; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.constant.CacheConstants; import com.ltgk.smartFishingPort.common.constant.Constants; import com.ltgk.smartFishingPort.common.core.domain.AjaxResult; @@ -40,7 +40,7 @@ public class CaptchaController @Autowired private ISysConfigService configService; - /** + /* * 生成验证码 */ @GetMapping("/captchaImage") @@ -62,7 +62,7 @@ public class CaptchaController BufferedImage image = null; // 生成验证码 - String captchaType = RuoYiConfig.getCaptchaType(); + String captchaType = SmartFishingPortConfig.getCaptchaType(); if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); diff --git a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CommonController.java b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CommonController.java index 40003f1..677e958 100644 --- a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CommonController.java +++ b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/common/CommonController.java @@ -1,6 +1,6 @@ package com.ltgk.smartFishingPort.web.controller.common; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.core.domain.AjaxResult; import com.ltgk.smartFishingPort.common.utils.StringUtils; import com.ltgk.smartFishingPort.common.utils.file.FileUploadUtils; @@ -53,7 +53,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = SmartFishingPortConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -78,7 +78,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = SmartFishingPortConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -104,7 +104,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = SmartFishingPortConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); @@ -146,7 +146,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = SmartFishingPortConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + FileUtils.stripPrefix(resource); // 下载名称 diff --git a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysIndexController.java b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysIndexController.java index 28bdd62..be2db55 100644 --- a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysIndexController.java +++ b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysIndexController.java @@ -1,6 +1,6 @@ package com.ltgk.smartFishingPort.web.controller.system; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,7 +16,7 @@ public class SysIndexController { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private SmartFishingPortConfig ruoyiConfig; /** * 访问首页，提示语 diff --git a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysProfileController.java b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysProfileController.java index 551adc0..05e45b5 100644 --- a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysProfileController.java +++ b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/controller/system/SysProfileController.java @@ -1,7 +1,7 @@ package com.ltgk.smartFishingPort.web.controller.system; import com.ltgk.smartFishingPort.common.annotation.Log; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.core.controller.BaseController; import com.ltgk.smartFishingPort.common.core.domain.AjaxResult; import com.ltgk.smartFishingPort.common.core.domain.entity.SysUser; @@ -123,13 +123,13 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); + String avatar = FileUploadUtils.upload(SmartFishingPortConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); if (userService.updateUserAvatar(loginUser.getUserId(), avatar)) { String oldAvatar = loginUser.getUser().getAvatar(); if (StringUtils.isNotEmpty(oldAvatar)) { - FileUtils.deleteFile(RuoYiConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); + FileUtils.deleteFile(SmartFishingPortConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); } AjaxResult ajax = AjaxResult.success(); ajax.put("imgUrl", avatar); diff --git a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/core/config/SwaggerConfig.java b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/core/config/SwaggerConfig.java index 853dd2e..2e3b032 100644 --- a/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/core/config/SwaggerConfig.java +++ b/smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/web/core/config/SwaggerConfig.java @@ -1,6 +1,6 @@ package com.ltgk.smartFishingPort.web.core.config; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +28,7 @@ public class SwaggerConfig { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private SmartFishingPortConfig ruoyiConfig; /** 是否开启swagger */ @Value("${swagger.enabled}") diff --git a/smartFishingPort-admin/src/main/resources/application-druid.yml b/smartFishingPort-admin/src/main/resources/application-druid.yml index 81981ad..ad747ab 100644 --- a/smartFishingPort-admin/src/main/resources/application-druid.yml +++ b/smartFishingPort-admin/src/main/resources/application-druid.yml @@ -13,7 +13,7 @@ spring: # username: root # password: password master: - url: jdbc:mysql://119.167.138.11:3306/smart_fishing_port?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://119.167.138.11:3306/kechuang_erqi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: ltgk password: litugaoke01! # 从库数据源 diff --git a/smartFishingPort-admin/src/main/resources/application-highgoprod.yml b/smartFishingPort-admin/src/main/resources/application-highgoprod.yml new file mode 100644 index 0000000..3c66a8d --- /dev/null +++ b/smartFishingPort-admin/src/main/resources/application-highgoprod.yml @@ -0,0 +1,108 @@ +# 数据源配置 +spring: + data: + solr: + host: http://198.16.74.212:8983/solr + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.highgo.jdbc.Driver # 翰高驱动（或 org.postgresql.Driver） + druid: + # 主库数据源 + master: + url: jdbc:highgo://198.16.74.212:5866/haishiju?currentSchema=public # 端口5866，指定schema + username: kechuang # 翰高用户名 + password: Litugaoke01! # 翰高密码d + # 从库数据源 + 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: 198.16.74.211: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 5ac242d..b0cabe2 100644 --- a/smartFishingPort-admin/src/main/resources/application.yml +++ b/smartFishingPort-admin/src/main/resources/application.yml @@ -1,5 +1,5 @@ # 项目相关配置 -smartFishingPort: +smart-fishing-port: # 名称 name: SmartFishingPort # 版本 @@ -19,7 +19,7 @@ server: port: 6061 servlet: # 应用的访问路径 - context-path: / + context-path: /api tomcat: # tomcat的URI编码 uri-encoding: UTF-8 @@ -36,6 +36,10 @@ logging: level: com.ltgk.smartFishingPort: debug org.springframework: warn + # SolrJ 核心请求日志（打印完整请求URL和参数） + org.apache.solr.client.solrj.impl.HttpSolrClient: DEBUG + # Spring Data Solr 核心日志（可选，打印构建的查询对象） + org.springframework.data.solr.core: DEBUG # 用户配置 user: @@ -52,7 +56,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: highgoprod # 文件上传 servlet: multipart: @@ -68,11 +72,11 @@ spring: # redis 配置 redis: # 地址 - host: 119.167.138.11 + host: 198.16.74.211 # 端口，默认为6379 port: 6379 # 数据库索引 - database: 0 + database: 1 # 密码 password: litugaoke01! # 连接超时时间 @@ -117,7 +121,7 @@ swagger: # 是否开启swagger enabled: true # 请求前缀 - pathMapping: /dev-api + pathMapping: /api # 防盗链配置 referer: diff --git a/smartFishingPort-admin/src/main/resources/logback.xml b/smartFishingPort-admin/src/main/resources/logback.xml index c91921d..d7fbd1e 100644 --- a/smartFishingPort-admin/src/main/resources/logback.xml +++ b/smartFishingPort-admin/src/main/resources/logback.xml @@ -1,31 +1,31 @@ - + - + - - - - ${log.pattern} - - - - - - ${log.path}/sys-info.log + + + + ${log.pattern} + + + + + + ${log.path}/sys-info.log - + - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + INFO @@ -33,16 +33,16 @@ DENY - - - - ${log.path}/sys-error.log + + + + ${log.path}/sys-error.log ${log.path}/sys-error.%d{yyyy-MM-dd}.log - - 60 + + 60 ${log.pattern} @@ -50,16 +50,16 @@ ERROR - + ACCEPT - + DENY - - + + - ${log.path}/sys-user.log + ${log.path}/sys-user.log ${log.path}/sys-user.%d{yyyy-MM-dd}.log @@ -70,23 +70,23 @@ ${log.pattern} - - - - - - - - - - + + + + + - - + - - + + + + + + + + diff --git a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/config/RuoYiConfig.java b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/config/SmartFishingPortConfig.java similarity index 88% rename from smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/config/RuoYiConfig.java rename to smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/config/SmartFishingPortConfig.java index dbed3ff..26a7083 100644 --- a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/config/RuoYiConfig.java +++ b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/config/SmartFishingPortConfig.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; * @author ltgk */ @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig +@ConfigurationProperties(prefix = "smart-fishing-port") +public class SmartFishingPortConfig { /** 项目名称 */ private String name; @@ -67,7 +67,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + SmartFishingPortConfig.profile = profile; } public static boolean isAddressEnabled() @@ -77,7 +77,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + SmartFishingPortConfig.addressEnabled = addressEnabled; } public static String getCaptchaType() { @@ -85,7 +85,7 @@ public class RuoYiConfig } public void setCaptchaType(String captchaType) { - RuoYiConfig.captchaType = captchaType; + SmartFishingPortConfig.captchaType = captchaType; } /** diff --git a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUploadUtils.java b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUploadUtils.java index a207abd..6427680 100644 --- a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUploadUtils.java +++ b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUploadUtils.java @@ -1,6 +1,6 @@ package com.ltgk.smartFishingPort.common.utils.file; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.constant.Constants; import com.ltgk.smartFishingPort.common.exception.file.FileNameLengthLimitExceededException; import com.ltgk.smartFishingPort.common.exception.file.FileSizeLimitExceededException; @@ -37,7 +37,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = SmartFishingPortConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -171,7 +171,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = SmartFishingPortConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUtils.java b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUtils.java index 610c260..720b67c 100644 --- a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUtils.java +++ b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/FileUtils.java @@ -1,6 +1,6 @@ package com.ltgk.smartFishingPort.common.utils.file; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.constant.Constants; import com.ltgk.smartFishingPort.common.utils.DateUtils; import com.ltgk.smartFishingPort.common.utils.StringUtils; @@ -69,7 +69,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, SmartFishingPortConfig.getImportPath()); } /** diff --git a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/ImageUtils.java b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/ImageUtils.java index c1f42d2..10a2780 100644 --- a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/ImageUtils.java +++ b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/file/ImageUtils.java @@ -1,6 +1,6 @@ package com.ltgk.smartFishingPort.common.utils.file; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.constant.Constants; import com.ltgk.smartFishingPort.common.utils.StringUtils; import org.apache.poi.util.IOUtils; @@ -80,7 +80,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = SmartFishingPortConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/ip/AddressUtils.java b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/ip/AddressUtils.java index b28acad..39aeef8 100644 --- a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/ip/AddressUtils.java +++ b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/ip/AddressUtils.java @@ -2,7 +2,7 @@ package com.ltgk.smartFishingPort.common.utils.ip; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.constant.Constants; import com.ltgk.smartFishingPort.common.utils.StringUtils; import com.ltgk.smartFishingPort.common.utils.http.HttpUtils; @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (SmartFishingPortConfig.isAddressEnabled()) { try { diff --git a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/poi/ExcelUtil.java b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/poi/ExcelUtil.java index be26579..99cadc0 100644 --- a/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/poi/ExcelUtil.java +++ b/smartFishingPort-common/src/main/java/com/ltgk/smartFishingPort/common/utils/poi/ExcelUtil.java @@ -4,7 +4,7 @@ import com.ltgk.smartFishingPort.common.annotation.Excel; import com.ltgk.smartFishingPort.common.annotation.Excel.ColumnType; import com.ltgk.smartFishingPort.common.annotation.Excel.Type; import com.ltgk.smartFishingPort.common.annotation.Excels; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.core.domain.AjaxResult; import com.ltgk.smartFishingPort.common.core.text.Convert; import com.ltgk.smartFishingPort.common.exception.UtilException; @@ -1438,7 +1438,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = SmartFishingPortConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/ResourcesConfig.java b/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/ResourcesConfig.java index 76265ab..8aa4a6e 100644 --- a/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/ResourcesConfig.java +++ b/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/ResourcesConfig.java @@ -1,6 +1,6 @@ package com.ltgk.smartFishingPort.framework.config; -import com.ltgk.smartFishingPort.common.config.RuoYiConfig; +import com.ltgk.smartFishingPort.common.config.SmartFishingPortConfig; import com.ltgk.smartFishingPort.common.constant.Constants; import com.ltgk.smartFishingPort.framework.interceptor.RepeatSubmitInterceptor; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +32,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") - .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + .addResourceLocations("file:" + SmartFishingPortConfig.getProfile() + "/"); /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**") diff --git a/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/SecurityConfig.java b/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/SecurityConfig.java index 70b7795..e138fc9 100644 --- a/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/SecurityConfig.java +++ b/smartFishingPort-framework/src/main/java/com/ltgk/smartFishingPort/framework/config/SecurityConfig.java @@ -114,7 +114,6 @@ public class SecurityConfig requests.antMatchers("/login", "/register", "/captchaImage").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/controller/AisSolrController.java b/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/controller/AisSolrController.java index 3c452f0..d28ac2c 100644 --- a/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/controller/AisSolrController.java +++ b/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/controller/AisSolrController.java @@ -3,14 +3,12 @@ package com.ltgk.smartFishingPort.controller; import com.ltgk.smartFishingPort.common.core.controller.BaseController; import com.ltgk.smartFishingPort.common.core.domain.AjaxResult; +import com.ltgk.smartFishingPort.domain.dto.FindAISPointPositionByMmsiReq; import com.ltgk.smartFishingPort.service.ISolrService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -30,7 +28,7 @@ public class AisSolrController extends BaseController { @ApiOperation(value = "根据mmsi获取 24H 轨迹信息") @PostMapping("/findAISPointPositionByMmsi") - public AjaxResult findAISPointPositionByMmsi(@ApiParam("mmsi") @RequestParam("mmsi") String mmsi) { - return AjaxResult.success(solrService.findAISPointPositionByMmsi(mmsi)); + public AjaxResult findAISPointPositionByMmsi(@RequestBody FindAISPointPositionByMmsiReq req) { + return AjaxResult.success(solrService.findAISPointPositionByMmsi(req.getMmsi())); } } diff --git a/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/domain/dto/FindAISPointPositionByMmsiReq.java b/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/domain/dto/FindAISPointPositionByMmsiReq.java new file mode 100644 index 0000000..8a33ec2 --- /dev/null +++ b/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/domain/dto/FindAISPointPositionByMmsiReq.java @@ -0,0 +1,16 @@ +package com.ltgk.smartFishingPort.domain.dto; + + +import lombok.Data; + +/** + * 根据 mmsi 获取 24H 轨迹信息 + * + * @author Qi ChengBin + * @date 2025/12/25 + */ +@Data +public class FindAISPointPositionByMmsiReq { + + private String mmsi; +} diff --git a/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/service/impl/SolrServiceImpl.java b/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/service/impl/SolrServiceImpl.java index 51a3a05..05b28ac 100644 --- a/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/service/impl/SolrServiceImpl.java +++ b/smartFishingPort-solr/src/main/java/com/ltgk/smartFishingPort/service/impl/SolrServiceImpl.java @@ -44,7 +44,7 @@ public class SolrServiceImpl implements ISolrService { // 查询 24H 内的 mmsi 的数据 String now = DateUtil.formatDateTime(nowDate); // 24小时之前的时间 before24HStr - String before24HStr = DateUtil.offsetHour(nowDate, -24).toString("yyyy-MM-dd HH:mm:ss"); + String before24HStr = DateUtil.offsetHour(nowDate, -4).toString("yyyy-MM-dd HH:mm:ss"); // 查询 solr 获取相关的轨迹 Criteria criteria = new Criteria("terminalCode") diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysConfigMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysConfigMapper.xml index 9d01bcc..4ff7ea5 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark - from sys_config + from haishiju.sys_config @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_config ( + insert into sys_configsys_config ( config_name, config_key, config_value, @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_config + update sys_configsys_config config_name = #{configName}, config_key = #{configKey}, @@ -104,11 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_config where config_id = #{configId} + delete from haishiju.sys_config where config_id = #{configId} - delete from sys_config where config_id in + delete from haishiju.sys_config where config_id in #{configId} diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysDeptMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysDeptMapper.xml index fcd45a3..88bbcdd 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time - from sys_dept d + from haishiju.sys_dept d select d.dept_id - from sys_dept d - left join sys_role_dept rd on d.dept_id = rd.dept_id + from haishiju.sys_dept d + left join haishiju.sys_role_dept rd on d.dept_id = rd.dept_id where rd.role_id = #{roleId} - and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) + and d.dept_id not in (select d.parent_id from haishiju.sys_dept d inner join haishiju.sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) order by d.parent_id, d.order_num - insert into sys_dept( + insert into haishiju.sys_dept( dept_id, parent_id, dept_name, @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept + update haishiju.sys_dept parent_id = #{parentId}, dept_name = #{deptName}, @@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept set ancestors = + update haishiju.sys_dept set ancestors = when #{item.deptId} then #{item.ancestors} @@ -146,14 +146,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept set status = '0' where dept_id in + update haishiju.sys_dept set status = '0' where dept_id in #{deptId} - update sys_dept set del_flag = '2' where dept_id = #{deptId} + update haishiju.sys_dept set del_flag = '2' where dept_id = #{deptId} \ No newline at end of file diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysDictDataMapper.xml index d051c50..227c910 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark - from sys_dict_data + from haishiju.sys_dict_data @@ -57,22 +57,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_dict_data where dict_code = #{dictCode} + delete from haishiju.sys_dict_data where dict_code = #{dictCode} - delete from sys_dict_data where dict_code in + delete from haishiju.sys_dict_data where dict_code in #{dictCode} - update sys_dict_data + update haishiju.sys_dict_data dict_sort = #{dictSort}, dict_label = #{dictLabel}, @@ -90,11 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} + update haishiju.sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - insert into sys_dict_data( + insert into haishiju.sys_dict_data( dict_sort, dict_label, dict_value, diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 19490ca..a7cc272 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select dict_id, dict_name, dict_type, status, create_by, create_time, remark - from sys_dict_type + from haishiju.sys_dict_type - delete from sys_dict_type where dict_id = #{dictId} + delete from haishiju.sys_dict_type where dict_id = #{dictId} - delete from sys_dict_type where dict_id in + delete from haishiju.sys_dict_type where dict_id in #{dictId} - update sys_dict_type + update haishiju.sys_dict_type dict_name = #{dictName}, dict_type = #{dictType}, @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_dict_type( + insert into haishiju.sys_dict_type( dict_name, dict_type, status, diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysLogininforMapper.xml index d6a6682..e51d745 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) + insert into haishiju.sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) - delete from sys_logininfor where info_id in + delete from haishiju.sys_logininfor where info_id in #{infoId} - truncate table sys_logininfor + truncate table haishiju.sys_logininfor \ No newline at end of file diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysMenuMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysMenuMapper.xml index 5d2961f..00384bd 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -1,206 +1,265 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time - from sys_menu + + select menu_id, + menu_name, + parent_id, + order_num, + path, + component, + `query`, + route_name, + is_frame, + is_cache, + menu_type, + visible, + status, + coalesce(perms, '') as perms, + icon, + create_time + from haishiju.sys_menu - + - - - - - - - - - - + + AND visible = #{visible} + + + AND status = #{status} + + + order by parent_id, order_num + - - - - - - - - - - - - update sys_menu - - menu_name = #{menuName}, - parent_id = #{parentId}, - order_num = #{orderNum}, - path = #{path}, - component = #{component}, - `query` = #{query}, - route_name = #{routeName}, - is_frame = #{isFrame}, - is_cache = #{isCache}, - menu_type = #{menuType}, - visible = #{visible}, - status = #{status}, - perms = #{perms}, - icon = #{icon}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where menu_id = #{menuId} - + - - insert into sys_menu( - menu_id, - parent_id, - menu_name, - order_num, - path, - component, - `query`, - route_name, - is_frame, - is_cache, - menu_type, - visible, - status, - perms, - icon, - remark, - create_by, - create_time - )values( - #{menuId}, - #{parentId}, - #{menuName}, - #{orderNum}, - #{path}, - #{component}, - #{query}, - #{routeName}, - #{isFrame}, - #{isCache}, - #{menuType}, - #{visible}, - #{status}, - #{perms}, - #{icon}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - delete from sys_menu where menu_id = #{menuId} - + + + + + + + + + + + + + + + + + + + + update haishiju.sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + path = #{path}, + component = #{component}, + `query` = #{query}, + route_name = #{routeName}, + is_frame = #{isFrame}, + is_cache = #{isCache}, + menu_type = #{menuType}, + visible = #{visible}, + status = #{status}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where menu_id = #{menuId} + + + + insert into haishiju.sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + path, + component, + `query`, + route_name, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{routeName}, + #{isFrame}, + #{isCache}, + #{menuType}, + #{visible}, + #{status}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete + from haishiju.sys_menu + where menu_id = #{menuId} + \ No newline at end of file diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysNoticeMapper.xml index f1318b4..4944a22 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark - from sys_notice + from haishiju.sys_notice - insert into sys_notice ( + insert into haishiju.sys_notice ( notice_title, notice_type, notice_content, @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_notice + update haishiju.sys_notice notice_title = #{noticeTitle}, notice_type = #{noticeType}, @@ -76,11 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_notice where notice_id = #{noticeId} + delete from haishiju.sys_notice where notice_id = #{noticeId} - delete from sys_notice where notice_id in + delete from haishiju.sys_notice where notice_id in #{noticeId} diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 8e81032..8eebd52 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time - from sys_oper_log + from haishiju.sys_oper_log - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) + insert into haishiju.sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_oper_log where oper_id in + delete from haishiju.sys_oper_log where oper_id in #{operId} @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - truncate table sys_oper_log + truncate table haishiju.sys_oper_log \ No newline at end of file diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysPostMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysPostMapper.xml index 67dbf1e..af5d20f 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark - from sys_post + from haishiju.sys_post select p.post_id - from sys_post p - left join sys_user_post up on up.post_id = p.post_id - left join sys_user u on u.user_id = up.user_id + from haishiju.sys_post p + left join haishiju.sys_user_post up on up.post_id = p.post_id + left join haishiju.sys_user u on u.user_id = up.user_id where u.user_id = #{userId} @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_post + update haishiju.sys_post post_code = #{postCode}, post_name = #{postName}, @@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_post( + insert into haishiju.sys_post( post_id, post_code, post_name, @@ -109,11 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_post where post_id = #{postId} + delete from haishiju.sys_post where post_id = #{postId} - delete from sys_post where post_id in + delete from haishiju.sys_post where post_id in #{postId} diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 9b765e9..101808b 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_role_dept where role_id=#{roleId} + delete from haishiju.sys_role_dept where role_id=#{roleId} - delete from sys_role_dept where role_id in + delete from haishiju.sys_role_dept where role_id in #{roleId} - insert into sys_role_dept(role_id, dept_id) values + insert into haishiju.sys_role_dept(role_id, dept_id) values (#{item.roleId},#{item.deptId}) diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMapper.xml index bad5c2c..ea56f77 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -24,10 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, r.status, r.del_flag, r.create_time, r.remark - from sys_role r - left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id + from haishiju.sys_role r + left join haishiju.sys_user_role ur on ur.role_id = r.role_id + left join haishiju.sys_user u on u.user_id = ur.user_id + left join haishiju.sys_dept d on u.dept_id = d.dept_id select r.role_id - from sys_role r - left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id + from haishiju.sys_role r + left join haishiju.sys_user_role ur on ur.role_id = r.role_id + left join haishiju.sys_user u on u.user_id = ur.user_id where u.user_id = #{userId} @@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_role( + insert into haishiju.sys_role( role_id, role_name, role_key, @@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_role + update haishiju.sys_role role_name = #{roleName}, role_key = #{roleKey}, @@ -139,11 +139,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_role set del_flag = '2' where role_id = #{roleId} + update haishiju.sys_role set del_flag = '2' where role_id = #{roleId} - update sys_role set del_flag = '2' where role_id in + update haishiju.sys_role set del_flag = '2' where role_id in #{roleId} diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 7c6e2fa..3485654 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_role_menu where role_id=#{roleId} + delete from haishiju.sys_role_menu where role_id=#{roleId} - delete from sys_role_menu where role_id in + delete from haishiju.sys_role_menu where role_id in #{roleId} - insert into sys_role_menu(role_id, menu_id) values + insert into haishiju.sys_role_menu(role_id, menu_id) values (#{item.roleId},#{item.menuId}) diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysUserMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysUserMapper.xml index 3d6452d..f607d5d 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -51,15 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id + from haishiju.sys_user u + left join haishiju.sys_dept d on u.dept_id = d.dept_id + left join haishiju.sys_user_role ur on u.user_id = ur.user_id + left join haishiju.sys_role r on r.role_id = ur.role_id select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id + from haishiju.sys_user u + left join haishiju.sys_dept d on u.dept_id = d.dept_id + left join haishiju.sys_user_role ur on u.user_id = ur.user_id + left join haishiju.sys_role r on r.role_id = ur.role_id where u.del_flag = '0' and r.role_id = #{roleId} AND u.user_name like concat('%', #{userName}, '%') @@ -105,12 +105,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_user( + insert into haishiju.sys_user( user_id, dept_id, user_name, @@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_user + update haishiju.sys_user dept_id = #{deptId}, nick_name = #{nickName}, @@ -198,27 +198,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId} + update haishiju.sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId} - update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId} + update haishiju.sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId} - update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId} + update haishiju.sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId} - update sys_user set pwd_update_date = sysdate(), password = #{password}, update_time = sysdate() where user_id = #{userId} + update haishiju.sys_user set pwd_update_date = sysdate(), password = #{password}, update_time = sysdate() where user_id = #{userId} - update sys_user set del_flag = '2' where user_id = #{userId} + update haishiju.sys_user set del_flag = '2' where user_id = #{userId} - update sys_user set del_flag = '2' where user_id in + update haishiju.sys_user set del_flag = '2' where user_id in #{userId} diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysUserPostMapper.xml index c3d5aae..1e3c60a 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_user_post where user_id=#{userId} + delete from haishiju.sys_user_post where user_id=#{userId} - delete from sys_user_post where user_id in + delete from haishiju.sys_user_post where user_id in #{userId} - insert into sys_user_post(user_id, post_id) values + insert into haishiju.sys_user_post(user_id, post_id) values (#{item.userId},#{item.postId}) diff --git a/smartFishingPort-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/smartFishingPort-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 6affda9..99fece9 100644 --- a/smartFishingPort-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/smartFishingPort-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -10,33 +10,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_user_role where user_id=#{userId} + delete from haishiju.sys_user_role where user_id=#{userId} - delete from sys_user_role where user_id in + delete from haishiju.sys_user_role where user_id in #{userId} - insert into sys_user_role(user_id, role_id) values + insert into haishiju.sys_user_role(user_id, role_id) values (#{item.userId},#{item.roleId}) - delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} + delete from haishiju.sys_user_role where user_id=#{userId} and role_id=#{roleId} - delete from sys_user_role where role_id=#{roleId} and user_id in + delete from haishiju.sys_user_role where role_id=#{roleId} and user_id in #{userId}