diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirm.java similarity index 98% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java rename to cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirm.java index 204f886..d00124b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirm.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.common.system.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index 4bf1629..908a71c 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -122,5 +122,6 @@ public interface RemoteUserService { @PostMapping("/user") public Result addUser (@RequestBody SysUser user); - + @GetMapping("/member/memberId/{firmCode}") + public Result selectSysMemberListById(@PathVariable("firmCode") String firmCode); } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 69fff6f..5bffd3c 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -93,7 +93,10 @@ public class RemoteUserFallbackFactory implements FallbackFactory selectSysMemberListById(String firmCode) { + return Result.error(); + } }; } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java index bcc2ae2..7d15508 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java @@ -1,5 +1,8 @@ package com.muyu.openbusiness.controller; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysMember; +import com.muyu.common.system.remote.RemoteUserService; import com.muyu.openbusiness.domain.SysCar; import com.muyu.openbusiness.service.ISysCarService; import com.muyu.common.core.domain.Result; @@ -12,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -32,6 +36,8 @@ public class SysCarController extends BaseController { @Autowired private ISysCarService sysCarService; + @Resource + private RemoteUserService remoteUserService; /** @@ -46,6 +52,12 @@ public class SysCarController extends BaseController return getDataTable(list); } + public List sysCarList() + { + List list = sysCarService.selectSysCarList(new SysCar()); + return list; + } + /** * 导出车辆基础信息列表 */ @@ -76,6 +88,13 @@ public class SysCarController extends BaseController public Result add( @Validated @RequestBody SysCar sysCar) { + String saasKey = SecurityUtils.getSaasKey(); + Result sysMemberResult = remoteUserService.selectSysMemberListById(saasKey); + SysMember sysMember = sysMemberResult.getData(); + List list = this.sysCarList(); + if(list.size()>=sysMember.getMemberCarNum()){ + return Result.error("已达到当前会员等级可添加上限，请联系管理员升级会员等级"); + } // 获取当前时间（没有时区） LocalDateTime now = LocalDateTime.now(); // 假设我们使用系统默认时区 @@ -113,7 +132,7 @@ public class SysCarController extends BaseController * 删除车辆基础信息 */ @RequiresPermissions("car:car:remove") - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public Result remove(@PathVariable("ids") Long[] ids) { sysCarService.removeBatchByIds(Arrays.asList(ids)); 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 e796a4a..39c9e1a 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 @@ -40,7 +40,6 @@ public class SysCarMessageController extends BaseController static String TEST = "7E 56 45 48 49 43 4C 45 5F 4D 53 47 3A 56 49 4E 31 32 B6 A1 C0 F2 B3 E5 D9 A8 C1 B2 E3 F4 A6 D7 C9 F1 E0 A3 B5 C8 D4 E2 A1 F5 B6 C7 E8 D9 A0 E3 B2 C4 F5 D6 A8 C0 E1 F2 B7 D8 A4 E3 C2 B1 A5 D9 F6 C8 E7 A0 B2 C3 D1 F4 E5 A9 3F 2A 7B D9 1E C8 4D A3 6F 5B 9A 0C 3E 7D F2 8B 46 1A 5E 9F 2D 73 8C 4A B1 6C 5D E2 7E C4 39 0B AD 7C 1F 0E 3C 68 92 B4 5A 7F 6E 81 0D 4B A5 E3 F9 2E 8A 37 6D 14 5C 73 8E D2 04 9B 3A 6C F1 70 BF 29 5F 8C 43 61 24 5D 7A 9C 0A D5 1B 3D 6E F4 78 3E 5B"; - @RequiresPermissions("message:message:test") @GetMapping("/test") public Result test() throws InterruptedException, ExecutionException { List list = (List) session.getAttribute("list"); diff --git a/cloud-modules/cloud-modules-parsing/pom.xml b/cloud-modules/cloud-modules-parsing/pom.xml index 8324a5b..d9bf53c 100644 --- a/cloud-modules/cloud-modules-parsing/pom.xml +++ b/cloud-modules/cloud-modules-parsing/pom.xml @@ -101,6 +101,12 @@ org.eclipse.paho.client.mqttv3 1.2.2 + + com.muyu + cloud-modules-car-gateway + 3.6.3 + compile + 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 ef6b67b..860ec72 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 @@ -9,10 +9,8 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysEnt; -import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; -import com.muyu.system.domain.SysFirm; -import com.muyu.system.domain.SysMenu; +import com.muyu.common.system.domain.SysFirm; import com.muyu.system.domain.req.SysFirmReq; import com.muyu.system.service.ISysFirmService; import com.muyu.system.service.SysEntService; @@ -32,7 +30,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.List; -import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -51,10 +48,6 @@ public class SysFirmController extends BaseController @Resource private SysEntService sysEntService; @Resource - private SysRoleController sysRoleController; - @Resource - private SysMenuController sysMenuController; - @Resource private SysUserController sysUserController; @Resource private SysDeptController sysDeptController; @@ -91,11 +84,10 @@ public class SysFirmController extends BaseController /** * 获取企业基础信息详细信息 */ - @RequiresPermissions("firm:firmInfo:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) + + public Result getInfo(@PathVariable("firmCode") String firmCode) { - return success(sysFirmService.selectSysFirmById(id)); + return success(sysFirmService.selectSysFirmById(firmCode)); } /** 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 index 2bd5c2c..1dc1792 100644 --- 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 @@ -1,15 +1,15 @@ package com.muyu.system.controller; import com.muyu.common.core.domain.Result; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysFirm; 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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; -/* +/** 会员等级 */ @RestController @@ -17,12 +17,21 @@ import java.util.List; public class SysMemberController { @Resource private SysMemberService service; + @Resource + private SysFirmController firmController; /** * 查询会员等级列表 */ @GetMapping("/list") - private Result> selectList(SysMember member) { + public Result> selectList(SysMember member) { return Result.success(service.selectSysMemberList(member)); } + + @GetMapping("/memberId/{firmCode}") + public Result selectSysMemberListById(@PathVariable("firmCode") String firmCode) { + Result info = firmController.getInfo(firmCode); + SysFirm sysFirm = info.getData(); + return Result.success(service.selectSysMemberListById(sysFirm.getMemberId())); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java index 0912f00..230cdc0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java @@ -1,7 +1,7 @@ package com.muyu.system.domain.req; import com.muyu.common.core.annotation.Excel; -import com.muyu.system.domain.SysFirm; +import com.muyu.common.system.domain.SysFirm; import jakarta.validation.constraints.NotBlank; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysFirmMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysFirmMapper.java index a343b5b..4666abe 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysFirmMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysFirmMapper.java @@ -1,7 +1,7 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysFirm; +import com.muyu.common.system.domain.SysFirm; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/ISysFirmService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/ISysFirmService.java index 728ad11..20b0dd8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/ISysFirmService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/ISysFirmService.java @@ -1,7 +1,7 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.system.domain.SysFirm; +import com.muyu.common.system.domain.SysFirm; import java.util.List; @@ -15,10 +15,10 @@ public interface ISysFirmService extends IService { /** * 精确查询企业基础信息 * - * @param id 企业基础信息主键 + * @param firmCode 企业基础信息主键 * @return 企业基础信息 */ - public SysFirm selectSysFirmById(Long id); + public SysFirm selectSysFirmById(String firmCode); /** * 查询企业基础信息列表 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 index 2c52ddb..c11795c 100644 --- 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 @@ -7,4 +7,5 @@ import java.util.List; public interface SysMemberService extends IService { public List selectSysMemberList(SysMember sysMember); + public SysMember selectSysMemberListById(Long memberId); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java index 5e5ffcd..2f4f40b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java @@ -3,12 +3,11 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.util.StringUtil; -import com.muyu.system.domain.SysFirm; +import com.muyu.common.system.domain.SysFirm; import com.muyu.system.mapper.SysFirmMapper; import com.muyu.system.service.ISysFirmService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; -import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.util.List; @@ -30,15 +29,15 @@ public class SysFirmServiceImpl /** * 精确查询企业基础信息 * - * @param id 企业基础信息主键 + * @param firmCode 企业基础信息主键 * @return 企业基础信息 */ @Override - public SysFirm selectSysFirmById(Long id) + public SysFirm selectSysFirmById(String firmCode) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(SysFirm::getId, id); + Assert.notNull(firmCode, "firmCode不可为空"); + queryWrapper.eq(SysFirm::getFirmCode, firmCode); return this.getOne(queryWrapper); } 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 index a43ec93..9dac1c0 100644 --- 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 @@ -24,4 +24,13 @@ public class SysMemberServiceImpl extends } return this.list(queryWrapper); } + + @Override + public SysMember selectSysMemberListById(Long memberId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if(memberId!=null){ + queryWrapper.eq(SysMember::getMemberId, memberId); + } + return this.getOne(queryWrapper); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml index 25c02a3..3c25204 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, firm_credit_code, firm_code, firm_name, firm_logs , state, create_by, create_time, update_by, update_time, remark from sys_firm - and firm_name like concat('%', #{firmName}, '%') @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_firm firm_credit_code, @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_firm firm_credit_code = #{firmCreditCode},