Browse Source

面板回退列表;

v1.0
Yen 2 years ago
parent
commit
e0f13940d8
  1. 4
      src/main/java/com/qs/serve/common/config/JwtConfig.java
  2. 11
      src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
  3. 27
      src/main/java/com/qs/serve/modules/seeyon/entity/vo/TodoVO.java
  4. 19
      src/main/java/com/qs/serve/modules/seeyon/service/CommonCheckService.java
  5. 73
      src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java
  6. 7
      src/main/java/com/qs/serve/modules/third/PortalController.java

4
src/main/java/com/qs/serve/common/config/JwtConfig.java

@ -14,10 +14,10 @@ public class JwtConfig {
/**
* 单位分钟
*/
private final Integer expire = 60;
private final Integer expire = 7;
private final String iss = "KP_ISS";
private final String secret = "QiShenAa18n9VUcCxaSeSqLtFvsSCaRoVPKtBLaYxB0";
private final String secret = "QiShenAa18n9VUcCxaSeSqLtFvsSCaRoVPKtBLaYxB0123456";
}

11
src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java

@ -12,6 +12,8 @@ import com.qs.serve.modules.seeyon.entity.CtpAffair;
import com.qs.serve.modules.seeyon.entity.bo.CheckTargetDTO;
import com.qs.serve.modules.seeyon.entity.bo.SeeYonApproveQuery;
import com.qs.serve.modules.seeyon.entity.vo.SeeYonApproveDataVo;
import com.qs.serve.modules.seeyon.entity.vo.TodoVO;
import com.qs.serve.modules.seeyon.service.CommonCheckService;
import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
import com.qs.serve.modules.sys.entity.SysUser;
@ -51,6 +53,7 @@ public class SeeYonController {
private TzcPolicyService policyService;
private ProjectProperties projectProperties;
private TbsActivityService activityService;
private CommonCheckService commonCheckService;
/**
* 我的审批列表
@ -66,6 +69,14 @@ public class SeeYonController {
return listAllCha(query);
}
/**
* 我的审批退回列表
* @return
*/
@GetMapping("listMyCallback")
public R<List<TodoVO>> listCallbackList(){
return R.ok(commonCheckService.listCallbackList());
}
/**
* 重定向到审批页面

27
src/main/java/com/qs/serve/modules/seeyon/entity/vo/TodoVO.java

@ -0,0 +1,27 @@
package com.qs.serve.modules.seeyon.entity.vo;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author YenHex
* @since 2023/8/8
*/
@Data
public class TodoVO {
/** 类型 */
private String targetType;
private String targetCode;
private String targetId;
/** 标题 */
private String title;
/** 时间 */
private LocalDateTime time;
}

19
src/main/java/com/qs/serve/modules/seeyon/service/CommonCheckService.java

@ -0,0 +1,19 @@
package com.qs.serve.modules.seeyon.service;
import com.qs.serve.modules.seeyon.entity.vo.TodoVO;
import java.util.List;
/**
* 通用的审批服务
* @author YenHex
* @since 2023/8/8
*/
public interface CommonCheckService {
/**
* 退回列表
* @return
*/
List<TodoVO> listCallbackList();
}

73
src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java

@ -0,0 +1,73 @@
package com.qs.serve.modules.seeyon.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.util.AuthContextUtils;
import com.qs.serve.modules.seeyon.entity.vo.TodoVO;
import com.qs.serve.modules.seeyon.service.CommonCheckService;
import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsCostApplyState;
import com.qs.serve.modules.tbs.entity.TbsCostApply;
import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
import com.qs.serve.modules.tzc.common.TzcPolicyStatus;
import com.qs.serve.modules.tzc.entity.TzcPolicy;
import com.qs.serve.modules.tzc.service.TzcPolicyService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author YenHex
* @since 2023/8/8
*/
@Slf4j
@Service
@AllArgsConstructor
public class CommonCheckServiceImpl implements CommonCheckService {
private final SysUserService sysUserService;
private final TbsCostApplyMapper costApplyMapper;
private final TzcPolicyService tzcPolicyService;
@Override
public List<TodoVO> listCallbackList() {
String userId = AuthContextUtils.getSysUserId();
//费用
LambdaQueryWrapper<TbsCostApply> costLqw = new LambdaQueryWrapper<>();
costLqw.eq(TbsCostApply::getUserId,userId);
costLqw.eq(TbsCostApply::getChargeState, TbsCostApplyState.State_4_refused.getCode());
List<TbsCostApply> costApplyList = costApplyMapper.selectList(costLqw);
List<TodoVO> todoCostList = costApplyList.stream().map(obj -> {
TodoVO todo = new TodoVO();
todo.setTargetType("CostBill");
todo.setTargetId(obj.getId()+"");
todo.setTargetCode(obj.getCode());
todo.setTitle(obj.getChargeTheme());
todo.setTime(obj.getCreateTime());
return todo;
}).collect(Collectors.toList());
//政策
LambdaQueryWrapper<TzcPolicy> policyLqw = new LambdaQueryWrapper<>();
policyLqw.eq(TzcPolicy::getUserId, userId);
policyLqw.eq(TzcPolicy::getPolicyStatus, TzcPolicyStatus.Status_4_RollBack);
List<TzcPolicy> policyList = tzcPolicyService.list(policyLqw);
List<TodoVO> todoPolicyList = policyList.stream().map(obj -> {
TodoVO todo = new TodoVO();
todo.setTargetType("ReleasePolicy");
todo.setTargetId(obj.getId()+"");
todo.setTargetCode(obj.getPolicyCode());
todo.setTitle(obj.getTitle());
todo.setTime(obj.getCreateTime());
return todo;
}).collect(Collectors.toList());
List<TodoVO> result = new ArrayList<>();
result.addAll(todoCostList);
result.addAll(todoPolicyList);
return result;
}
}

7
src/main/java/com/qs/serve/modules/third/PortalController.java

@ -47,9 +47,12 @@ public class PortalController {
@SysLog(title = "人员",desc = "单点登陆",biz = BizType.LOGIN)
@PostMapping("/ssoLogin")
public R<?> ssoLogin(@RequestBody SSOLoginParam ssoLoginParam, HttpServletRequest request){
ThirdTokenUtil.checkToken(request);
//ThirdTokenUtil.checkToken(request);
String vToken = request.getHeader("v-token");
if(!vToken.equals("jslcrm2282125")){
return R.error("Invalid v-token");
}
String host = "https://crm.gdjsl.com";
//String host = "http://192.168.0.9:6036/";
if(StringUtils.hasText(ssoLoginParam.getRewriteHost())){
host = ssoLoginParam.getRewriteHost();
}

Loading…
Cancel
Save