From b10cb1880a220688ec6fd129045e98c8ea22ffd9 Mon Sep 17 00:00:00 2001 From: kangxiaoshan <475914010@qq.com> Date: Mon, 29 Jul 2019 11:09:16 +0800 Subject: [PATCH] v1.3 --- src/main/java/adi/controller/ADIAccountController.java | 6 +++--- src/main/java/common/controller/ContractController.java | 4 ++-- src/main/java/common/service/AccountCommonService.java | 8 ++++++++ src/main/java/common/service/AccountService.java | 8 -------- src/main/java/common/service/impl/AccountCommonServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/main/java/common/service/impl/AccountServiceImpl.java | 45 --------------------------------------------- src/main/java/dmp/controller/DmpAccountController.java | 6 +++--- 7 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 src/main/java/common/service/AccountCommonService.java delete mode 100644 src/main/java/common/service/AccountService.java create mode 100644 src/main/java/common/service/impl/AccountCommonServiceImpl.java delete mode 100644 src/main/java/common/service/impl/AccountServiceImpl.java diff --git a/src/main/java/adi/controller/ADIAccountController.java b/src/main/java/adi/controller/ADIAccountController.java index ff90b60..a12fad1 100644 --- a/src/main/java/adi/controller/ADIAccountController.java +++ b/src/main/java/adi/controller/ADIAccountController.java @@ -4,7 +4,7 @@ package adi.controller; import adi.model.ADIUser; import adi.service.ADIAccountService; import common.model.*; -import common.service.AccountService; +import common.service.AccountCommonService; import dic.OperateObjectTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -30,7 +30,7 @@ public class ADIAccountController { ADIAccountService tkioAccountService; @Autowired - AccountService accountService; + AccountCommonService accountCommonService; //sale @RequestMapping(value = "/findSale", method = RequestMethod.GET) @ResponseBody @@ -71,7 +71,7 @@ public class ADIAccountController { // if(null == account4Web){ // return ResultModel.ERROR(ResultStatus.USER_EMPTY); // } - return ResultModel.OK(accountService.findOne("adi",email)); + return ResultModel.OK(accountCommonService.findOne("adi",email)); } @RequestMapping(value = "/find/reminderlevel", method = RequestMethod.GET) @ResponseBody diff --git a/src/main/java/common/controller/ContractController.java b/src/main/java/common/controller/ContractController.java index d63a551..5cf80c3 100644 --- a/src/main/java/common/controller/ContractController.java +++ b/src/main/java/common/controller/ContractController.java @@ -75,10 +75,10 @@ public class ContractController { return ResultModel.OK(service.findAll(loginAccount,startDate, endDate, platform,contractId)); } - @RequestMapping(value = "findOne", method = RequestMethod.GET) + @RequestMapping(value = "contractid/find", method = RequestMethod.GET) @ResponseBody public ResultModel findOne(@CurrentAccount User loginAccount, @PathVariable String platform, - @RequestParam String startDate, @RequestParam String endDate,String contractId) { + String startDate, String endDate,String contractId) { return ResultModel.OK(service.findOne(loginAccount,startDate, endDate, platform,contractId)); } diff --git a/src/main/java/common/service/AccountCommonService.java b/src/main/java/common/service/AccountCommonService.java new file mode 100644 index 0000000..94b1f25 --- /dev/null +++ b/src/main/java/common/service/AccountCommonService.java @@ -0,0 +1,8 @@ +package common.service; + + +import common.model.Account4Web; + +public interface AccountCommonService { + Account4Web findOne(String dmp, String email); +} diff --git a/src/main/java/common/service/AccountService.java b/src/main/java/common/service/AccountService.java deleted file mode 100644 index 0f7468d..0000000 --- a/src/main/java/common/service/AccountService.java +++ /dev/null @@ -1,8 +0,0 @@ -package common.service; - - -import common.model.Account4Web; - -public interface AccountService { - Account4Web findOne(String dmp, String email); -} diff --git a/src/main/java/common/service/impl/AccountCommonServiceImpl.java b/src/main/java/common/service/impl/AccountCommonServiceImpl.java new file mode 100644 index 0000000..fd36b84 --- /dev/null +++ b/src/main/java/common/service/impl/AccountCommonServiceImpl.java @@ -0,0 +1,45 @@ +package common.service.impl; + +import common.model.Account4Web; +import common.model.Contract; +import common.model.PackageBase; +import common.repository.ContractRepository; +import common.repository.PackageBaseRepository; +import common.service.AccountCommonService; +import office.model.BussinessMan; +import office.repository.BussinessManRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class AccountCommonServiceImpl implements AccountCommonService { + + + @Autowired + ContractRepository contractRepository; + + @Autowired + BussinessManRepository bussinessManRepository; + + @Autowired + PackageBaseRepository packageBaseRepository; + + @Override + public Account4Web findOne(String platgorm, String email) { + + List<Contract> contract = contractRepository.findByPlatformAndEmailStatus(platgorm, email, 1); + Account4Web account4Web = new Account4Web(); + Contract thecontract = contract.get(0); + + PackageBase packageBase = packageBaseRepository.findOne(thecontract.getPriceLevel()); + account4Web.setPackageType(packageBase.getPackageName()); + + BussinessMan bussinessMan = bussinessManRepository.findOne(thecontract.getSale()); + account4Web.setSaleName(bussinessMan.getName()); + + return account4Web; + } +} diff --git a/src/main/java/common/service/impl/AccountServiceImpl.java b/src/main/java/common/service/impl/AccountServiceImpl.java deleted file mode 100644 index fa69822..0000000 --- a/src/main/java/common/service/impl/AccountServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package common.service.impl; - -import common.model.Account4Web; -import common.model.Contract; -import common.model.PackageBase; -import common.repository.ContractRepository; -import common.repository.PackageBaseRepository; -import common.service.AccountService; -import office.model.BussinessMan; -import office.repository.BussinessManRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - - -@Service -public class AccountServiceImpl implements AccountService { - - - @Autowired - ContractRepository contractRepository; - - @Autowired - BussinessManRepository bussinessManRepository; - - @Autowired - PackageBaseRepository packageBaseRepository; - - @Override - public Account4Web findOne(String platgorm, String email) { - - List<Contract> contract = contractRepository.findByPlatformAndEmailStatus(platgorm, email, 1); - Account4Web account4Web = new Account4Web(); - Contract thecontract = contract.get(0); - - PackageBase packageBase = packageBaseRepository.findOne(thecontract.getPriceLevel()); - account4Web.setPackageType(packageBase.getPackageName()); - - BussinessMan bussinessMan = bussinessManRepository.findOne(thecontract.getSale()); - account4Web.setSaleName(bussinessMan.getName()); - - return account4Web; - } -} diff --git a/src/main/java/dmp/controller/DmpAccountController.java b/src/main/java/dmp/controller/DmpAccountController.java index 19ef00e..829c94b 100644 --- a/src/main/java/dmp/controller/DmpAccountController.java +++ b/src/main/java/dmp/controller/DmpAccountController.java @@ -3,7 +3,7 @@ package dmp.controller; import common.model.Account4Web; import common.model.User; -import common.service.AccountService; +import common.service.AccountCommonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -21,7 +21,7 @@ public class DmpAccountController { @Autowired - AccountService accountService; + AccountCommonService accountCommonService; //功能使用查询 @@ -46,6 +46,6 @@ public class DmpAccountController { @ResponseBody public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) { - return ResultModel.OK(accountService.findOne("dmp",email)); + return ResultModel.OK(accountCommonService.findOne("dmp",email)); } } -- libgit2 0.27.1