diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnLogs.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java similarity index 96% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnLogs.java rename to cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java index b5da687..43250f3 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java @@ -1,9 +1,8 @@ -package com.muyu.platform.domain; +package com.muyu.warning.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnRule.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java similarity index 95% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnRule.java rename to cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java index 9915516..7e82a98 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java @@ -1,7 +1,6 @@ -package com.muyu.platform.domain; +package com.muyu.warning.domain; import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnStrategy.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java similarity index 93% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnStrategy.java rename to cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java index 1726024..481e6fe 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java @@ -1,7 +1,6 @@ -package com.muyu.platform.domain; +package com.muyu.warning.domain; import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/wx/AccessToken.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java similarity index 88% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/wx/AccessToken.java rename to cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java index 3236fc6..f844623 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/wx/AccessToken.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java @@ -1,4 +1,4 @@ -package com.muyu.platform.domain.wx; +package com.muyu.warning.wx; import lombok.Data; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/wx/Message.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java similarity index 92% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/wx/Message.java rename to cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java index f9019a9..f17130a 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/platform/domain/wx/Message.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java @@ -1,4 +1,4 @@ -package com.muyu.platform.domain.wx; +package com.muyu.warning.wx; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/WarnApplication.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java similarity index 95% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/WarnApplication.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java index e40942f..6e3ebeb 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/WarnApplication.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java @@ -1,4 +1,4 @@ -package com.muyu.platform; +package com.muyu.warning; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnLogsController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java similarity index 88% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java index c9807ee..3ce89ca 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java @@ -1,4 +1,4 @@ -package com.muyu.platform.controller; +package com.muyu.warning.controller; import java.util.Arrays; import java.util.List; @@ -13,12 +13,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.platform.domain.WarnLogs; -import com.muyu.platform.service.IWarnLogsService; +import com.muyu.warning.domain.WarnLogs; +import com.muyu.warning.service.IWarnLogsService; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; import org.springframework.validation.annotation.Validated; import com.muyu.common.core.web.page.TableDataInfo; @@ -38,7 +37,7 @@ public class WarnLogsController extends BaseController /** * 查询预警日志列表 */ - @RequiresPermissions("platform:logs:list") + @RequiresPermissions("warning:logs:list") @GetMapping("/list") public Result> list(WarnLogs warnLogs) { @@ -50,7 +49,7 @@ public class WarnLogsController extends BaseController /** * 导出预警日志列表 */ - @RequiresPermissions("platform:logs:export") + @RequiresPermissions("warning:logs:export") @PostMapping("/export") public void export(HttpServletResponse response, WarnLogs warnLogs) { @@ -62,7 +61,7 @@ public class WarnLogsController extends BaseController /** * 获取预警日志详细信息 */ - @RequiresPermissions("platform:logs:query") + @RequiresPermissions("warning:logs:query") @GetMapping(value = "/{id}") public Result> getInfo(@PathVariable("id") Long id) { @@ -72,7 +71,7 @@ public class WarnLogsController extends BaseController /** * 新增预警日志 */ - @RequiresPermissions("platform:logs:add") + @RequiresPermissions("warning:logs:add") @PostMapping public Result add( @Validated @RequestBody WarnLogs warnLogs) @@ -86,7 +85,7 @@ public class WarnLogsController extends BaseController /** * 修改预警日志 */ - @RequiresPermissions("platform:logs:edit") + @RequiresPermissions("warning:logs:edit") @PutMapping public Result edit( @Validated @RequestBody WarnLogs warnLogs) @@ -100,7 +99,7 @@ public class WarnLogsController extends BaseController /** * 删除预警日志 */ - @RequiresPermissions("platform:logs:remove") + @RequiresPermissions("warning:logs:remove") @DeleteMapping("/{ids}") public Result remove(@PathVariable("ids") Long[] ids) { diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnRuleController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java similarity index 86% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java index 9ae401b..35253eb 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java @@ -1,4 +1,4 @@ -package com.muyu.platform.controller; +package com.muyu.warning.controller; import java.util.Arrays; import java.util.List; @@ -13,12 +13,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.platform.domain.WarnRule; -import com.muyu.platform.service.IWarnRuleService; +import com.muyu.warning.domain.WarnRule; +import com.muyu.warning.service.IWarnRuleService; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; import org.springframework.validation.annotation.Validated; import com.muyu.common.core.web.page.TableDataInfo; @@ -38,7 +37,7 @@ public class WarnRuleController extends BaseController /** * 查询预警规则列表 */ - @RequiresPermissions("platform:rule:list") + @RequiresPermissions("warning:list") @GetMapping("/list") public Result> list(WarnRule warnRule) { @@ -50,7 +49,7 @@ public class WarnRuleController extends BaseController /** * 导出预警规则列表 */ - @RequiresPermissions("platform:rule:export") + @RequiresPermissions("warning:export") @PostMapping("/export") public void export(HttpServletResponse response, WarnRule warnRule) { @@ -62,7 +61,7 @@ public class WarnRuleController extends BaseController /** * 获取预警规则详细信息 */ - @RequiresPermissions("platform:rule:query") + @RequiresPermissions("warning:query") @GetMapping(value = "/{id}") public Result> getInfo(@PathVariable("id") Long id) { @@ -72,7 +71,7 @@ public class WarnRuleController extends BaseController /** * 新增预警规则 */ - @RequiresPermissions("platform:rule:add") + @RequiresPermissions("warning:add") @PostMapping public Result add( @Validated @RequestBody WarnRule warnRule) @@ -86,7 +85,7 @@ public class WarnRuleController extends BaseController /** * 修改预警规则 */ - @RequiresPermissions("platform:rule:edit") + @RequiresPermissions("warning:edit") @PutMapping public Result edit( @Validated @RequestBody WarnRule warnRule) @@ -100,11 +99,12 @@ public class WarnRuleController extends BaseController /** * 删除预警规则 */ - @RequiresPermissions("platform:rule:remove") + @RequiresPermissions("warning:remove") @DeleteMapping("/{ids}") public Result remove(@PathVariable("ids") Long[] ids) { warnRuleService.removeBatchByIds(Arrays.asList(ids)); return success(); } + } diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java similarity index 86% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java index 4a7c769..9c29b1a 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java @@ -1,4 +1,4 @@ -package com.muyu.platform.controller; +package com.muyu.warning.controller; import java.util.Arrays; import java.util.List; @@ -13,12 +13,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.platform.domain.WarnStrategy; -import com.muyu.platform.service.IWarnStrategyService; +import com.muyu.warning.domain.WarnStrategy; +import com.muyu.warning.service.IWarnStrategyService; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; import org.springframework.validation.annotation.Validated; import com.muyu.common.core.web.page.TableDataInfo; @@ -38,7 +37,7 @@ public class WarnStrategyController extends BaseController /** * 查询预警策略列表 */ - @RequiresPermissions("platform:strategy:list") + @RequiresPermissions("warning:strategy:list") @GetMapping("/list") public Result> list(WarnStrategy warnStrategy) { @@ -50,7 +49,7 @@ public class WarnStrategyController extends BaseController /** * 导出预警策略列表 */ - @RequiresPermissions("platform:strategy:export") + @RequiresPermissions("warning:strategy:export") @PostMapping("/export") public void export(HttpServletResponse response, WarnStrategy warnStrategy) { @@ -62,7 +61,7 @@ public class WarnStrategyController extends BaseController /** * 获取预警策略详细信息 */ - @RequiresPermissions("platform:strategy:query") + @RequiresPermissions("warning:strategy:query") @GetMapping(value = "/{id}") public Result> getInfo(@PathVariable("id") Long id) { @@ -72,7 +71,7 @@ public class WarnStrategyController extends BaseController /** * 新增预警策略 */ - @RequiresPermissions("platform:strategy:add") + @RequiresPermissions("warning:strategy:add") @PostMapping public Result add( @Validated @RequestBody WarnStrategy warnStrategy) @@ -86,7 +85,7 @@ public class WarnStrategyController extends BaseController /** * 修改预警策略 */ - @RequiresPermissions("platform:strategy:edit") + @RequiresPermissions("warning:strategy:edit") @PutMapping public Result edit( @Validated @RequestBody WarnStrategy warnStrategy) @@ -100,7 +99,7 @@ public class WarnStrategyController extends BaseController /** * 删除预警策略 */ - @RequiresPermissions("platform:strategy:remove") + @RequiresPermissions("warning:strategy:remove") @DeleteMapping("/{ids}") public Result remove(@PathVariable("ids") Long[] ids) { diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WxTestController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java similarity index 96% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WxTestController.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java index c7b15ee..b512b94 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/controller/WxTestController.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java @@ -1,10 +1,10 @@ -package com.muyu.platform.controller; +package com.muyu.warning.controller; -import com.muyu.platform.domain.wx.Message; -import com.muyu.platform.message.Article; -import com.muyu.platform.message.NewMessage; -import com.muyu.platform.util.TokenUtil; +import com.muyu.warning.wx.Message; +import com.muyu.warning.message.Article; +import com.muyu.warning.message.NewMessage; +import com.muyu.warning.util.TokenUtil; import com.thoughtworks.xstream.XStream; import io.micrometer.common.util.StringUtils; import jakarta.servlet.ServletInputStream; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java similarity index 71% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java index 69e67b3..166720f 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnLogsMapper.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java @@ -1,7 +1,6 @@ -package com.muyu.platform.mapper; +package com.muyu.warning.mapper; -import java.util.List; -import com.muyu.platform.domain.WarnLogs; +import com.muyu.warning.domain.WarnLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java similarity index 71% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java index a16dfcd..58b7caf 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java @@ -1,7 +1,6 @@ -package com.muyu.platform.mapper; +package com.muyu.warning.mapper; -import java.util.List; -import com.muyu.platform.domain.WarnRule; +import com.muyu.warning.domain.WarnRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java similarity index 71% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java index 4d9397e..e9bd988 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java @@ -1,7 +1,6 @@ -package com.muyu.platform.mapper; +package com.muyu.warning.mapper; -import java.util.List; -import com.muyu.platform.domain.WarnStrategy; +import com.muyu.warning.domain.WarnStrategy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/message/Article.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java similarity index 94% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/message/Article.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java index 7f0b9b5..9c195ce 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/message/Article.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java @@ -1,4 +1,4 @@ -package com.muyu.platform.message; +package com.muyu.warning.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/message/NewMessage.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java similarity index 95% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/message/NewMessage.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java index 17630d2..a8b5dbf 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/message/NewMessage.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java @@ -1,4 +1,4 @@ -package com.muyu.platform.message; +package com.muyu.warning.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnLogsService.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java similarity index 90% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java index 2b90b3e..1f61aa4 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnLogsService.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java @@ -1,7 +1,7 @@ -package com.muyu.platform.service; +package com.muyu.warning.service; import java.util.List; -import com.muyu.platform.domain.WarnLogs; +import com.muyu.warning.domain.WarnLogs; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnRuleService.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java similarity index 90% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java index cf3aedc..fa61ff5 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java @@ -1,7 +1,7 @@ -package com.muyu.platform.service; +package com.muyu.warning.service; import java.util.List; -import com.muyu.platform.domain.WarnRule; +import com.muyu.warning.domain.WarnRule; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java similarity index 90% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnStrategyService.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java index d83376b..d3fec08 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/IWarnStrategyService.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java @@ -1,7 +1,7 @@ -package com.muyu.platform.service; +package com.muyu.warning.service; import java.util.List; -import com.muyu.platform.domain.WarnStrategy; +import com.muyu.warning.domain.WarnStrategy; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java similarity index 94% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java index 32fc441..2e25a7b 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnLogsServiceImpl.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.platform.service.impl; +package com.muyu.warning.service.impl; import java.util.List; import org.springframework.stereotype.Service; -import com.muyu.platform.mapper.WarnLogsMapper; -import com.muyu.platform.domain.WarnLogs; -import com.muyu.platform.service.IWarnLogsService; +import com.muyu.warning.mapper.WarnLogsMapper; +import com.muyu.warning.domain.WarnLogs; +import com.muyu.warning.service.IWarnLogsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java similarity index 93% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnRuleServiceImpl.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java index fddf687..1e16c8f 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.platform.service.impl; +package com.muyu.warning.service.impl; import java.util.List; -import com.muyu.platform.mapper.WarnRuleMapper; +import com.muyu.warning.mapper.WarnRuleMapper; import org.springframework.stereotype.Service; -import com.muyu.platform.domain.WarnRule; -import com.muyu.platform.service.IWarnRuleService; +import com.muyu.warning.domain.WarnRule; +import com.muyu.warning.service.IWarnRuleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java similarity index 91% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java index 738bb3f..505a01e 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.platform.service.impl; +package com.muyu.warning.service.impl; import java.util.List; import org.springframework.stereotype.Service; -import com.muyu.platform.mapper.WarnStrategyMapper; -import com.muyu.platform.domain.WarnStrategy; -import com.muyu.platform.service.IWarnStrategyService; +import com.muyu.warning.mapper.WarnStrategyMapper; +import com.muyu.warning.domain.WarnStrategy; +import com.muyu.warning.service.IWarnStrategyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/util/OkHttpUtils.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java similarity index 97% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/util/OkHttpUtils.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java index d684491..fc33154 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/util/OkHttpUtils.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java @@ -1,4 +1,4 @@ -package com.muyu.platform.util; +package com.muyu.warning.util; import okhttp3.*; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/util/TokenUtil.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java similarity index 93% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/util/TokenUtil.java rename to cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java index ddf7109..5587e4b 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/platform/util/TokenUtil.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java @@ -1,7 +1,7 @@ -package com.muyu.platform.util; +package com.muyu.warning.util; import com.alibaba.fastjson2.JSON; -import com.muyu.platform.domain.wx.AccessToken; +import com.muyu.warning.wx.AccessToken; import org.springframework.stereotype.Component; /** diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml index ec2bd4d..6d23e91 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into warn_logs @@ -88,9 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from warn_logs where id in + delete from warn_logs where id in #{id} - \ No newline at end of file + diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml index 39e0ea9..290906f 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into warn_rule @@ -78,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from warn_rule where id in + delete from warn_rule where id in #{id} - \ No newline at end of file + diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml index ef7feb6..6959c4a 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -17,18 +17,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into warn_strategy @@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from warn_strategy where id in + delete from warn_strategy where id in #{id} - \ No newline at end of file +