server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -30,6 +30,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; /** * @author 江蹄蹄 * @date 2023/11/30 15:33 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -98,7 +98,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:visits:query") public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId()); // pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId()); return ApiResponse.success(visitsService.findPage(pageWrap)); }
@@ -1,13 +1,9 @@ package com.doumee.cloud.openapi; import cn.emay.sdk.util.AES; import com.doumee.api.BaseController; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.config.jwt.JwtTokenUtil; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.ApiResponse; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; @@ -61,25 +57,32 @@ @LoginNoRequired @ApiOperation("token解析") @GetMapping("/water/decodeToken") public ApiResponse<Map<String,Object>> decodeToken(@RequestParam String token) { public Map<String,Object> decodeToken(@RequestParam String token) { HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest(); hkBaseTokenRequest.setToken(token); return ApiResponse.success(this.decodeTokenForHk(hkBaseTokenRequest)); return this.decodeTokenForHk(hkBaseTokenRequest); } public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest){ Map<String,Object> result = new HashMap<>(); result.put("code","0"); result.put("msg","success"); if(Objects.isNull(hkBaseTokenRequest)||StringUtils.isBlank(hkBaseTokenRequest.getToken())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"token参数为空"); result.put("code","-1"); result.put("msg","token参数为空"); return result; } String redisToken = (String) redisTemplate.opsForValue().get(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken()); if(StringUtils.isBlank(redisToken)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token解析失败"); result.put("code","-1"); result.put("msg","token参数为空"); return result; } String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken()); if(StringUtils.isBlank(userName)){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token解析失败"); result.put("code","-1"); result.put("msg","token参数为空"); return result; } //查询用户信息是否存在 SystemUser systemUser = new SystemUser(); @@ -87,14 +90,19 @@ systemUser.setDeleted(Boolean.FALSE); SystemUser queryBean = systemUserService.findOne(systemUser); if(Objects.isNull(queryBean)){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token解析失败"); result.put("code","-1"); result.put("msg","token参数为空"); return result; } if(Constants.equalsInteger(queryBean.getStatus(),Constants.ONE)){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"用户已禁用"); result.put("code","-2"); result.put("msg","用户已禁用"); return result; } redisTemplate.delete(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken()); Map<String,Object> result = new HashMap<>(); result.put("userId",userName); Map<String,Object> data = new HashMap<>(); data.put("userId",userName); result.put("data",data); return result; }
@@ -939,11 +939,11 @@ public static String getMenuUrl(Integer type,String token){ String menuId = HKConstants.MenuPageId.zhaf; if(Constants.equalsInteger(type,Constants.ONE)){ menuId = HKConstants.MenuPageId.wyhq; }else if(Constants.equalsInteger(type,Constants.TWO)){ menuId = HKConstants.MenuPageId.xzbg; }else if(Constants.equalsInteger(type,Constants.THREE)){ menuId = HKConstants.MenuPageId.yyzx; } log.info("【海康获取工作台菜单免密登陆调整地址】================开始====menuId:"+menuId+"==token:"+token); try { server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -540,7 +540,7 @@ approve.setTemplatId(approveTempl.getId()); approve.setChekorId(memberId); approve.setStatus(i==0?Constants.ONE:Constants.ZERO); approve.setStatusInfo(i==0?"审批中":"待审批"); approve.setStatusInfo(i==0?"审批中":"处理中"); approve.setTitle("审批人"); approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO); approve.setObjId(businessId); @@ -802,7 +802,7 @@ private List<Approve> getLevelInfoFromList(Approve level,List<Approve> approveGroupList) { List<Approve> list = new ArrayList<>(); if(Constants.equalsInteger(level.getApproveType(),Constants.TWO)){ level.setApproveType(Constants.ZERO); level.setApproveType(Constants.TWO); //如果是单人审批 list.add(level); return list; @@ -829,11 +829,17 @@ waitModel.setType(Constants.ZERO); waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"审批人")); waitModel.setStatus(Constants.equalsInteger(waitList.get(Constants.ZERO).getStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO); waitModel.setStatusInfo("处理中"); if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng) ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){ waitModel.setMemberName(waitList.size() +"人会签"); if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){ waitModel.setStatusInfo("待处理"); }else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.auditIng)){ waitModel.setStatusInfo("处理中"); } waitModel.setMemberName(waitList.size() +"人会签"); // if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng) // ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){ // waitModel.setMemberName(waitList.size() +"人会签"); // } if(CollectionUtils.isNotEmpty(waitList)){ waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate()); } @@ -848,15 +854,17 @@ }else { if((waitList.size()> 0 || otherPassList.size()>0)){ Approve waitModel = new Approve(); waitModel.setApproveType(Constants.ONE); waitModel.setApproveType(Constants.ZERO); if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){ waitModel.setStatus(Constants.approveStatus.pass); waitModel.setType(Constants.ONE); waitModel.setTitle("审批人（抄送或签审批人）"); }else{ waitModel.setType(Constants.ZERO); waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"审批人"):"抄送或签审批人"); waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO); waitModel.setType(Constants.ZERO); //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"审批人"):"抄送或签审批人"); waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"审批人"):"抄送或签审批人"); } List<Approve> approveList = new ArrayList<>(); approveList.addAll(waitList); @@ -870,7 +878,10 @@ if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.pass)){ waitModel.setMemberName("已抄送"+ approveList.size() +"人"); }else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){ waitModel.setMemberName("处理中"); waitModel.setMemberName(waitList.size() +"人或签"); waitModel.setStatusInfo("待处理"); }else{ waitModel.setStatusInfo("处理中"); } waitModel.setApproveList(approveList); list.add(waitModel); @@ -1225,8 +1236,6 @@ if(Objects.nonNull(visits)){ if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId())); }else{ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到业务数据对象!请刷新重试"); } } @@ -1329,9 +1338,9 @@ String info = ""; List<String> memberNameList = Arrays.asList(memberNames.split(",")); if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){ info = "待 "+memberNameList.get(0)+" 处理中"; info = "待"+memberNameList.get(0)+"处理中"; }else{ info = "待 "+memberNameList.get(0)+" 等"+memberNameList.size()+"人处理中"; info = "待"+memberNameList.get(0)+"等"+memberNameList.size()+"人处理中"; } //更新该业务数据的所有记录信息 noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda() @@ -1395,9 +1404,9 @@ notices.setParam5(memberNames); notices.setRemark(nextDealApprove.getMemberName()); if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){ notices.setInfo("待 "+memberNameList.get(0)+" 处理中"); notices.setInfo("待"+memberNameList.get(0)+"处理中"); }else{ notices.setInfo("待 "+memberNameList.get(0)+" 等"+memberNameList.size()+"人处理中"); notices.setInfo("待"+memberNameList.get(0)+"等"+memberNameList.size()+"人处理中"); } noticesJoinMapper.insert(newNotices); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -27,6 +27,7 @@ import java.util.Date; import java.util.List; import java.util.Objects; /** * 审批模版信息表Service实现 @@ -99,7 +100,7 @@ param.setType(Constants.formatIntegerNum(param.getType())); param.setAddrParam(Constants.formatIntegerNum(param.getAddrParam())); param.setDriverParam(Constants.formatIntegerNum(param.getDriverParam())); param.setApproveType(Constants.formatIntegerNum(param.getApproveType())); param.setApproveType(Objects.isNull(param.getApproveType())?Constants.TWO:param.getApproveType()); level ++ ; } //先清除原来所有的就陪配置 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -144,7 +144,7 @@ createNotices.setSendacopy(Constants.ZERO); createNotices.setParam2("0"); createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString()); createNotices.setInfo("待 "+member.getName()+" 处理"); createNotices.setInfo("待"+member.getName()+"处理"); noticesJoinMapper.insert(createNotices); //存储处理人的通知消息 @@ -163,7 +163,7 @@ notices.setStatus(Constants.ZERO); notices.setSendacopy(Constants.ZERO); notices.setReaded(Constants.ZERO); notices.setInfo("待 "+member.getName()+" 处理"); notices.setInfo("待"+member.getName()+"处理"); noticesJoinMapper.insert(notices); @@ -514,13 +514,13 @@ newNotices.setCreateDate(new Date()); newNotices.setParam2("0"); newNotices.setUserId(hiddenDanger.getCheckUserId()); newNotices.setInfo("待 "+member.getName()+" 处理"); newNotices.setInfo("待"+member.getName()+"处理"); noticesJoinMapper.insert(newNotices); notices.setStatus(Constants.ONE); notices.setParam2("3"); notices.setEditDate(new Date()); notices.setReaded(Constants.ONE); notices.setInfo("待 "+member.getName()+" 处理"); notices.setInfo("待"+member.getName()+"处理"); noticesJoinMapper.updateById(notices); } }
