diff --git a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index d62c41b2c4..d0a61aa757 100644 --- a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -6,8 +6,8 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; +import com.epmet.dto.result.StaffLatestAgencyResultDTO; import com.epmet.feign.fallback.EpmetUserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -85,8 +85,8 @@ public interface EpmetUserFeignClient { * @Description 获取当前微信上次登录的账号信息 * @Date 2020/4/20 12:53 **/ - @GetMapping(value = "epmetuser/staffloginhistory/getlatest/{openId}") - Result getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId); + @GetMapping(value = "epmetuser/staffagencyhistory/getlatest/{openId}") + Result getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId); /** * @param customerStaffFormDTO @@ -105,6 +105,6 @@ public interface EpmetUserFeignClient { * @Description 保存登录日志 * @Date 2020/4/20 14:38 **/ - @PostMapping(value = "epmetuser/staffloginhistory/saveStaffLoginRecord", consumes = MediaType.APPLICATION_JSON_VALUE) - Result saveStaffLoginRecord(StaffLoginHistoryFormDTO staffLoginHistoryFormDTO); + @PostMapping(value = "epmetuser/staffagencyhistory/saveStaffLoginRecord", consumes = MediaType.APPLICATION_JSON_VALUE) + Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO staffLoginHistoryFormDTO); } diff --git a/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java index 571785b43f..b08fcbca1a 100644 --- a/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java +++ b/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java @@ -7,8 +7,8 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; +import com.epmet.dto.result.StaffLatestAgencyResultDTO; import com.epmet.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -48,7 +48,7 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { } @Override - public Result getLatestStaffWechatLoginRecord(String openId) { + public Result getLatestStaffWechatLoginRecord(String openId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestStaffWechatLoginRecord", openId); } @@ -58,7 +58,7 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { } @Override - public Result saveStaffLoginRecord(StaffLoginHistoryFormDTO staffLoginHistoryFormDTO) { + public Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO staffLoginHistoryFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveStaffLoginRecord", staffLoginHistoryFormDTO); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 5f6480ef2c..d8ebf53c1e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -122,57 +122,55 @@ public class GovLoginServiceImpl implements GovLoginService { public Result loginByWxCode(GovWxmpFormDTO formDTO) { //1、解析微信用户 WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(formDTO.getApp(), formDTO.getWxCode()); - Result latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid()); + Result latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid()); if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) { logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg())); return new Result().error(EpmetErrorCode.PLEASE_LOGIN.getCode()); } - LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO = latestStaffWechat.getData(); + StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData(); //2、记录staff_wechat - this.savestaffwechat(latestStaffWechatLoginDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid()); + this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid()); //3、记录登录日志 - this.saveStaffLoginRecord(latestStaffWechatLoginDTO); + this.saveStaffLoginRecord(staffLatestAgencyResultDTO); //4、获取用户token - String token = this.generateGovWxmpToken(latestStaffWechatLoginDTO.getStaffId()); + String token = this.generateGovWxmpToken(staffLatestAgencyResultDTO.getStaffId()); //5、保存到redis - this.saveLatestGovTokenDto(latestStaffWechatLoginDTO, wxMaJscode2SessionResult, token); + this.saveLatestGovTokenDto(staffLatestAgencyResultDTO, wxMaJscode2SessionResult, token); UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); return new Result().ok(userTokenResultDTO); } //保存tokenDto到redis - private void saveLatestGovTokenDto(LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO, + private void saveLatestGovTokenDto(StaffLatestAgencyResultDTO staffLatestAgency, WxMaJscode2SessionResult wxMaJscode2SessionResult, String token) { int expire = jwtTokenProperties.getExpire(); GovTokenDto govTokenDto = new GovTokenDto(); govTokenDto.setApp(LoginConstant.APP_GOV); govTokenDto.setClient(LoginConstant.CLIENT_WXMP); - govTokenDto.setStaffId(latestStaffWechatLoginDTO.getStaffId()); + govTokenDto.setStaffId(staffLatestAgency.getStaffId()); govTokenDto.setOpenId(wxMaJscode2SessionResult.getOpenid()); govTokenDto.setSessionKey(wxMaJscode2SessionResult.getSessionKey()); govTokenDto.setUnionId(wxMaJscode2SessionResult.getUnionid()); govTokenDto.setToken(token); govTokenDto.setUpdateTime(System.currentTimeMillis()); govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime()); - govTokenDto.setOrgId(latestStaffWechatLoginDTO.getOrgId()); - govTokenDto.setGridId(latestStaffWechatLoginDTO.getGridId()); - govTokenDto.setCustomerId(latestStaffWechatLoginDTO.getCustomerId()); + govTokenDto.setOrgId(staffLatestAgency.getOrgId()); + govTokenDto.setCustomerId(staffLatestAgency.getCustomerId()); cpUserDetailRedis.set(govTokenDto, expire); logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss")); } //保存登录日志 - private Result saveStaffLoginRecord(LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO) { - StaffLoginHistoryFormDTO staffLoginHistoryFormDTO = new StaffLoginHistoryFormDTO(); - staffLoginHistoryFormDTO.setCustomerId(latestStaffWechatLoginDTO.getCustomerId()); - staffLoginHistoryFormDTO.setStaffId(latestStaffWechatLoginDTO.getStaffId()); - staffLoginHistoryFormDTO.setWxOpenId(latestStaffWechatLoginDTO.getWxOpenId()); - staffLoginHistoryFormDTO.setMobile(latestStaffWechatLoginDTO.getMobile()); - staffLoginHistoryFormDTO.setOrgId(latestStaffWechatLoginDTO.getOrgId()); - staffLoginHistoryFormDTO.setGridId(latestStaffWechatLoginDTO.getGridId()); - Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginHistoryFormDTO); + private Result saveStaffLoginRecord(StaffLatestAgencyResultDTO latestStaffWechatLoginDTO) { + StaffLoginAgencyRecordFormDTO staffLoginAgencyRecordFormDTO = new StaffLoginAgencyRecordFormDTO(); + staffLoginAgencyRecordFormDTO.setCustomerId(latestStaffWechatLoginDTO.getCustomerId()); + staffLoginAgencyRecordFormDTO.setStaffId(latestStaffWechatLoginDTO.getStaffId()); + staffLoginAgencyRecordFormDTO.setWxOpenId(latestStaffWechatLoginDTO.getWxOpenId()); + staffLoginAgencyRecordFormDTO.setMobile(latestStaffWechatLoginDTO.getMobile()); + staffLoginAgencyRecordFormDTO.setOrgId(latestStaffWechatLoginDTO.getOrgId()); + Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginAgencyRecordFormDTO); return staffLoginRecordResult; } @@ -199,7 +197,7 @@ public class GovLoginServiceImpl implements GovLoginService { //1、获取用户token String token = this.generateGovWxmpToken(customerStaff.getUserId()); //2、保存到redis - this.saveGovTokenDto(formDTO.getOrgId(), formDTO.getCustomerId(), latestGridInfo.getGridId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token); + this.saveGovTokenDto(formDTO.getOrgId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token); UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); return new Result().ok(userTokenResultDTO); @@ -220,14 +218,14 @@ public class GovLoginServiceImpl implements GovLoginService { //保存登录日志 private Result saveStaffLoginRecord(GovWxmpEnteOrgFormDTO formDTO, String staffId, String openId, String grid) { - StaffLoginHistoryFormDTO staffLoginHistoryFormDTO = new StaffLoginHistoryFormDTO(); - staffLoginHistoryFormDTO.setCustomerId(formDTO.getCustomerId()); - staffLoginHistoryFormDTO.setStaffId(staffId); - staffLoginHistoryFormDTO.setWxOpenId(openId); - staffLoginHistoryFormDTO.setMobile(formDTO.getMobile()); - staffLoginHistoryFormDTO.setOrgId(formDTO.getOrgId()); - staffLoginHistoryFormDTO.setGridId(grid); - Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginHistoryFormDTO); + StaffLoginAgencyRecordFormDTO staffLoginAgencyRecordFormDTO = new StaffLoginAgencyRecordFormDTO(); + staffLoginAgencyRecordFormDTO.setCustomerId(formDTO.getCustomerId()); + staffLoginAgencyRecordFormDTO.setStaffId(staffId); + staffLoginAgencyRecordFormDTO.setWxOpenId(openId); + staffLoginAgencyRecordFormDTO.setMobile(formDTO.getMobile()); + staffLoginAgencyRecordFormDTO.setOrgId(formDTO.getOrgId()); + staffLoginAgencyRecordFormDTO.setGridId(grid); + Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginAgencyRecordFormDTO); return staffLoginRecordResult; } @@ -267,7 +265,6 @@ public class GovLoginServiceImpl implements GovLoginService { **/ private void saveGovTokenDto(String orgId, String customerId, - String gridId, String staffId, WxMaJscode2SessionResult wxMaJscode2SessionResult, String token) { @@ -283,7 +280,6 @@ public class GovLoginServiceImpl implements GovLoginService { govTokenDto.setUpdateTime(System.currentTimeMillis()); govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime()); govTokenDto.setOrgId(orgId); - govTokenDto.setGridId(gridId); govTokenDto.setCustomerId(customerId); cpUserDetailRedis.set(govTokenDto, expire); logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss")); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 8163a30c15..b9c8f8672f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -28,9 +28,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.form.StaffGridInfoFormDTO; +import com.epmet.dto.form.StaffLatestLoginGridFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.StaffGridInfoResultDTO; +import com.epmet.dto.result.StaffLatestLoginGridResultDTO; import com.epmet.excel.CustomerGridExcel; import com.epmet.service.CustomerGridService; import org.springframework.beans.factory.annotation.Autowired; @@ -135,7 +135,7 @@ public class CustomerGridController { * @Date 2020/4/20 15:34 **/ @PostMapping(value = "getStaffGridInfo") - public Result> getStaffGridInfo(@RequestBody StaffGridInfoFormDTO staffGridInfoFormDTO) { + public Result getStaffGridInfo(@RequestBody StaffLatestLoginGridFormDTO staffGridInfoFormDTO) { ValidatorUtils.validateEntity(staffGridInfoFormDTO); return customerGridService.listStaffGridInfo(staffGridInfoFormDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index b42077b396..d8c308ec90 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -21,9 +21,9 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.form.StaffGridInfoFormDTO; +import com.epmet.dto.form.StaffLatestLoginGridFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.StaffGridInfoResultDTO; +import com.epmet.dto.result.StaffLatestLoginGridResultDTO; import com.epmet.entity.CustomerGridEntity; import org.apache.ibatis.annotations.Mapper; @@ -70,5 +70,5 @@ public interface CustomerGridDao extends BaseDao { * @Description 查询工作人员绑定的网格列表 * @Date 2020/4/20 15:36 **/ - List selectListStaffGridInfo(StaffGridInfoFormDTO staffGridInfoFormDTO); + List selectListStaffGridInfo(StaffLatestLoginGridFormDTO staffGridInfoFormDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index d8728c39dd..7b48c8724d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -23,9 +23,9 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.form.StaffGridInfoFormDTO; +import com.epmet.dto.form.StaffLatestLoginGridFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.StaffGridInfoResultDTO; +import com.epmet.dto.result.StaffLatestLoginGridResultDTO; import com.epmet.entity.CustomerGridEntity; import java.util.List; @@ -123,5 +123,5 @@ public interface CustomerGridService extends BaseService { * @Description 根据用户选择的组织，查询用户与网格的关系列表 * @Date 2020/4/20 15:35 **/ - Result> listStaffGridInfo(StaffGridInfoFormDTO staffGridInfoFormDTO); + Result listStaffGridInfo(StaffLatestLoginGridFormDTO staffGridInfoFormDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index d4e61df8b1..b27f57019f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -20,19 +20,18 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CustomerGridDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.form.StaffGridInfoFormDTO; +import com.epmet.dto.form.StaffLatestLoginGridFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.StaffGridInfoResultDTO; +import com.epmet.dto.result.StaffLatestLoginGridResultDTO; import com.epmet.entity.CustomerGridEntity; - import com.epmet.redis.CustomerGridRedis; import com.epmet.service.CustomerGridService; import com.epmet.util.ModuleConstant; @@ -155,9 +154,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl> listStaffGridInfo(StaffGridInfoFormDTO staffGridInfoFormDTO) { - List list = baseDao.selectListStaffGridInfo(staffGridInfoFormDTO); - return new Result>().ok(list); + public Result listStaffGridInfo(StaffLatestLoginGridFormDTO staffGridInfoFormDTO) { + List list = baseDao.selectListStaffGridInfo(staffGridInfoFormDTO); + if(null!=list&&list.size()>0){ + return new Result().ok(list.get(0)); + } + return new Result<>(); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 6ea3950fb8..5fa9468faa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -94,7 +94,7 @@ - SELECT csg.GRID_ID, cg.CUSTOMER_ID, diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginHistoryFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginAgencyRecordFormDTO.java similarity index 89% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginHistoryFormDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginAgencyRecordFormDTO.java index 14a205d032..c4fe580a11 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginHistoryFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginAgencyRecordFormDTO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * @Date 2020/4/20 14:26 */ @Data -public class StaffLoginHistoryFormDTO implements Serializable { +public class StaffLoginAgencyRecordFormDTO implements Serializable { /** * 客户ID */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestStaffWechatLoginResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffLatestAgencyResultDTO.java similarity index 80% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestStaffWechatLoginResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffLatestAgencyResultDTO.java index 5ad4ebde86..4b006dd8e6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestStaffWechatLoginResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffLatestAgencyResultDTO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * @Date 2020/4/20 12:23 */ @Data -public class LatestStaffWechatLoginResultDTO implements Serializable { +public class StaffLatestAgencyResultDTO implements Serializable { private static final long serialVersionUID = -7088774184276785902L; /** @@ -37,10 +37,5 @@ public class LatestStaffWechatLoginResultDTO implements Serializable { * 组织机构id */ private String orgId; - - /** - * 网格表Id (CUSTOMER_GRID.id) - */ - private String gridId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffLoginHistoryController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java similarity index 68% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffLoginHistoryController.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java index 08c8e02c94..aa1a81426f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffLoginHistoryController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java @@ -18,25 +18,26 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.StaffLoginHistoryFormDTO; -import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; -import com.epmet.service.StaffLoginHistoryService; +import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO; +import com.epmet.dto.result.StaffLatestAgencyResultDTO; +import com.epmet.service.StaffAgencyHistoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** - * 工作人员登录日志表 + * 工作人员登录组织日志表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-04-20 */ @RestController -@RequestMapping("staffloginhistory") -public class StaffLoginHistoryController { +@RequestMapping("staffagencyhistory") +public class StaffAgencyHistoryController { @Autowired - private StaffLoginHistoryService staffLoginHistoryService; + private StaffAgencyHistoryService staffAgencyHistoryService; + /** * @param openId @@ -46,8 +47,8 @@ public class StaffLoginHistoryController { * @Date 2020/4/20 12:42 **/ @GetMapping(value = "getlatest/{openId}") - public Result getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId) { - return staffLoginHistoryService.getLatestStaffWechatLoginRecord(openId); + public Result getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId) { + return staffAgencyHistoryService.getLatestStaffWechatLoginRecord(openId); } /** @@ -58,7 +59,7 @@ public class StaffLoginHistoryController { * @Date 2020/4/20 14:29 **/ @PostMapping(value = "saveStaffLoginRecord") - public Result saveStaffLoginRecord(@RequestBody StaffLoginHistoryFormDTO formDTO) { - return staffLoginHistoryService.saveStaffLoginRecord(formDTO); + public Result saveStaffLoginRecord(@RequestBody StaffLoginAgencyRecordFormDTO formDTO) { + return staffAgencyHistoryService.saveStaffLoginRecord(formDTO); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffLoginHistoryDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java similarity index 78% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffLoginHistoryDao.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java index 1458be2a28..0e6739ad58 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffLoginHistoryDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java @@ -18,25 +18,24 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; -import com.epmet.entity.StaffLoginHistoryEntity; +import com.epmet.dto.result.StaffLatestAgencyResultDTO; +import com.epmet.entity.StaffAgencyHistoryEntity; import org.apache.ibatis.annotations.Mapper; /** - * 工作人员登录日志表 + * 工作人员登录组织日志表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-04-20 */ @Mapper -public interface StaffLoginHistoryDao extends BaseDao { - +public interface StaffAgencyHistoryDao extends BaseDao { /** - * @return com.epmet.dto.result.LatestStaffWechatLoginDTO * @param openId + * @return com.epmet.dto.result.LatestStaffWechatLoginDTO * @Author yinzuomei * @Description 获取当前微信上次登录的账号信息 * @Date 2020/4/20 12:45 **/ - LatestStaffWechatLoginResultDTO selectLatestStaffWechatLoginRecord(String openId); + StaffLatestAgencyResultDTO selectLatestStaffWechatLoginRecord(String openId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffLoginHistoryService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java similarity index 71% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffLoginHistoryService.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java index fab2c9f20e..413c555f7d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffLoginHistoryService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java @@ -20,51 +20,51 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.StaffLoginHistoryDTO; -import com.epmet.dto.form.StaffLoginHistoryFormDTO; -import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; -import com.epmet.entity.StaffLoginHistoryEntity; +import com.epmet.dto.StaffAgencyHistoryDTO; +import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO; +import com.epmet.dto.result.StaffLatestAgencyResultDTO; +import com.epmet.entity.StaffAgencyHistoryEntity; import java.util.List; import java.util.Map; /** - * 工作人员登录日志表 + * 工作人员登录组织日志表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-04-20 */ -public interface StaffLoginHistoryService extends BaseService { +public interface StaffAgencyHistoryService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2020-04-20 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2020-04-20 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return StaffLoginHistoryDTO + * @return StaffAgencyHistoryDTO * @author generator * @date 2020-04-20 */ - StaffLoginHistoryDTO get(String id); + StaffAgencyHistoryDTO get(String id); /** * 默认保存 @@ -74,7 +74,7 @@ public interface StaffLoginHistoryService extends BaseService @@ -103,7 +104,7 @@ public interface StaffLoginHistoryService extends BaseService getLatestStaffWechatLoginRecord(String openId); + Result getLatestStaffWechatLoginRecord(String openId); /** * @param formDTO @@ -112,5 +113,5 @@ public interface StaffLoginHistoryService extends BaseService implements StaffLoginHistoryService { - private static final Logger logger = LoggerFactory.getLogger(StaffLoginHistoryServiceImpl.class); +public class StaffAgencyHistoryServiceImpl extends BaseServiceImpl implements StaffAgencyHistoryService { + private static final Logger logger = LoggerFactory.getLogger(StaffAgencyHistoryServiceImpl.class); + @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, StaffLoginHistoryDTO.class); + return getPageData(page, StaffAgencyHistoryDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, StaffLoginHistoryDTO.class); + return ConvertUtils.sourceToTarget(entityList, StaffAgencyHistoryDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public StaffLoginHistoryDTO get(String id) { - StaffLoginHistoryEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, StaffLoginHistoryDTO.class); + public StaffAgencyHistoryDTO get(String id) { + StaffAgencyHistoryEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, StaffAgencyHistoryDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(StaffLoginHistoryDTO dto) { - StaffLoginHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffLoginHistoryEntity.class); + public void save(StaffAgencyHistoryDTO dto) { + StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyHistoryEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(StaffLoginHistoryDTO dto) { - StaffLoginHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffLoginHistoryEntity.class); + public void update(StaffAgencyHistoryDTO dto) { + StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyHistoryEntity.class); updateById(entity); } @@ -102,20 +103,19 @@ public class StaffLoginHistoryServiceImpl extends BaseServiceImpl getLatestStaffWechatLoginRecord(String openId) { + public Result getLatestStaffWechatLoginRecord(String openId) { if (StringUtils.isNotBlank(openId)) { logger.error("openId 不能为空"); return new Result(); } - LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO = baseDao.selectLatestStaffWechatLoginRecord(openId); - return new Result().ok(latestStaffWechatLoginDTO); + StaffLatestAgencyResultDTO latestStaffWechatLoginDTO = baseDao.selectLatestStaffWechatLoginRecord(openId); + return new Result().ok(latestStaffWechatLoginDTO); } @Override - public Result saveStaffLoginRecord(StaffLoginHistoryFormDTO formDTO) { - StaffLoginHistoryEntity entity = ConvertUtils.sourceToTarget(formDTO, StaffLoginHistoryEntity.class); + public Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO) { + StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(formDTO, StaffAgencyHistoryEntity.class); insert(entity); return new Result(); } - } \ No newline at end of file