From 0160da832249cce2de64d4be75eedf53725bfb7d Mon Sep 17 00:00:00 2001 From: Wang YiHang <3060234389@qq.com> Date: Sun, 6 Oct 2024 11:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B7=BB=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=EF=BC=8C=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/system/domain/SysEnt.java | 1 + .../common/system/domain/SysFirmUser.java | 1 + .../muyu/common/system/domain/SysMember.java | 31 ++++++ .../cloud-modules-openbusiness-server/pom.xml | 10 +- .../CloudOpenBusinessApplication.java | 18 ++- .../controller/SysCarMessageController.java | 6 + .../controller/SysUserController.java | 10 +- .../muyu/openbusiness/feign/SystemFeign.java | 11 ++ .../openbusiness}/mapper/SysUserMapper.java | 4 +- .../mapper/SysUserPostMapper.java | 2 +- .../mapper/SysUserRoleMapper.java | 2 +- .../openbusiness}/service/SysUserService.java | 2 +- .../impl/SysCarMessageServiceImpl.java | 3 +- .../service/impl/SysUserServiceImpl.java | 20 ++-- .../mapper/openbusiness}/SysUserMapper.xml | 2 +- .../openbusiness}/SysUserPostMapper.xml | 2 +- .../openbusiness}/SysUserRoleMapper.xml | 2 +- .../cloud-modules-system-saas/pom.xml | 104 ------------------ .../saas/CloudSystemSaasApplication.java | 32 ------ .../src/main/resources/banner.txt | 2 - .../src/main/resources/bootstrap.yml | 59 ---------- .../src/main/resources/logback/dev.xml | 74 ------------- .../src/main/resources/logback/prod.xml | 81 -------------- .../src/main/resources/logback/test.xml | 81 -------------- .../system/controller/SysFirmController.java | 2 +- .../controller/SysMemberController.java | 28 +++++ .../java/com/muyu/system/domain/SysFirm.java | 4 + .../muyu/system/mapper/SysMemberMapper.java | 7 ++ .../muyu/system/service/SysMemberService.java | 10 ++ .../service/impl/SysMemberServiceImpl.java | 27 +++++ cloud-modules/pom.xml | 1 - 31 files changed, 174 insertions(+), 465 deletions(-) create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/SysUserController.java (97%) create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysUserMapper.java (93%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysUserPostMapper.java (96%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysUserRoleMapper.java (97%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/SysUserService.java (95%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/SysUserServiceImpl.java (92%) rename cloud-modules/{cloud-modules-system-saas/src/main/resources/mapper/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysUserMapper.xml (98%) rename cloud-modules/{cloud-modules-system-saas/src/main/resources/mapper/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysUserPostMapper.xml (94%) rename cloud-modules/{cloud-modules-system-saas/src/main/resources/mapper/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysUserRoleMapper.xml (96%) delete mode 100644 cloud-modules/cloud-modules-system-saas/pom.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java index 0c145d5..87dab28 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java @@ -34,4 +34,5 @@ public class SysEnt { private String userName; private String password; + } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java index 0bba83a..d99cd55 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java @@ -22,4 +22,5 @@ public class SysFirmUser extends SysUser { * 用户数据库 */ private String databaseName; + } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java new file mode 100644 index 0000000..4d79d28 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java @@ -0,0 +1,31 @@ +package com.muyu.common.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import lombok.*; +import lombok.experimental.SuperBuilder; + +/** + * 会员表(SysMember)实体类 + * + */ +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_member") +public class SysMember { + @TableId(type = IdType.AUTO) + private Long memberId; + @Excel(name = "会员等级") + private String memberName; + @Excel(name = "可添加车辆数量") + private Integer memberCarNum; + @Excel(name = "可添加报文模板数量") + private Integer memberCarType; +} + diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml index c73651d..d7b03d3 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml @@ -18,7 +18,6 @@ - com.alibaba.cloud @@ -102,6 +101,15 @@ compile + + com.muyu + cloud-common-saas + + + + com.muyu + cloud-common-system + diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java index 4cab1e8..4aeb9d4 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java @@ -1,9 +1,13 @@ package com.muyu.openbusiness; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * 系统模块 @@ -11,11 +15,17 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author muyu */ @EnableCustomConfig -//@EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication +@SpringBootApplication( + exclude = { + DataSourceAutoConfiguration.class, + DruidDataSourceAutoConfigure.class, + DynamicDataSourceAutoConfiguration.class + } +) public class CloudOpenBusinessApplication { - public static void main (String[] args) { - SpringApplication.run(CloudOpenBusinessApplication.class, args); + public static void main(String[] args) { + SpringApplication.run(CloudOpenBusinessApplication.class, args); + System.out.println("CloudSystemSaas 模块启动成功!"); } } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java index 3a52354..e796a4a 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java @@ -1,5 +1,6 @@ package com.muyu.openbusiness.controller; +import com.muyu.common.system.domain.SysUser; import com.muyu.openbusiness.domain.SysCarMessage; import com.muyu.openbusiness.service.ISysCarMessageService; @@ -32,6 +33,8 @@ public class SysCarMessageController extends BaseController { @Resource private ISysCarMessageService sysCarMessageService; +// @Autowired +// private SystemFeign feign; @Autowired private HttpSession session; @@ -90,6 +93,8 @@ public class SysCarMessageController extends BaseController @GetMapping("/list") public Result> list(SysCarMessage sysCarMessage) { +// Result info = feign.getInfo(); +// SysUser sysUser = (SysUser) info.getData(); List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); session.setAttribute("list", list); return Result.success(list); @@ -125,6 +130,7 @@ public class SysCarMessageController extends BaseController public Result add( @Validated @RequestBody SysCarMessage sysCarMessage) { + if (sysCarMessageService.checkIdUnique(sysCarMessage)) { return error("新增 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录已存在"); } diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java similarity index 97% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java index 4cdbdc7..f34422a 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.controller; +package com.muyu.openbusiness.controller; import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.common.core.domain.Result; @@ -13,14 +13,14 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.system.saas.service.SysUserService; - -import javax.annotation.Resource; +import com.muyu.openbusiness.service.SysUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; /** diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java new file mode 100644 index 0000000..72b89d6 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java @@ -0,0 +1,11 @@ +//package com.muyu.openbusiness.feign; +// +//import com.muyu.common.core.domain.Result; +//import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; +//import org.springframework.cloud.openfeign.FeignClient; +//import org.springframework.web.bind.annotation.GetMapping; +//@FeignClient(name = "cloud-system",fallbackFactory = RemoteUserFallbackFactory.class) +//public interface SystemFeign { +// @GetMapping("/user/getInfo") +// public Result getInfo (); +//} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java similarity index 93% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java index 62c3965..235d8d5 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java @@ -1,10 +1,10 @@ -package com.muyu.system.saas.mapper; +package com.muyu.openbusiness.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Author: 胡杨 diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java similarity index 96% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java index 806f76d..f2a9e01 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.mapper; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUserPost; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java similarity index 97% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java index d5c8072..5b3aa11 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.mapper; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUserRole; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java similarity index 95% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java index 4ee3d58..1eb66cf 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java index ed27d9e..8739004 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java @@ -67,7 +67,8 @@ public class SysCarMessageServiceImpl @Override public Boolean checkIdUnique(SysCarMessage sysCarMessage) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarMessage::getId, sysCarMessage.getId()); + queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode()) + .eq(SysCarMessage::getMessageTypeCode, sysCarMessage.getMessageTypeCode()); return this.count(queryWrapper) > 0; } diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java similarity index 92% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java index a53838a..e5ac185 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java @@ -1,25 +1,23 @@ -package com.muyu.system.saas.service.impl; +package com.muyu.openbusiness.service.impl; -import javax.annotation.Resource; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.muyu.common.core.constant.UserConstants; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.SysUserPost; import com.muyu.common.system.domain.SysUserRole; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.system.saas.mapper.SysUserPostMapper; -import com.muyu.system.saas.mapper.SysUserRoleMapper; + +import com.muyu.openbusiness.mapper.SysUserMapper; +import com.muyu.openbusiness.mapper.SysUserPostMapper; +import com.muyu.openbusiness.mapper.SysUserRoleMapper; +import com.muyu.openbusiness.service.SysUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; -import lombok.extern.slf4j.Slf4j; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.system.saas.mapper.SysUserMapper; -import com.muyu.system.saas.service.SysUserService; -import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml similarity index 98% rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml index 4a480ae..7bbe181 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml similarity index 94% rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml index f6bf547..b81edfe 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml similarity index 96% rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml index b352741..69d20fb 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-system-saas/pom.xml b/cloud-modules/cloud-modules-system-saas/pom.xml deleted file mode 100644 index b9983d0..0000000 --- a/cloud-modules/cloud-modules-system-saas/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-system-saas - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-common-saas - - - - com.muyu - cloud-common-system - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java deleted file mode 100644 index 95d43df..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.system.saas; - -import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * @Author: 胡杨 - * @Name: CloudSystemSaas - * @Description: SaaS系统驱动器 - * @CreatedDate: 2024/9/22 上午10:05 - * @FilePath: com.muyu.system.saas - */ -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication( - exclude = { - DataSourceAutoConfiguration.class, - DruidDataSourceAutoConfigure.class, - DynamicDataSourceAutoConfiguration.class - } -) -public class CloudSystemSaasApplication { - public static void main(String[] args) { - SpringApplication.run(CloudSystemSaasApplication.class, args); - System.out.println("CloudSystemSaas 模块启动成功!"); - } -} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt b/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml deleted file mode 100644 index 3504989..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,59 +0,0 @@ -# Tomcat -server: - port: 9704 - -# nacos线上地址 -nacos: - addr: 49.235.136.60:8848 - user-name: nacos - password: nacos - namespace: wyh -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-system-saas - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 -# username: ${nacos.user-name} -# # nacos密码 -# password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 -# username: ${nacos.user-name} -# # nacos密码 -# password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml deleted file mode 100644 index 44768a1..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml deleted file mode 100644 index 727021d..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml deleted file mode 100644 index 727021d..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java index 2dc61ba..11a1744 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java @@ -194,7 +194,7 @@ public class SysFirmController extends BaseController sysEnt.setPort(3306); sysEntService.save(sysEnt); - + sysFirm.setMemberId(1L); return toAjax(sysFirmService.save((SysFirm) sysFirm)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java new file mode 100644 index 0000000..2bd5c2c --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java @@ -0,0 +1,28 @@ +package com.muyu.system.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysMember; +import com.muyu.system.service.SysMemberService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +/* +会员等级 + */ +@RestController +@RequestMapping("/member") +public class SysMemberController { + @Resource + private SysMemberService service; + + /** + * 查询会员等级列表 + */ + @GetMapping("/list") + private Result> selectList(SysMember member) { + return Result.success(service.selectSysMemberList(member)); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java index bc5698b..204f886 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java @@ -51,6 +51,9 @@ public class SysFirm extends BaseEntity{ @Excel(name = "启用状态(1.开业 2.停业 3.休业)") private String state; + @Excel(name = "会员等级") + private Long memberId; + @Override @@ -67,6 +70,7 @@ public class SysFirm extends BaseEntity{ .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) + .append("memberId", getMemberId()) .toString(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java new file mode 100644 index 0000000..965670d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java @@ -0,0 +1,7 @@ +package com.muyu.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.common.system.domain.SysMember; + +public interface SysMemberMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java new file mode 100644 index 0000000..2c52ddb --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java @@ -0,0 +1,10 @@ +package com.muyu.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.system.domain.SysMember; + +import java.util.List; + +public interface SysMemberService extends IService { + public List selectSysMemberList(SysMember sysMember); +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java new file mode 100644 index 0000000..a43ec93 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java @@ -0,0 +1,27 @@ +package com.muyu.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.system.domain.SysMember; +import com.muyu.system.mapper.SysMemberMapper; +import com.muyu.system.service.SysMemberService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SysMemberServiceImpl extends + ServiceImpl + implements SysMemberService { + + + @Override + public List selectSysMemberList(SysMember sysMember) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if(sysMember.getMemberId()!=null){ + queryWrapper.eq(SysMember::getMemberId, sysMember.getMemberId()); + } + return this.list(queryWrapper); + } +} diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 6f39aa8..34653b3 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -12,7 +12,6 @@ cloud-modules-system cloud-modules-gen cloud-modules-file - cloud-modules-system-saas cloud-modules-openbusiness