From ca1760e7268ff23928ec181a8d15e04bbe056515 Mon Sep 17 00:00:00 2001
From: zhang xu <2125563902@qq.com>
Date: Fri, 7 Jun 2024 22:27:56 +0800
Subject: [PATCH] =?UTF-8?q?test:(=E9=87=8D=E6=9E=84=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E5=BE=80=E5=AE=8C=E6=95=B4=E7=9A=84=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E5=93=AA=E4=B8=80=E6=AD=A5=E5=8F=91=E5=B1=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/common/system/domain/SysRole.java    |  2 ++
 .../system/remote/RemoteUserService.java      |  5 +++
 .../factory/RemoteUserFallbackFactory.java    |  7 ++++
 .../networking/service/DataSourceService.java | 28 +++++++--------
 .../service/impl/EnterpriseServiceImpl.java   | 10 +++---
 .../system/controller/SysRoleController.java  |  2 +-
 .../service/impl/SysUserServiceImpl.java      | 11 ++++++
 .../resources/mapper/system/SysUserMapper.xml |  7 +++-
 .../vehicle/service/Impl/SongServiceImpl.java | 36 +++++++++++++++++++
 pom.xml                                       |  3 ++
 10 files changed, 90 insertions(+), 21 deletions(-)
 create mode 100644 muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/SongServiceImpl.java

diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
index 09fda22..cb9727e 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
@@ -101,6 +101,8 @@ public class SysRole extends BaseEntity {
     private Set<String> permissions;
 
 
+
+
     public SysRole (Long roleId) {
         this.roleId = roleId;
     }
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
index e320283..73034dc 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
@@ -3,6 +3,7 @@ package com.muyu.common.system.remote;
 import com.muyu.common.core.constant.SecurityConstants;
 import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
 import com.muyu.common.system.domain.LoginUser;
@@ -33,6 +34,10 @@ public interface RemoteUserService {
     @PostMapping("/user")
     public Result add (@Validated @RequestBody SysUser user);
 
+
+    @PostMapping
+    public Result addRole (@Validated @RequestBody SysRole role);
+
     /**
      * 注册用户信息
      *
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
index ce1cefd..4655396 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
@@ -1,6 +1,7 @@
 package com.muyu.common.system.remote.factory;
 
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
@@ -32,6 +33,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return Result.error("获取用户失败:{}", throwable.getMessage());
             }
 
+            @Override
+            public Result addRole(SysRole role) {
+                return Result.error("获取用户失败:{}", throwable.getMessage());
+            }
+
+
             @Override
             public Result<Boolean> registerUserInfo (SysUser sysUser, String source) {
                 return Result.error("注册用户失败:" + throwable.getMessage());
diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/DataSourceService.java b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/DataSourceService.java
index 76a12f0..6140128 100644
--- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/DataSourceService.java
+++ b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/DataSourceService.java
@@ -1,14 +1,14 @@
-package com.muyu.networking.service;
-
-/** 多数据源
- * @ClassName
- * @Author
- * @Date 2024/4/28 18:46
- */
-public interface DataSourceService {
-
-    void toDefaultDS();
-
-    boolean changeDS(Long datasourceId);
-}
-
+//package com.muyu.networking.service;
+//
+///** 多数据源
+// * @ClassName
+// * @Author
+// * @Date 2024/4/28 18:46
+// */
+//public interface DataSourceService {
+//
+//    void toDefaultDS();
+//
+//    boolean changeDS(Long datasourceId);
+//}
+//
diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java
index a8ed538..082d23e 100644
--- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java
+++ b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.DateUtils;
 import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.domain.Enterprise;
@@ -70,12 +71,10 @@ public class EnterpriseServiceImpl  extends ServiceImpl<EnterpriseMapper,Enterpr
 //                .entId(enterprise.getId())
 //                .build();
 
-        SysUser sysUser = new SysUser();
-        sysUser.setUserName("admin");
-        if (sysUser.getUserName().equals("admin")){
+        enterprise.setEnterpriseName("admin");
+        if (enterprise.getEnterpriseName().equals("admin")){
             return enterpriseMapper.selectEnterpriseList(enterprise);
         }
-
         LambdaQueryWrapper<Enterprise> lambdaQueryWrapper = new LambdaQueryWrapper<>() {{
             eq(Enterprise::getId, enterprise.getId());
         }};
@@ -98,8 +97,9 @@ public class EnterpriseServiceImpl  extends ServiceImpl<EnterpriseMapper,Enterpr
         enterprise.setCreateTime(DateUtils.getNowDate());
         enterprise.setBusinessLicenseNumber(UUID.randomUUID().toString().replaceAll("-",""));
         enterprise.setStatus("1");
-        enterprise.setCertification("1");
+        enterprise.setCertification("0");
         enterprise.setOpenAdd("0");
+        SysRole.builder().roleId(2L).build();
         SysUser sysUser = SysUser.builder().userName(
                 enterprise.getEnterpriseName())
                 .password("admin")
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java
index 63df7a9..28428d5 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java
@@ -73,7 +73,7 @@ public class SysRoleController extends BaseController {
     @RequiresPermissions("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public Result add (@Validated @RequestBody SysRole role) {
+    public Result addRole (@Validated @RequestBody SysRole role) {
         if (!roleService.checkRoleNameUnique(role)) {
             return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
         } else if (!roleService.checkRoleKeyUnique(role)) {
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..4ae73b6 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
@@ -10,6 +10,7 @@ import com.muyu.common.datascope.annotation.DataScope;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.system.domain.SysPost;
 import com.muyu.system.domain.SysUserPost;
 import com.muyu.system.domain.SysUserRole;
@@ -226,6 +227,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
     }
 
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
     /**
      * 新增保存用户信息
      *
@@ -240,6 +244,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
         insertUserPost(user);
+        if (2==user.getRoleId()){
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(2L);
+            sysUserRole.setUserId(user.getUserId());
+            sysUserRoleMapper.insert(sysUserRole);
+        }
+
         // 新增用户与角色管理
         insertUserRole(user);
         return rows;
diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6f633b7..3a26e5d 100644
--- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -13,6 +13,7 @@
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
         <result property="avatar" column="avatar"/>
+        <result property="entId" column="ent_id"/>
         <result property="password" column="password"/>
         <result property="status" column="status"/>
         <result property="delFlag" column="del_flag"/>
@@ -54,6 +55,7 @@
                u.email,
                u.avatar,
                u.phonenumber,
+               u.ent_id,
                u.password,
                u.sex,
                u.status,
@@ -83,7 +85,7 @@
     </sql>
 
     <select id="selectUserList" parameterType="com.muyu.common.system.domain.SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar,u.ent_id, u.password, u.phonenumber, u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
         u
         left join sys_dept d on u.dept_id = d.dept_id
@@ -194,6 +196,7 @@
         <if test="avatar != null and avatar != ''">avatar,</if>
         <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
         <if test="sex != null and sex != ''">sex,</if>
+        <if test="entId != null and entId != ''">ent_id,</if>
         <if test="password != null and password != ''">password,</if>
         <if test="status != null and status != ''">status,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
@@ -208,6 +211,7 @@
         <if test="avatar != null and avatar != ''">#{avatar},</if>
         <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
         <if test="sex != null and sex != ''">#{sex},</if>
+        <if test="entId != null and entId != ''">#{ent_id},</if>
         <if test="password != null and password != ''">#{password},</if>
         <if test="status != null and status != ''">#{status},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -226,6 +230,7 @@
             <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>
             <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
+            <if test="entId != null and entId != ''">ent_id = #{ent_id},</if>
             <if test="password != null and password != ''">password = #{password},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/SongServiceImpl.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/SongServiceImpl.java
new file mode 100644
index 0000000..82e29eb
--- /dev/null
+++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/SongServiceImpl.java
@@ -0,0 +1,36 @@
+package com.muyu.vehicle.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.domain.datasources.SongInfo;
+import com.muyu.vehicle.mapper.SongMapper;
+import com.muyu.vehicle.service.SongService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/** 多数据源
+ * songService业务层处理
+ *
+ * @author
+ * @date 2024-05-16
+ */
+@Slf4j
+@Service
+public class SongServiceImpl extends ServiceImpl<SongMapper, SongInfo> implements SongService {   // song_info对象 | songService接口
+
+    /**
+     * 查询song列表
+     *
+     * @return song
+     */
+    @Override   // 查询song列表
+    public List<SongInfo> list() {   // song_info对象
+        return this.list(new LambdaQueryWrapper<>());
+    }
+
+}
+
diff --git a/pom.xml b/pom.xml
index fc97f1d..62f77f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,9 @@
         <module>muyu-visual</module>
         <module>muyu-modules</module>
         <module>muyu-common</module>
+        <module>muyu-modules/muyu-vehicle</module>
+        <module>muyu-modules/muyu-vehicle/muyu-vehicle-common</module>
+        <module>muyu-modules/muyu-vehicle/muyu-vehicle-service</module>
     </modules>
     <packaging>pom</packaging>