bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【更新】用户登录返回企业信息

This commit is contained in:
nmy 2023-12-09 22:47:59 +08:00
parent d259b39b1f
commit 71cc43fe38
19 changed files with 208 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java
View File

@ -64,4 +64,8 @@ public class UpOff extends BaseEntity
@ApiModelProperty(value = "状态（1通过，2驳回）", required = true)
private String status;
@Excel(name="驳回备注")
@ApiModelProperty(value = "驳回备注", required = true)
private String auditRemark;
}

10
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java
View File

@ -35,6 +35,16 @@ public class MaDevInfoVo extends DevInfo {
@ApiModelProperty(value = "设备保险信息图片路径", required = true)
private String insureImageUrl;
@ApiModelProperty(value = "设备检验信息图片名称", required = true)
private String inspectImageName;
//设备保险信息图片路径
@ApiModelProperty(value = "设备保险信息图片名称", required = true)
private String insureImageName;
@ApiModelProperty(value= "租赁范围")
private String dictLeaseScope;

40
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/leaseScopeEnums.java Normal file
View File

@ -0,0 +1,40 @@
package com.bonus.zlpt.equip.api.enums;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@Getter
@AllArgsConstructor
public enum leaseScopeEnums {
//全平台
ALL_SCOPE(329,"全平台"),
//专区
ONLY_SCOPE(330,"专区");
public static final Map<Integer,String> ID_KEY_MAP = new HashMap<>();
public static final Map<String,Integer> CODE_KEY_MAP = new HashMap<>();
static {
for (leaseScopeEnums value : values()) {
ID_KEY_MAP.put(value.getId(),value.getCode());
CODE_KEY_MAP.put(value.getCode(),value.getId());
}
}
private final Integer id;
private final String code;
}

4
zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/RemoteUserService.java
View File

@ -3,6 +3,7 @@ package com.bonus.zlpt.system.api;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.common.core.web.page.TableDataInfo;
import com.bonus.zlpt.system.api.domain.SysUser;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
import com.bonus.zlpt.system.api.factory.RemoteUserFallbackFactory;
import com.bonus.zlpt.system.api.model.LoginUser;
import org.springframework.cloud.openfeign.FeignClient;
@ -86,4 +87,7 @@ public interface RemoteUserService
AjaxResult remove(@PathVariable("userIds") Long[] userIds);
@GetMapping("/user/selectUserVo")
R<UserVo> selectUserVo(@RequestParam("userId") Long userId);
}

23
zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java Normal file
View File

@ -0,0 +1,23 @@
package com.bonus.zlpt.system.api.domain.vo;
import lombok.Data;
@Data
public class UserVo {
//用户id
private String userId;
//用户手机号
private String phonenumber;
//企业id
private Integer companyId;
//企业名称
private String companyName;
//企业logo
private String logoUrl;
}

6
zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/factory/RemoteUserFallbackFactory.java
View File

@ -3,6 +3,7 @@ package com.bonus.zlpt.system.api.factory;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.common.core.web.page.TableDataInfo;
import com.bonus.zlpt.system.api.domain.SysUser;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
import com.bonus.zlpt.system.api.model.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -64,6 +65,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
return null;
}
@Override
public R<UserVo> selectUserVo(Long userId) {
return null;
}
};
}

11
zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/model/LoginUser.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Set;
import com.bonus.zlpt.system.api.domain.SysUser;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
/**
* 用户信息
@ -59,6 +60,16 @@ public class LoginUser implements Serializable
*/
private SysUser sysUser;
private UserVo userVo;
public UserVo getUserVo() {
return userVo;
}
public void setUserVo(UserVo userVo) {
this.userVo = userVo;
}
public String getToken()
{
return token;

4
zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
View File

@ -2,6 +2,7 @@ package com.bonus.zlpt.auth.service;
import com.bonus.zlpt.common.core.utils.DateUtils;
import com.bonus.zlpt.system.api.constants.RedisConstants;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
import io.micrometer.core.instrument.util.TimeUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -112,6 +113,9 @@ public class SysLoginService
}
passwordService.validate(user, password);
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
Long userId = user.getUserId();
R<UserVo> userVoR = remoteUserService.selectUserVo(userId);
userInfo.setUserVo(userVoR.getData());
return userInfo;
}

15
zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
View File

@ -52,7 +52,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 获取公司列表
*/
@RequiresPermissions("system:company:list")
// @RequiresPermissions("system:company:list")
@GetMapping("/list")
@ApiOperation("获取公司列表")
public AjaxResult list(BmCompanyInfo obj) {
@ -63,7 +63,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 新增 -- 录入企业信息
*/
@RequiresPermissions("system:company:add")
// @RequiresPermissions("system:company:add")
@Log(title = "企业管理", businessType = BusinessType.INSERT)
@PostMapping("addCompanyInfo")
@ApiOperation("录入企业信息")
@ -74,7 +74,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 修改 -- 企业信息变更
*/
@RequiresPermissions("system:company:edit")
// @RequiresPermissions("system:company:edit")
@Log(title = "企业管理", businessType = BusinessType.UPDATE)
@PostMapping("updateCompanyInfo")
@ApiOperation("企业信息变更")
@ -92,7 +92,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 删除 -- 企业注销
*/
@RequiresPermissions("system:company:remove")
// @RequiresPermissions("system:company:remove")
@Log(title = "企业管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
@ApiOperation("企业注销")
@ -127,17 +127,18 @@ public class BmCompanyInfoController extends BaseController {
/**
* 企业入驻信息导出
* @param response
* @param
*/
@GetMapping("/exportExcel")
@ApiOperation("企业入驻信息导出")
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
ExcelUtil<BmCompanyInfo> bmCompanyInfoExcelUtil = new ExcelUtil<>(BmCompanyInfo.class);
bmCompanyInfoExcelUtil.exportExcel(response,bmCompanyInfoService.selectList(new BmCompanyDto()),"企业入驻信息","","企业入驻信息");
bmCompanyInfoExcelUtil.exportExcel(response,bmCompanyInfoService.selectList(new BmCompanyDto()), "企业入驻信息", "", "企业入驻信息");
}
/**
* 根据条件查询企业详细信息
* @return

3
zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java
View File

@ -11,6 +11,7 @@ import com.bonus.zlpt.company.service.BmCompanyTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -135,7 +136,7 @@ public class BmCompanyTypeController extends BaseController {
/**
* 企业类型导出
* @param response
* @param
*/
@GetMapping("/exportExcel")
@ApiOperation("企业类型导出")

17
zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
View File

@ -6,6 +6,8 @@ import com.bonus.zlpt.company.api.domain.dto.BmCompanyDto;
import com.bonus.zlpt.company.api.domain.dto.BmCompanyInfoDto;
import com.bonus.zlpt.company.api.domain.vo.BmCompanyInfoVo;
import com.bonus.zlpt.company.api.domain.vo.BmCompanyVo;
import com.bonus.zlpt.company.api.enums.CompanyLtdEnum;
import com.bonus.zlpt.company.api.enums.CompanyTypeEnum;
import com.bonus.zlpt.company.mapper.BmCoBankMapper;
import com.bonus.zlpt.company.service.BmCompanyInfoService;
import com.bonus.zlpt.system.api.RemoteUserService;
@ -74,8 +76,11 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
@Transactional
public int updateByPrimaryKeySelective(BmCompanyInfoDto record) {
bmCoBankMapper.updateByPrimaryKeySelective(record.getBmCoBank());
return bmCompanyInfoMapper.updateByPrimaryKeySelective(record.getBmCompanyInfo());
int count = bmCompanyInfoMapper.updateByPrimaryKeySelective(record.getBmCompanyInfo());
if(record.getBmCoBank() == null || record.getBmCoBank().getId()==null){
return count;
}
return bmCoBankMapper.updateByPrimaryKeySelective(record.getBmCoBank());
}
@Override
@ -90,7 +95,10 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
public List<BmCompanyInfo> selectList(BmCompanyDto bmCompanyDto) {
List<BmCompanyInfo> bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto);
for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) {
bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType())));
bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd())));
SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getCreator().longValue()).getData();
bmCompanyInfo.setUserName(data.getUserName());
}
@ -108,7 +116,8 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
//根据id查询企业详情
BmCompanyInfo bmCompanyInfo = bmCompanyInfoMapper.selectByPrimaryKey(id);
bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType())));
bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd())));
BmCompanyVo bmCompanyVo = new BmCompanyVo();
bmCompanyVo.setBmCompanyInfo(bmCompanyInfo);
@ -128,6 +137,8 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
for (BmCompanyInfo bmCompanyInfo : list) {
bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType())));
bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd())));
Integer userId = bmCompanyInfo.getCreator();
//获取当前被授权用户信息
SysUser sysUser = remoteUserService.selectUserById(userId.longValue()).getData();

59
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
View File

@ -1,5 +1,7 @@
package com.bonus.zlpt.equip.controller;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
@ -10,20 +12,19 @@ import com.bonus.zlpt.common.log.annotation.Log;
import com.bonus.zlpt.common.log.enums.BusinessType;
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
import com.bonus.zlpt.common.security.utils.SecurityUtils;
import com.bonus.zlpt.equip.api.domain.DevInfo;
import com.bonus.zlpt.equip.api.domain.UpOff;
import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
import com.bonus.zlpt.equip.mapper.DevInfoMapper;
import com.bonus.zlpt.equip.service.IDevInfoService;
import com.bonus.zlpt.system.api.RemoteUserService;
import io.swagger.annotations.Api;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.bonus.zlpt.equip.service.IUpOffService;
/**
@ -41,6 +42,12 @@ public class UpOffController extends BaseController
@Autowired
private IUpOffService upOffService;
@Autowired
private IDevInfoService devInfoService;
@Autowired
private RemoteUserService remoteUserService;
@ -75,8 +82,8 @@ public class UpOffController extends BaseController
* 审批获取详细数据
* @return
*/
@PostMapping("/selectInfo")
public AjaxResult selectInfo(@RequestBody List<Long> ids){
@GetMapping("/selectInfo")
public AjaxResult selectInfo(@RequestParam("ids") List<Long> ids){
return success(upOffService.selectInfo(ids));
}
@ -108,7 +115,6 @@ public class UpOffController extends BaseController
/**
* 新增设备上下架管理
*/
// @RequiresPermissions("equip:off:add")
@Log(title = "设备上下架管理", businessType = BusinessType.INSERT)
@ -122,15 +128,32 @@ public class UpOffController extends BaseController
}
/**
* 修改设备上下架管理
* 审批接口
*/
//@RequiresPermissions("equip:off:edit")
@Log(title = "设备上下架管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UpOff upOff)
@PostMapping("/edit")
@Transactional
public AjaxResult edit(@RequestBody List<UpOff> upOff)
{
return toAjax(upOffService.updateUpOff(upOff));
for (UpOff off : upOff) {
DevInfo devInfo = new DevInfo();
if(off.getStatus().equals("1")){
devInfo.setMaStatus("16");
}else{
devInfo.setMaStatus("332");
}
Long maId = off.getMaId();
devInfo.setMaId(maId);
devInfoService.updateDevInfo(devInfo);
String userName = remoteUserService.selectUserById(off.getId()).getData().getUserName();
off.setAuditUser(SecurityUtils.getUsername());
off.setAuditTime(LocalDateTime.now().toString());
off.setApplyUser(userName);
off.setId(null);
}
upOffService.insertUpOff(upOff);
return success();
}
/**
@ -139,8 +162,8 @@ public class UpOffController extends BaseController
*/
// @RequiresPermissions("equip:off:remove")
@Log(title = "设备上下架管理", businessType = BusinessType.DELETE)
@PostMapping("/remove")
public AjaxResult remove(@RequestBody Long[] ids)
@GetMapping("/remove")
public AjaxResult remove(@RequestParam("ids") Long[] ids)
{
return toAjax(upOffService.deleteUpOffByIds(ids));
}

5
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.bonus.zlpt.equip.api.domain.TypeInfo;
import com.bonus.zlpt.equip.api.domain.UpOff;
import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
import com.bonus.zlpt.common.core.enums.FileDictEnum;
import com.bonus.zlpt.equip.api.enums.leaseScopeEnums;
import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
import com.bonus.zlpt.equip.mapper.TypeInfoMapper;
import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
@ -170,13 +171,17 @@ public class UpOffServiceImpl implements IUpOffService
}
for (MaDevInfoVo devInfoVo : devInfoVos) {
devInfoVo.setDictLeaseScope(leaseScopeEnums.ID_KEY_MAP.get(devInfoVo.getLeaseScope().intValue()));
//组装url
List<SysFileInfo> fileInfos = sysFileInfoMapper.selectByMaId(devInfoVo.getMaId());
for (SysFileInfo fileInfo : fileInfos) {
if(FileDictEnum.INSPECT_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
devInfoVo.setInspectImageName(fileInfo.getFileName());
devInfoVo.setInspectImageUrl(fileInfo.getFileUrl());
}
if(FileDictEnum.INSURE_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
devInfoVo.setInsureImageName(fileInfo.getFileName());
devInfoVo.setInsureImageUrl(fileInfo.getFileUrl());
}
}

1
zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
View File

@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
and d.type_id = t.type_id
and d.own_co = `c`.company_id
and d.ma_status = '331'
<if test="code != null and code != ''">and d.code LIKE CONCAT('%',#{code},'%')</if>
<if test="name != null and name != ''">and t.type_name LIKE CONCAT('%',#{name},'%')</if>
<if test="companyName != null and companyName != ''">and c.company_name LIKE CONCAT('%',#{companyName},'%')</if>

21
zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SysUserController.java
View File

@ -5,17 +5,12 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
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 org.springframework.web.multipart.MultipartFile;
import com.bonus.zlpt.common.core.domain.R;
import com.bonus.zlpt.common.core.utils.StringUtils;
@ -66,6 +61,16 @@ public class SysUserController extends BaseController
@Autowired
private ISysConfigService configService;
@GetMapping("/selectUserVo")
public R<UserVo> selectUserVo(@RequestParam("userId") Long userId){
UserVo userVo = userService.selectUserVo(userId);
System.err.println(userVo);
return R.ok(userService.selectUserVo(userId));
}
/**
* 获取用户列表
*/

4
zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/SysUserMapper.java
View File

@ -1,6 +1,8 @@
package com.bonus.zlpt.system.mapper;
import java.util.List;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
import org.apache.ibatis.annotations.Param;
import com.bonus.zlpt.system.api.domain.SysUser;
@ -124,4 +126,6 @@ public interface SysUserMapper
* @return 结果
*/
public SysUser checkEmailUnique(String email);
UserVo selectUserVo(Long userId);
}

4
zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISysUserService.java
View File

@ -2,6 +2,7 @@ package com.bonus.zlpt.system.service;
import java.util.List;
import com.bonus.zlpt.system.api.domain.SysUser;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
/**
* 用户 业务层
@ -203,4 +204,7 @@ public interface ISysUserService
* @return 结果
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
UserVo selectUserVo(Long userId);
}

8
zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/SysUserServiceImpl.java
View File

@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
import com.bonus.zlpt.system.api.domain.vo.UserVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -542,4 +544,10 @@ public class SysUserServiceImpl implements ISysUserService
return successMsg.toString();
}
@Override
public UserVo selectUserVo(Long userId) {
return userMapper.selectUserVo(userId);
}
}

8
zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -145,8 +145,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
<insert id="insertUser" parameterType="com.bonus.zlpt.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
<select id="selectUserVo" resultType="com.bonus.zlpt.system.api.domain.vo.UserVo">
SELECT company_id companyId, company_name companyName, logo_url logoUrl from bm_company_info
WHERE creator = #{userId}
</select>
<insert id="insertUser" parameterType="com.bonus.zlpt.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>