server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -147,4 +147,5 @@ LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,null); return userInfo; } } server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -3,6 +3,8 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; @@ -23,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -97,9 +100,7 @@ @ApiOperation("访客记录 - 分页列表") @PostMapping("/visitPage") public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { LoginUserInfo loginUserInfo = getLoginUser(token); pageWrap.getModel().setMemberId(loginUserInfo.getMemberId()); public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) { return ApiResponse.success(visitsService.findPage(pageWrap)); }
@@ -61,6 +61,7 @@ || Objects.isNull(hiddenDanger.getAreaId()) || Objects.isNull(hiddenDanger.getCateId()) || Objects.isNull(hiddenDanger.getApplyCheckUserId()) || Objects.isNull(hiddenDanger.getCheckUserId()) || Objects.isNull(hiddenDanger.getSubmitTime()) || StringUtils.isBlank(hiddenDanger.getContent()) ){ @@ -68,6 +69,7 @@ } hiddenDanger.setIsdeleted(Constants.ZERO); hiddenDanger.setCreateDate(new Date()); hiddenDanger.setEditDate(new Date()); HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(hiddenDanger.getAreaId()); if(Objects.isNull(hiddenDangerParam)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患区域"); @@ -78,6 +80,10 @@ if(StringUtils.isBlank(hiddenDangerParam.getMemberIds()) || hiddenDangerParam.getMemberIds().indexOf(hiddenDanger.getApplyCheckUserId().toString())<0){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"隐患区域与处理人不匹配"); } Member member = memberMapper.selectById(hiddenDanger.getCheckUserId()); if(Objects.isNull(member)|| !Constants.equalsInteger(member.getStatus(),Constants.ZERO) || Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到隐患处理人员信息或已被禁用"); } hiddenDangerMapper.insert(hiddenDanger); //存储 操作日志 @@ -302,9 +308,6 @@ } if (!model.getCheckUserId().equals(hiddenDanger.getEditor())) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"处理人非当前人员！"); } if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"业务类型错误！"); } //整改前文件 if(hiddenDanger.getStatus().equals(Constants.ONE)){ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1589,6 +1589,7 @@ if(!Objects.isNull(tokenJson.get("access_token"))){ openId = tokenJson.getString("openid"); } // String openId = "12345"; WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO(); wxAuthorizeVO.setOpenid(openId); //根据openId 查询用户信息 @@ -1615,11 +1616,11 @@ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); member.setPrefixUrl(prefixUrl); JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId())); String token = JwtTokenUtil.generateToken(payLoad); //存储token至redis RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME); wxAuthorizeVO.setToken(token); // JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId())); // String token = JwtTokenUtil.generateToken(payLoad); // //存储token至redis // RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME); // wxAuthorizeVO.setToken(token); wxAuthorizeVO.setMember(member); } return wxAuthorizeVO;
