From b80d833beab2b1b929ae7fd00c29a642771f2edc Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Fri, 7 Jun 2024 22:10:43 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E8=BF=90=E8=90=A5=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=86=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/core/domain/Result.java | 5 +- .../controller/VehicleController.java | 12 +- muyu-modules/muyu-many-datasource/pom.xml | 113 ------------------ .../MuYuManyDataSourceApplication.java | 27 ----- .../controller/VehicleController.java | 30 ----- .../muyu/many/datasource/domain/Vehicle.java | 93 -------------- .../many/datasource/mapper/VehicleMapper.java | 14 --- .../src/main/resources/banner.txt | 2 - .../src/main/resources/bootstrap.yml | 30 ----- .../src/main/resources/logback.xml | 74 ------------ .../com/muyu/net/working/feign/DeptFeign.java | 29 ----- .../com/muyu/net/working/feign/UserFeign.java | 24 ---- ...ot.autoconfigure.AutoConfiguration.imports | 0 .../muyu-net-working-server/pom.xml | 5 + .../controller/EnterpriseController.java | 76 ++++++++++-- .../system/controller/SysDeptController.java | 6 + .../com/muyu/system/mapper/SysDeptMapper.java | 2 + .../system/remote/RemoteSysDeptService.java | 32 +++++ .../system/remote/RemoteSysUserService.java | 34 ++++++ .../remote/factory/RemoteSysDeptFactory.java | 42 +++++++ .../remote/factory/RemoteSysUserFactory.java | 31 +++++ .../muyu/system/service/SysDeptService.java | 2 + .../service/impl/SysDeptServiceImpl.java | 5 + .../service/impl/SysUserServiceImpl.java | 5 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../resources/mapper/system/SysDeptMapper.xml | 3 + muyu-modules/pom.xml | 1 - 27 files changed, 243 insertions(+), 456 deletions(-) delete mode 100644 muyu-modules/muyu-many-datasource/pom.xml delete mode 100644 muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/MuYuManyDataSourceApplication.java delete mode 100644 muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java delete mode 100644 muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/domain/Vehicle.java delete mode 100644 muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/mapper/VehicleMapper.java delete mode 100644 muyu-modules/muyu-many-datasource/src/main/resources/banner.txt delete mode 100644 muyu-modules/muyu-many-datasource/src/main/resources/bootstrap.yml delete mode 100644 muyu-modules/muyu-many-datasource/src/main/resources/logback.xml delete mode 100644 muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java delete mode 100644 muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysDeptFactory.java create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysUserFactory.java create mode 100644 muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java index 70faa40..89fa990 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java @@ -39,6 +39,10 @@ public class Result implements Serializable { private T data; + public static Result buildCode(int code, String msg, T data){ + return restResult(data, code, msg); + } + public static Result success () { return restResult(null, SUCCESS, null); } @@ -50,7 +54,6 @@ public class Result implements Serializable { public static Result success (T data, String msg) { return restResult(data, SUCCESS, msg); } - public static Result error () { return restResult(null, FAIL, null); } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java index f78c568..0fbd1e2 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java @@ -111,11 +111,11 @@ public class VehicleController extends BaseController { return toAjax(vehicleService.removeBatchByIds(ids)); } - @Autowired - private VehicleMapper vehicleMapper; +// @Autowired +// private VehicleMapper vehicleMapper; - @GetMapping("/list/all") - public Result> findAll () { - return Result.success(vehicleMapper.selectList(new QueryWrapper<>())); - } +// @GetMapping("/list/all") +// public Result> findAll () { +// return Result.success(vehicleMapper.selectList(new QueryWrapper<>())); +// } } diff --git a/muyu-modules/muyu-many-datasource/pom.xml b/muyu-modules/muyu-many-datasource/pom.xml deleted file mode 100644 index f2f6dee..0000000 --- a/muyu-modules/muyu-many-datasource/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu-modules - 3.6.3 - - - muyu-many-datasource - - 动态多数据源 - - - 17 - 17 - UTF-8 - - - - - - - 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 - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - muyu-common-datasource - - - - - com.muyu - muyu-common-datascope - - - - - com.muyu - muyu-common-log - - - - - com.muyu - muyu-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - - diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/MuYuManyDataSourceApplication.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/MuYuManyDataSourceApplication.java deleted file mode 100644 index 2116c96..0000000 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/MuYuManyDataSourceApplication.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.many.datasource; - -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * 多数据源启动类 CloudManyDataSourceApplication - * - * @author DeKangLiu - * Date 2024/6/3 18:51 - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication(exclude = - {DynamicDataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class} -) -public class MuYuManyDataSourceApplication { - public static void main (String[] args) { - SpringApplication.run(MuYuManyDataSourceApplication.class, args); - } -} diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java deleted file mode 100644 index 0d36b25..0000000 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.muyu.many.datasource.controller; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.muyu.common.core.domain.Result; -import com.muyu.many.datasource.domain.Vehicle; -import com.muyu.many.datasource.mapper.VehicleMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 车辆控制层 VehicleController - * - * @author DeKangLiu - * Date 2024/6/4 14:08 - */ -@RestController -@RequestMapping("/vehicle") -public class VehicleController { - @Autowired - private VehicleMapper vehicleMapper; - - @GetMapping("/list/all") - public Result> findAll () { - return Result.success(vehicleMapper.selectList(new QueryWrapper<>())); - } -} diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/domain/Vehicle.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/domain/Vehicle.java deleted file mode 100644 index c2376f7..0000000 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/domain/Vehicle.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.muyu.many.datasource.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.common.security.utils.SecurityUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 车辆录入对象 vehicle - * - * @author muyu - * @date 2024-05-27 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName(value = "vehicle") -public class Vehicle extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 车辆id */ - @TableId(value = "id",type = IdType.AUTO) - private Long id; - - /** 车辆vin */ - private String vin; - - /** 品牌 */ - private String brand; - - /** 型号 */ - private String model; - - /** 生产日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date productionDate; - - /** 车身类型 */ - private String bodyType; - - /** 车身颜色 */ - private String color; - - /** 发动机排量 */ - private BigDecimal engineCapacity; - - /** 燃油类型 */ - private String fuelType; - - /** 变速器类型 */ - private String transmission; - - /** 驱动方式 */ - private String driveType; - - /** 行驶里程 */ - @Excel(name = "行驶里程") - @ApiModelProperty(name = "行驶里程", value = "行驶里程") - private BigDecimal mileage; - - /** 注册日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date registrationDate; - - /** 车牌号码 */ - private String licenseNumber; - - /** 持有者 */ - private String holder; - - /** 车辆类型 */ - private String vehicleType; - - -} diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/mapper/VehicleMapper.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/mapper/VehicleMapper.java deleted file mode 100644 index 250db61..0000000 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/mapper/VehicleMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu.many.datasource.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.many.datasource.domain.Vehicle; - -/** - * 车辆mapper VehicleMapper - * - * @author DeKangLiu - * Date 2024/6/4 14:07 - */ -public interface VehicleMapper extends BaseMapper { - -} diff --git a/muyu-modules/muyu-many-datasource/src/main/resources/banner.txt b/muyu-modules/muyu-many-datasource/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/muyu-modules/muyu-many-datasource/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/muyu-modules/muyu-many-datasource/src/main/resources/bootstrap.yml b/muyu-modules/muyu-many-datasource/src/main/resources/bootstrap.yml deleted file mode 100644 index cac2c7f..0000000 --- a/muyu-modules/muyu-many-datasource/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,30 +0,0 @@ -# Tomcat -server: - port: 9206 - -# Spring -spring: - application: - # 应用名称 - name: muyu-many-datasource - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: jinmo - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: jinmo - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.many.datasource.mapper: DEBUG diff --git a/muyu-modules/muyu-many-datasource/src/main/resources/logback.xml b/muyu-modules/muyu-many-datasource/src/main/resources/logback.xml deleted file mode 100644 index 732d269..0000000 --- a/muyu-modules/muyu-many-datasource/src/main/resources/logback.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/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java deleted file mode 100644 index 1729048..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.muyu.net.working.feign; - -import com.muyu.common.core.domain.Result; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysUser; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 用户添加远程调用 UserFeign - * - * @author DeKangLiu - * Date 2024/6/6 09:06 - */ -@FeignClient("muyu-system/dept") -public interface DeptFeign { - - @RequiresPermissions("system:dept:add") - @PostMapping - public Result add (@Validated @RequestBody SysDept dept); - - @RequiresPermissions("system:dept:list") - @GetMapping("/list") - public Result list (SysDept dept); -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java deleted file mode 100644 index e8ef118..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.net.working.feign; - -import com.muyu.common.core.domain.Result; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysUser; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 用户添加远程调用 UserFeign - * - * @author DeKangLiu - * Date 2024/6/6 09:06 - */ -@FeignClient("muyu-system/user") -public interface UserFeign { - @RequiresPermissions("system:user:add") - @PostMapping("") - public Result add (@Validated @RequestBody SysUser user); -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..e69de29 diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml index 94ad871..4f40f0c 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml @@ -28,6 +28,11 @@ muyu-net-working-common 3.6.3 + + com.muyu + muyu-modules-system + 3.6.3 + com.alibaba.cloud diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java index e415c36..5f922a2 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java @@ -1,13 +1,19 @@ package com.muyu.net.working.controller; +import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; -import com.muyu.net.working.feign.DeptFeign; -import com.muyu.net.working.feign.UserFeign; +import com.muyu.system.remote.RemoteSysDeptService; +import com.muyu.system.remote.RemoteSysUserService; +import com.muyu.system.remote.factory.RemoteSysDeptFactory; import io.swagger.annotations.*; +import io.swagger.models.auth.In; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -37,15 +43,17 @@ import com.muyu.common.core.web.page.TableDataInfo; * @date 2024-06-05 */ @Api(tags = "车辆运营平台") +@Log4j2 @RestController @RequestMapping("/car") public class EnterpriseController extends BaseController { @Autowired private EnterpriseService enterpriseService; + @Autowired - private UserFeign userFeign; + private RemoteSysDeptService remoteSysDeptService; @Autowired - private DeptFeign deptFeign; + private RemoteSysUserService remoteSysUserService; /** * 查询车辆运营平台列表 @@ -91,19 +99,64 @@ public class EnterpriseController extends BaseController { @PostMapping @ApiOperation("新增车辆运营平台") public Result add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) { - - - SysDept sysDept = new SysDept(); - sysDept.setDeptName(enterpriseSaveReq.getEbterpriseName()); - Result list = deptFeign.list(sysDept); - if (list!=null){ + LoginUser loginUser = SecurityUtils.getLoginUser(); + SysUser sysUser = loginUser.getSysUser(); + Result DeptList = remoteSysDeptService.selectDeptByName(enterpriseSaveReq.getEbterpriseName()); + SysDept sysDept = DeptList.getData(); + if(sysDept!=null){ return Result.error("部门名称重复"); } - Result add = deptFeign.add(sysDept); + addDept(enterpriseSaveReq, sysUser); + addUser(enterpriseSaveReq,sysUser); return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq))); } + /** + * 添加部门表信息 + * @param enterpriseSaveReq + * @param sysUser + * @return + */ + public void addDept(EnterpriseSaveReq enterpriseSaveReq,SysUser sysUser){ + + SysDept DeptBuild = SysDept.builder() + .deptName(enterpriseSaveReq.getEbterpriseName()) + .parentId(100L) + .ancestors("0,100") + .orderNum(2) + .status("0") + .createBy(sysUser.getUserName()) + .createTime(new Date()) + .leader(sysUser.getNickName()) + .phone(sysUser.getPhonenumber()) + .email(sysUser.getEmail()) + .delFlag("0") + .build(); + remoteSysDeptService.add(DeptBuild); + } + + public void addUser(EnterpriseSaveReq enterpriseSaveReq,SysUser sysUser){ + Result sysDeptResult = remoteSysDeptService.selectDeptByName(enterpriseSaveReq.getEbterpriseName()); + SysDept sysDept = sysDeptResult.getData(); + SysUser UserBuild = SysUser.builder() + .userName(enterpriseSaveReq.getEbterpriseName()) + .nickName(enterpriseSaveReq.getEbterpriseName()) + .password("123456") + .deptId(sysDept.getDeptId()) + .email(enterpriseSaveReq.getEmail()) + .phonenumber(enterpriseSaveReq.getContactPhone()) + .status("0") + .delFlag("0") + .roleId(3L) + .roleIds(new Long[]{3L}) + .createBy(sysUser.getUserName()) + .createTime(new Date()) + .remark(enterpriseSaveReq.getRemark()) + .build(); + remoteSysUserService.add(UserBuild); + } + /** * 修改车辆运营平台 */ @@ -124,6 +177,7 @@ public class EnterpriseController extends BaseController { @ApiOperation("删除车辆运营平台") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") public Result remove(@PathVariable List ids) { + return toAjax(enterpriseService.removeBatchByIds(ids)); } } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 606cb24..861797e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -39,6 +39,12 @@ public class SysDeptController extends BaseController { return success(depts); } + @GetMapping("/selectDeptByName") + public Result selectDeptByName (@RequestParam("name") String name) { + SysDept sysDept = deptService.selectDeptByName(name); + return Result.success(sysDept); + } + /** * 查询部门列表（排除节点） */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java index 5ef9ab4..ade44cc 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java @@ -128,4 +128,6 @@ public interface SysDeptMapper extends BaseMapper { * @return 结果 */ public int deleteDeptById (Long deptId); + + SysDept selectDeptByName(@Param("name") String name); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java new file mode 100644 index 0000000..e010bf7 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java @@ -0,0 +1,32 @@ +package com.muyu.system.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysDept; +import com.muyu.system.remote.factory.RemoteSysDeptFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 远程调用部门接口 RemoteSysDeptService + * + * @author DeKangLiu + * Date 2024/6/7 09:00 + */ +@FeignClient( + contextId = "remoteSysDeptService", + value = ServiceNameConstants.SYSTEM_SERVICE, + fallbackFactory = RemoteSysDeptFactory.class, + path = "/dept" +) +public interface RemoteSysDeptService { + @GetMapping("/selectDeptByName") + public Result selectDeptByName (@RequestParam("name") String name); + + @PostMapping + public Result add (@Validated @RequestBody SysDept dept); +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java new file mode 100644 index 0000000..cb9b334 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java @@ -0,0 +1,34 @@ +package com.muyu.system.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.system.domain.SysUser; +import com.muyu.system.remote.factory.RemoteSysUserFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 远程调用用户 RemoteSysUserService + * + * @author DeKangLiu + * Date 2024/6/7 08:51 + */ +@FeignClient( + contextId = "remoteSysUserService", + value = ServiceNameConstants.SYSTEM_SERVICE, + fallbackFactory = RemoteSysUserFactory.class, + path = "/user" +) +public interface RemoteSysUserService { + /** + * 新增用户服务 + * @param user + * @return Result + */ + @RequiresPermissions("system:user:add") + @PostMapping + public Result add (@Validated @RequestBody SysUser user); +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysDeptFactory.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysDeptFactory.java new file mode 100644 index 0000000..90c268f --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysDeptFactory.java @@ -0,0 +1,42 @@ +package com.muyu.system.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysDept; +import com.muyu.system.remote.RemoteSysDeptService; +import lombok.extern.log4j.Log4j2; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * 远程调用部门熔断器 RemoteSysDeptFactory + * + * @author DeKangLiu + * Date 2024/6/7 09:00 + */ +@Log4j2 +public class RemoteSysDeptFactory implements FallbackFactory { + @Override + public RemoteSysDeptService create(Throwable cause) { + + return new RemoteSysDeptService() { + /** + * 查找部门列表 + * @param name + * @return + */ + @Override + public Result selectDeptByName(String name) { + return Result.error(cause.getMessage()); + } + + /** + * 添加部门管理 + * @param dept + * @return + */ + @Override + public Result add(SysDept dept) { + return Result.error(cause.getMessage()); + } + }; + } +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysUserFactory.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysUserFactory.java new file mode 100644 index 0000000..5a29ff7 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysUserFactory.java @@ -0,0 +1,31 @@ +package com.muyu.system.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysUser; +import com.muyu.system.remote.RemoteSysUserService; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * 远程调用用户熔断器 RemoteSysUserFactory + * + * @author DeKangLiu + * Date 2024/6/7 08:54 + */ +public class RemoteSysUserFactory implements FallbackFactory { + + @Override + public RemoteSysUserService create(Throwable cause) { + return new RemoteSysUserService() { + + /** + * 新增用户服务 + * @param user + * @return + */ + @Override + public Result add(SysUser user) { + return Result.error(cause.getMessage()); + } + }; + } +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java index 140cf91..45ecf6f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java @@ -135,4 +135,6 @@ public interface SysDeptService extends IService { * @return 结果 */ public int deleteDeptById (Long deptId); + + SysDept selectDeptByName(String name); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index a55301b..ba48c34 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -280,6 +280,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl return deptMapper.deleteDeptById(deptId); } + @Override + public SysDept selectDeptByName(String name) { + return deptMapper.selectDeptByName(name); + } + /** * 递归列表 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index ab88e1c..419108e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -238,11 +238,14 @@ public class SysUserServiceImpl extends ServiceImpl impl public int insertUser (SysUser user) { // 新增用户信息 int rows = userMapper.insertUser(user); + + //赋值userId +// user.setUserId((long) rows); // 新增用户岗位关联 insertUserPost(user); // 新增用户与角色管理 insertUserRole(user); - return rows; + return rows; } /** diff --git a/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..71898a6 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.muyu.system.remote.factory.RemoteSysUserFactory +com.muyu.system.remote.factory.RemoteSysDeptFactory diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml index a571d8b..e862480 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -108,6 +108,9 @@ where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 + insert into sys_dept( diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 5225db4..6a377cc 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -15,7 +15,6 @@ muyu-file muyu-net-working muyu-customer-business - muyu-many-datasource muyu-modules