diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index ff0af1a..cfd8302 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -77,7 +77,7 @@ public class SysLoginService { } LoginUser userInfo = userResult.getData(); - SysUser user = userResult.getData().getSysUser(); + SysUser user = userInfo.getSysUser(); if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除"); throw new ServiceException("对不起，您的账号：" + username + " 已被删除"); diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java index c862929..65f339f 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java @@ -41,6 +41,10 @@ public class SecurityConstants { */ public static final String LOGIN_USER = "login_user"; + /** + * 用户信息 + */ + public static final String SYS_USER = "sys_user"; /** * 角色权限 */ diff --git a/muyu-common/muyu-common-saas/pom.xml b/muyu-common/muyu-common-saas/pom.xml index 7f86bfa..b261b51 100644 --- a/muyu-common/muyu-common-saas/pom.xml +++ b/muyu-common/muyu-common-saas/pom.xml @@ -34,5 +34,6 @@ org.springframework spring-webmvc + diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java index 480ee73..b04f54c 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java @@ -30,6 +30,7 @@ import java.util.Map; @AllArgsConstructor public class ManyDataSource { + @PostConstruct public void init(){ new Thread(()->{ @@ -39,9 +40,9 @@ public class ManyDataSource { DruidDataSourceFactory druidDataSourceFactory= SpringUtils.getBean(DruidDataSourceFactory.class); DynamicDataSource dynamicDataSource= SpringUtils.getBean(DynamicDataSource.class); EnterPriseInfo enterPriseInfo = EnterPriseInfo.builder() - .entCode("liu_42") + .entCode("liu_45") .ip("192.168.116.129") - .port(3348) + .port(3351) .build(); DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(), enterPriseInfo.getPort()); diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java index b19697e..a03478f 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java +++ b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java @@ -10,6 +10,7 @@ import com.muyu.common.core.utils.uuid.IdUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +49,7 @@ public class TokenService { loginUser.setUserid(userId); loginUser.setUsername(userName); loginUser.setIpaddr(IpUtils.getIpAddr()); + SysUser sysUser = loginUser.getSysUser(); refreshToken(loginUser); // Jwt存储信息 diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 5df4b8d..101459d 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -138,8 +138,20 @@ public class SysUser extends BaseEntity { */ private Long roleId; + /** + * 企业id + */ + private Integer enterpriseId; + public Integer getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(Integer enterpriseId) { + this.enterpriseId = enterpriseId; + } + public SysUser (Long userId) { this.userId = userId; } @@ -326,6 +338,8 @@ public class SysUser extends BaseEntity { .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("dept", getDept()) + .append("enterpriseId", getEnterpriseId()) + .toString(); } } 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..f416751 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 @@ -1,20 +1,16 @@ package com.muyu.customer.business.controller; import java.util.List; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.muyu.common.core.utils.ServletUtils; +import com.muyu.common.security.utils.SecurityUtils; import com.muyu.customer.business.mapper.VehicleMapper; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; @@ -40,6 +36,8 @@ import com.muyu.common.core.web.page.TableDataInfo; public class VehicleController extends BaseController { @Autowired private VehicleService vehicleService; + @Autowired + private HttpServletRequest request; /** * 查询车辆录入列表 @@ -50,6 +48,7 @@ public class VehicleController extends BaseController { public Result> list(VehicleQueryReq vehicleQueryReq) { startPage(); List list = vehicleService.list(Vehicle.queryBuild(vehicleQueryReq)); + return getDataTable(list); } 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 d7c02b8..03ea348 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 @@ -99,10 +99,11 @@ public class EnterpriseController extends BaseController { if(sysDept!=null){ return Result.error("部门名称重复"); } + enterpriseService.addEnterprise(enterpriseSaveReq); addDept(enterpriseSaveReq, sysUser); addUser(enterpriseSaveReq,sysUser); - return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq))); + return Result.success(); } /** @@ -136,6 +137,7 @@ public class EnterpriseController extends BaseController { .userName(enterpriseSaveReq.getEbterpriseName()) .nickName(enterpriseSaveReq.getEbterpriseName()) .password("123456") + .enterpriseId(Integer.valueOf(enterpriseSaveReq.getId())) .deptId(sysDept.getDeptId()) .email(enterpriseSaveReq.getEmail()) .phonenumber(enterpriseSaveReq.getContactPhone()) @@ -185,6 +187,7 @@ public class EnterpriseController extends BaseController { /** * 完善企业信息 + * * @param id * @param enterpriseEditReq * @return diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java index 32673cd..8f09670 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java @@ -3,6 +3,7 @@ package com.muyu.net.working.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.core.domain.Result; import com.muyu.net.working.domain.Enterprise; +import com.muyu.net.working.domain.req.EnterpriseSaveReq; import org.apache.ibatis.annotations.Param; /** @@ -16,4 +17,6 @@ public interface EnterpriseMapper extends BaseMapper { Enterprise selectByName(@Param("name") String name); void authentication(Enterprise enterprise); + + void addEnterprise(EnterpriseSaveReq enterpriseSaveReq); } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java index 9a905e0..4305f5a 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java @@ -5,6 +5,7 @@ import java.util.List; import com.muyu.common.core.domain.Result; import com.muyu.net.working.domain.Enterprise; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.net.working.domain.req.EnterpriseSaveReq; /** * 车辆运营平台Service接口 @@ -24,4 +25,6 @@ public interface EnterpriseService extends IService { Enterprise selectByName(String name); void authentication(Enterprise enterprise); + + void addEnterprise(EnterpriseSaveReq enterpriseSaveReq); } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java index 924fd5e..985c30f 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java @@ -12,6 +12,7 @@ import java.util.Map; import com.alibaba.fastjson.JSON; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; +import com.muyu.net.working.domain.req.EnterpriseSaveReq; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -122,6 +123,11 @@ public class EnterpriseServiceImpl extends ServiceImpl select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, enterprise_status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise + + insert into enterprise (id,ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, enterprise_status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark) + values (#{id},#{ebterpriseName}, #{legalPerson}, #{businessLincenseNumber}, #{estabinessDate}, #{businessScope}, #{address}, #{contactPhone}, #{email}, #{enterpriseStatus}, #{registrationDate}, #{certificationId}, #{authenticationDate}, #{serviceLevel}, #{openServerId}, #{addServerId}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}) + update enterprise set enterprise_status = 'N' where id = #{id} 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..06f4c06 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 @@ -23,6 +23,7 @@ + @@ -51,6 +52,7 @@ u.dept_id, u.user_name, u.nick_name, + u.enterprise_id, u.email, u.avatar, u.phonenumber, @@ -198,7 +200,8 @@ status, create_by, remark, - create_time + create_time, + enterprise_id )values( #{userId}, #{deptId}, @@ -212,7 +215,8 @@ #{status}, #{createBy}, #{remark}, - sysdate() + + sysdate(),#{enterpriseId} )