Browse Source

积分代码迁移

feature/user_house_import
wanggongfeng 4 years ago
parent
commit
092c57bbbf
  1. 15
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
  2. 10
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
  3. 3
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/UserPointsVerificationServiceImpl.java
  4. 8
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
  5. 2
      epdc-cloud-client-yushan

15
epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@ -35,21 +35,6 @@ public class ApiWorkUserController {
@Autowired @Autowired
private WorkUserService workUserService; private WorkUserService workUserService;
/**
* 工作端-核销记录
*
* @param formDto 表单
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO>>
* @author Liuchuang
* @since 2021/1/19 17:00
*/
@GetMapping("verificationlogs")
public Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return workUserService.listOfVerificationLogs(formDto);
}
/** /**
* 工作端-获取token * 工作端-获取token
* *

10
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@ -21,16 +21,6 @@ import java.util.List;
*/ */
public interface WorkUserService { public interface WorkUserService {
/**
* 工作端-核销记录
*
* @param formDto 表单
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
* @author Liuchuang
* @since 2021/1/19 17:41
*/
Result<EpdcVerificationLogsResultDTO> listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto);
/** /**
* 工作端-获取token * 工作端-获取token
* *

3
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/UserPointsVerificationServiceImpl.java

@ -1,5 +1,6 @@
package com.elink.esua.epdc.service.impl; package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsVerificationCheckFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsVerificationCheckFormDTO;
@ -15,6 +16,7 @@ import com.elink.esua.epdc.modules.points.feign.PointsFeignClient;
import com.elink.esua.epdc.modules.points.feign.WorkPointsFeignClient; import com.elink.esua.epdc.modules.points.feign.WorkPointsFeignClient;
import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO; import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
import com.elink.esua.epdc.service.UserPointsVerificationService; import com.elink.esua.epdc.service.UserPointsVerificationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -27,6 +29,7 @@ import java.util.List;
* @since 2021/1/19 10:49 * @since 2021/1/19 10:49
*/ */
@Service @Service
@Slf4j
public class UserPointsVerificationServiceImpl implements UserPointsVerificationService { public class UserPointsVerificationServiceImpl implements UserPointsVerificationService {
@Autowired @Autowired

8
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@ -70,14 +70,6 @@ public class WorkUserServiceImpl implements WorkUserService {
@Autowired @Autowired
private WorkItemService workItemService; private WorkItemService workItemService;
@Autowired
private WorkPointsFeignClient workPointsFeignClient;
@Override
public Result<EpdcVerificationLogsResultDTO> listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
log.info("+++++++++++++++++++++SecurityUser.getDeptId():"+ SecurityUser.getDeptId());
return workPointsFeignClient.verificationLogs(formDto);
}
@Override @Override
public Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) { public Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) {
// 获取openId // 获取openId

2
epdc-cloud-client-yushan

@ -1 +1 @@
Subproject commit 492bcbd6a6d79fd19c7e1cd924d6a4a958cbee7c Subproject commit c8919c0138cc614ccd30b1d50cde3aa0012ec084
Loading…
Cancel
Save