elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

删除staff_login_history，改为staff_agency_history

dev_shibei_match
yinzuomei 5 years ago
parent
84614c5a14
commit
aa2c0d1ab7
14 changed files with 121 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  2. 6
      epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
  3. 58
      epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
  4. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
  5. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  6. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  7. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  8. 2
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  9. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginAgencyRecordFormDTO.java
  10. 7
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffLatestAgencyResultDTO.java
  11. 23
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java
  12. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java
  13. 33
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java
  14. 60
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyHistoryServiceImpl.java

10
epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
View File

@ -6,8 +6,8 @@ import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.UserDTO; import com.epmet.dto.UserDTO;
import com.epmet.dto.UserWechatDTO; import com.epmet.dto.UserWechatDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.LatestStaffWechatLoginResultDTO;
import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
import com.epmet.dto.result.StaffLatestAgencyResultDTO;
import com.epmet.feign.fallback.EpmetUserFeignClientFallback; import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -85,8 +85,8 @@ public interface EpmetUserFeignClient {
* @Description 获取当前微信上次登录的账号信息 * @Description 获取当前微信上次登录的账号信息
* @Date 2020/4/20 12:53 * @Date 2020/4/20 12:53
**/ **/
@GetMapping(value = "epmetuser/staffloginhistory/getlatest/{openId}") @GetMapping(value = "epmetuser/staffagencyhistory/getlatest/{openId}")
Result<LatestStaffWechatLoginResultDTO> getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId); Result<StaffLatestAgencyResultDTO> getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId);
/** /**
* @param customerStaffFormDTO * @param customerStaffFormDTO
@ -105,6 +105,6 @@ public interface EpmetUserFeignClient {
* @Description 保存登录日志 * @Description 保存登录日志
* @Date 2020/4/20 14:38 * @Date 2020/4/20 14:38
**/ **/
@PostMapping(value = "epmetuser/staffloginhistory/saveStaffLoginRecord", consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = "epmetuser/staffagencyhistory/saveStaffLoginRecord", consumes = MediaType.APPLICATION_JSON_VALUE)
Result saveStaffLoginRecord(StaffLoginHistoryFormDTO staffLoginHistoryFormDTO); Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO staffLoginHistoryFormDTO);
} }

6
epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
View File

@ -7,8 +7,8 @@ import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.UserDTO; import com.epmet.dto.UserDTO;
import com.epmet.dto.UserWechatDTO; import com.epmet.dto.UserWechatDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.LatestStaffWechatLoginResultDTO;
import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
import com.epmet.dto.result.StaffLatestAgencyResultDTO;
import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.EpmetUserFeignClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -48,7 +48,7 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
} }
@Override @Override
public Result<LatestStaffWechatLoginResultDTO> getLatestStaffWechatLoginRecord(String openId) { public Result<StaffLatestAgencyResultDTO> getLatestStaffWechatLoginRecord(String openId) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestStaffWechatLoginRecord", openId); return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestStaffWechatLoginRecord", openId);
} }
@ -58,7 +58,7 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
} }
@Override @Override
public Result saveStaffLoginRecord(StaffLoginHistoryFormDTO staffLoginHistoryFormDTO) { public Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO staffLoginHistoryFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveStaffLoginRecord", staffLoginHistoryFormDTO); return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveStaffLoginRecord", staffLoginHistoryFormDTO);
} }

58
epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
View File

@ -122,57 +122,55 @@ public class GovLoginServiceImpl implements GovLoginService {
public Result<UserTokenResultDTO> loginByWxCode(GovWxmpFormDTO formDTO) { public Result<UserTokenResultDTO> loginByWxCode(GovWxmpFormDTO formDTO) {
//1、解析微信用户 //1、解析微信用户
WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(formDTO.getApp(), formDTO.getWxCode()); WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(formDTO.getApp(), formDTO.getWxCode());
Result<LatestStaffWechatLoginResultDTO> latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid()); Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid());
if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) { if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg())); logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
return new Result<UserTokenResultDTO>().error(EpmetErrorCode.PLEASE_LOGIN.getCode()); return new Result<UserTokenResultDTO>().error(EpmetErrorCode.PLEASE_LOGIN.getCode());
} }
LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO = latestStaffWechat.getData(); StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
//2、记录staff_wechat //2、记录staff_wechat
this.savestaffwechat(latestStaffWechatLoginDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid()); this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid());
//3、记录登录日志 //3、记录登录日志
this.saveStaffLoginRecord(latestStaffWechatLoginDTO); this.saveStaffLoginRecord(staffLatestAgencyResultDTO);
//4、获取用户token //4、获取用户token
String token = this.generateGovWxmpToken(latestStaffWechatLoginDTO.getStaffId()); String token = this.generateGovWxmpToken(staffLatestAgencyResultDTO.getStaffId());
//5、保存到redis //5、保存到redis
this.saveLatestGovTokenDto(latestStaffWechatLoginDTO, wxMaJscode2SessionResult, token); this.saveLatestGovTokenDto(staffLatestAgencyResultDTO, wxMaJscode2SessionResult, token);
UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
userTokenResultDTO.setToken(token); userTokenResultDTO.setToken(token);
return new Result<UserTokenResultDTO>().ok(userTokenResultDTO); return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
} }
//保存tokenDto到redis //保存tokenDto到redis
private void saveLatestGovTokenDto(LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO, private void saveLatestGovTokenDto(StaffLatestAgencyResultDTO staffLatestAgency,
WxMaJscode2SessionResult wxMaJscode2SessionResult, WxMaJscode2SessionResult wxMaJscode2SessionResult,
String token) { String token) {
int expire = jwtTokenProperties.getExpire(); int expire = jwtTokenProperties.getExpire();
GovTokenDto govTokenDto = new GovTokenDto(); GovTokenDto govTokenDto = new GovTokenDto();
govTokenDto.setApp(LoginConstant.APP_GOV); govTokenDto.setApp(LoginConstant.APP_GOV);
govTokenDto.setClient(LoginConstant.CLIENT_WXMP); govTokenDto.setClient(LoginConstant.CLIENT_WXMP);
govTokenDto.setStaffId(latestStaffWechatLoginDTO.getStaffId()); govTokenDto.setStaffId(staffLatestAgency.getStaffId());
govTokenDto.setOpenId(wxMaJscode2SessionResult.getOpenid()); govTokenDto.setOpenId(wxMaJscode2SessionResult.getOpenid());
govTokenDto.setSessionKey(wxMaJscode2SessionResult.getSessionKey()); govTokenDto.setSessionKey(wxMaJscode2SessionResult.getSessionKey());
govTokenDto.setUnionId(wxMaJscode2SessionResult.getUnionid()); govTokenDto.setUnionId(wxMaJscode2SessionResult.getUnionid());
govTokenDto.setToken(token); govTokenDto.setToken(token);
govTokenDto.setUpdateTime(System.currentTimeMillis()); govTokenDto.setUpdateTime(System.currentTimeMillis());
govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime()); govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
govTokenDto.setOrgId(latestStaffWechatLoginDTO.getOrgId()); govTokenDto.setOrgId(staffLatestAgency.getOrgId());
govTokenDto.setGridId(latestStaffWechatLoginDTO.getGridId()); govTokenDto.setCustomerId(staffLatestAgency.getCustomerId());
govTokenDto.setCustomerId(latestStaffWechatLoginDTO.getCustomerId());
cpUserDetailRedis.set(govTokenDto, expire); cpUserDetailRedis.set(govTokenDto, expire);
logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss")); logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
} }
//保存登录日志 //保存登录日志
private Result saveStaffLoginRecord(LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO) { private Result saveStaffLoginRecord(StaffLatestAgencyResultDTO latestStaffWechatLoginDTO) {
StaffLoginHistoryFormDTO staffLoginHistoryFormDTO = new StaffLoginHistoryFormDTO(); StaffLoginAgencyRecordFormDTO staffLoginAgencyRecordFormDTO = new StaffLoginAgencyRecordFormDTO();
staffLoginHistoryFormDTO.setCustomerId(latestStaffWechatLoginDTO.getCustomerId()); staffLoginAgencyRecordFormDTO.setCustomerId(latestStaffWechatLoginDTO.getCustomerId());
staffLoginHistoryFormDTO.setStaffId(latestStaffWechatLoginDTO.getStaffId()); staffLoginAgencyRecordFormDTO.setStaffId(latestStaffWechatLoginDTO.getStaffId());
staffLoginHistoryFormDTO.setWxOpenId(latestStaffWechatLoginDTO.getWxOpenId()); staffLoginAgencyRecordFormDTO.setWxOpenId(latestStaffWechatLoginDTO.getWxOpenId());
staffLoginHistoryFormDTO.setMobile(latestStaffWechatLoginDTO.getMobile()); staffLoginAgencyRecordFormDTO.setMobile(latestStaffWechatLoginDTO.getMobile());
staffLoginHistoryFormDTO.setOrgId(latestStaffWechatLoginDTO.getOrgId()); staffLoginAgencyRecordFormDTO.setOrgId(latestStaffWechatLoginDTO.getOrgId());
staffLoginHistoryFormDTO.setGridId(latestStaffWechatLoginDTO.getGridId()); Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginAgencyRecordFormDTO);
Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginHistoryFormDTO);
return staffLoginRecordResult; return staffLoginRecordResult;
} }
@ -199,7 +197,7 @@ public class GovLoginServiceImpl implements GovLoginService {
//1、获取用户token //1、获取用户token
String token = this.generateGovWxmpToken(customerStaff.getUserId()); String token = this.generateGovWxmpToken(customerStaff.getUserId());
//2、保存到redis //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 userTokenResultDTO = new UserTokenResultDTO();
userTokenResultDTO.setToken(token); userTokenResultDTO.setToken(token);
return new Result<UserTokenResultDTO>().ok(userTokenResultDTO); return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
@ -220,14 +218,14 @@ public class GovLoginServiceImpl implements GovLoginService {
//保存登录日志 //保存登录日志
private Result saveStaffLoginRecord(GovWxmpEnteOrgFormDTO formDTO, String staffId, String openId, String grid) { private Result saveStaffLoginRecord(GovWxmpEnteOrgFormDTO formDTO, String staffId, String openId, String grid) {
StaffLoginHistoryFormDTO staffLoginHistoryFormDTO = new StaffLoginHistoryFormDTO(); StaffLoginAgencyRecordFormDTO staffLoginAgencyRecordFormDTO = new StaffLoginAgencyRecordFormDTO();
staffLoginHistoryFormDTO.setCustomerId(formDTO.getCustomerId()); staffLoginAgencyRecordFormDTO.setCustomerId(formDTO.getCustomerId());
staffLoginHistoryFormDTO.setStaffId(staffId); staffLoginAgencyRecordFormDTO.setStaffId(staffId);
staffLoginHistoryFormDTO.setWxOpenId(openId); staffLoginAgencyRecordFormDTO.setWxOpenId(openId);
staffLoginHistoryFormDTO.setMobile(formDTO.getMobile()); staffLoginAgencyRecordFormDTO.setMobile(formDTO.getMobile());
staffLoginHistoryFormDTO.setOrgId(formDTO.getOrgId()); staffLoginAgencyRecordFormDTO.setOrgId(formDTO.getOrgId());
staffLoginHistoryFormDTO.setGridId(grid); staffLoginAgencyRecordFormDTO.setGridId(grid);
Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginHistoryFormDTO); Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginAgencyRecordFormDTO);
return staffLoginRecordResult; return staffLoginRecordResult;
} }
@ -267,7 +265,6 @@ public class GovLoginServiceImpl implements GovLoginService {
**/ **/
private void saveGovTokenDto(String orgId, private void saveGovTokenDto(String orgId,
String customerId, String customerId,
String gridId,
String staffId, String staffId,
WxMaJscode2SessionResult wxMaJscode2SessionResult, WxMaJscode2SessionResult wxMaJscode2SessionResult,
String token) { String token) {
@ -283,7 +280,6 @@ public class GovLoginServiceImpl implements GovLoginService {
govTokenDto.setUpdateTime(System.currentTimeMillis()); govTokenDto.setUpdateTime(System.currentTimeMillis());
govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime()); govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
govTokenDto.setOrgId(orgId); govTokenDto.setOrgId(orgId);
govTokenDto.setGridId(gridId);
govTokenDto.setCustomerId(customerId); govTokenDto.setCustomerId(customerId);
cpUserDetailRedis.set(govTokenDto, expire); cpUserDetailRedis.set(govTokenDto, expire);
logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss")); logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
View File

@ -28,9 +28,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO; 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.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.StaffGridInfoResultDTO; import com.epmet.dto.result.StaffLatestLoginGridResultDTO;
import com.epmet.excel.CustomerGridExcel; import com.epmet.excel.CustomerGridExcel;
import com.epmet.service.CustomerGridService; import com.epmet.service.CustomerGridService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -135,7 +135,7 @@ public class CustomerGridController {
* @Date 2020/4/20 15:34 * @Date 2020/4/20 15:34
**/ **/
@PostMapping(value = "getStaffGridInfo") @PostMapping(value = "getStaffGridInfo")
public Result<List<StaffGridInfoResultDTO>> getStaffGridInfo(@RequestBody StaffGridInfoFormDTO staffGridInfoFormDTO) { public Result<StaffLatestLoginGridResultDTO> getStaffGridInfo(@RequestBody StaffLatestLoginGridFormDTO staffGridInfoFormDTO) {
ValidatorUtils.validateEntity(staffGridInfoFormDTO); ValidatorUtils.validateEntity(staffGridInfoFormDTO);
return customerGridService.listStaffGridInfo(staffGridInfoFormDTO); return customerGridService.listStaffGridInfo(staffGridInfoFormDTO);
} }

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
View File

@ -21,9 +21,9 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO; 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.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.StaffGridInfoResultDTO; import com.epmet.dto.result.StaffLatestLoginGridResultDTO;
import com.epmet.entity.CustomerGridEntity; import com.epmet.entity.CustomerGridEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -70,5 +70,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
* @Description 查询工作人员绑定的网格列表 * @Description 查询工作人员绑定的网格列表
* @Date 2020/4/20 15:36 * @Date 2020/4/20 15:36
**/ **/
List<StaffGridInfoResultDTO> selectListStaffGridInfo(StaffGridInfoFormDTO staffGridInfoFormDTO); List<StaffLatestLoginGridResultDTO> selectListStaffGridInfo(StaffLatestLoginGridFormDTO staffGridInfoFormDTO);
} }

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
View File

@ -23,9 +23,9 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO; 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.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.StaffGridInfoResultDTO; import com.epmet.dto.result.StaffLatestLoginGridResultDTO;
import com.epmet.entity.CustomerGridEntity; import com.epmet.entity.CustomerGridEntity;
import java.util.List; import java.util.List;
@ -123,5 +123,5 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
* @Description 根据用户选择的组织，查询用户与网格的关系列表 * @Description 根据用户选择的组织，查询用户与网格的关系列表
* @Date 2020/4/20 15:35 * @Date 2020/4/20 15:35
**/ **/
Result<List<StaffGridInfoResultDTO>> listStaffGridInfo(StaffGridInfoFormDTO staffGridInfoFormDTO); Result<StaffLatestLoginGridResultDTO> listStaffGridInfo(StaffLatestLoginGridFormDTO staffGridInfoFormDTO);
} }

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
View File

@ -20,19 +20,18 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; 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.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.CustomerGridDao; import com.epmet.dao.CustomerGridDao;
import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO; 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.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.StaffGridInfoResultDTO; import com.epmet.dto.result.StaffLatestLoginGridResultDTO;
import com.epmet.entity.CustomerGridEntity; import com.epmet.entity.CustomerGridEntity;
import com.epmet.redis.CustomerGridRedis; import com.epmet.redis.CustomerGridRedis;
import com.epmet.service.CustomerGridService; import com.epmet.service.CustomerGridService;
import com.epmet.util.ModuleConstant; import com.epmet.util.ModuleConstant;
@ -155,9 +154,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
} }
@Override @Override
public Result<List<StaffGridInfoResultDTO>> listStaffGridInfo(StaffGridInfoFormDTO staffGridInfoFormDTO) { public Result<StaffLatestLoginGridResultDTO> listStaffGridInfo(StaffLatestLoginGridFormDTO staffGridInfoFormDTO) {
List<StaffGridInfoResultDTO> list = baseDao.selectListStaffGridInfo(staffGridInfoFormDTO); List<StaffLatestLoginGridResultDTO> list = baseDao.selectListStaffGridInfo(staffGridInfoFormDTO);
return new Result<List<StaffGridInfoResultDTO>>().ok(list); if(null!=list&&list.size()>0){
return new Result<StaffLatestLoginGridResultDTO>().ok(list.get(0));
}
return new Result<>();
} }
} }

2
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
View File

@ -94,7 +94,7 @@
</select> </select>
<!-- 查询工作人员绑定的网格列表 --> <!-- 查询工作人员绑定的网格列表 -->
<select id="selectListStaffGridInfo" parameterType="com.epmet.dto.form.StaffGridInfoFormDTO" resultType="com.epmet.dto.result.StaffGridInfoResultDTO"> <select id="selectListStaffGridInfo" parameterType="com.epmet.dto.form.StaffLatestLoginGridFormDTO" resultType="com.epmet.dto.result.StaffLatestLoginGridResultDTO">
SELECT SELECT
csg.GRID_ID, csg.GRID_ID,
cg.CUSTOMER_ID, cg.CUSTOMER_ID,

2
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginHistoryFormDTO.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffLoginAgencyRecordFormDTO.java
View File

@ -10,7 +10,7 @@ import java.io.Serializable;
* @Date 2020/4/20 14:26 * @Date 2020/4/20 14:26
*/ */
@Data @Data
public class StaffLoginHistoryFormDTO implements Serializable { public class StaffLoginAgencyRecordFormDTO implements Serializable {
/** /**
* 客户ID * 客户ID
*/ */

7
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestStaffWechatLoginResultDTO.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffLatestAgencyResultDTO.java
View File

@ -10,7 +10,7 @@ import java.io.Serializable;
* @Date 2020/4/20 12:23 * @Date 2020/4/20 12:23
*/ */
@Data @Data
public class LatestStaffWechatLoginResultDTO implements Serializable { public class StaffLatestAgencyResultDTO implements Serializable {
private static final long serialVersionUID = -7088774184276785902L; private static final long serialVersionUID = -7088774184276785902L;
/** /**
@ -37,10 +37,5 @@ public class LatestStaffWechatLoginResultDTO implements Serializable {
* 组织机构id * 组织机构id
*/ */
private String orgId; private String orgId;
/**
* 网格表Id (CUSTOMER_GRID.id)
*/
private String gridId;
} }

23
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffLoginHistoryController.java → epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java
View File

@ -18,25 +18,26 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.StaffLoginHistoryFormDTO; import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; import com.epmet.dto.result.StaffLatestAgencyResultDTO;
import com.epmet.service.StaffLoginHistoryService; import com.epmet.service.StaffAgencyHistoryService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
* 工作人员登录日志表 * 工作人员登录组织日志表
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-20 * @since v1.0.0 2020-04-20
*/ */
@RestController @RestController
@RequestMapping("staffloginhistory") @RequestMapping("staffagencyhistory")
public class StaffLoginHistoryController { public class StaffAgencyHistoryController {
@Autowired @Autowired
private StaffLoginHistoryService staffLoginHistoryService; private StaffAgencyHistoryService staffAgencyHistoryService;
/** /**
* @param openId * @param openId
@ -46,8 +47,8 @@ public class StaffLoginHistoryController {
* @Date 2020/4/20 12:42 * @Date 2020/4/20 12:42
**/ **/
@GetMapping(value = "getlatest/{openId}") @GetMapping(value = "getlatest/{openId}")
public Result<LatestStaffWechatLoginResultDTO> getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId) { public Result<StaffLatestAgencyResultDTO> getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId) {
return staffLoginHistoryService.getLatestStaffWechatLoginRecord(openId); return staffAgencyHistoryService.getLatestStaffWechatLoginRecord(openId);
} }
/** /**
@ -58,7 +59,7 @@ public class StaffLoginHistoryController {
* @Date 2020/4/20 14:29 * @Date 2020/4/20 14:29
**/ **/
@PostMapping(value = "saveStaffLoginRecord") @PostMapping(value = "saveStaffLoginRecord")
public Result saveStaffLoginRecord(@RequestBody StaffLoginHistoryFormDTO formDTO) { public Result saveStaffLoginRecord(@RequestBody StaffLoginAgencyRecordFormDTO formDTO) {
return staffLoginHistoryService.saveStaffLoginRecord(formDTO); return staffAgencyHistoryService.saveStaffLoginRecord(formDTO);
} }
} }

13
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffLoginHistoryDao.java → epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java
View File

@ -18,25 +18,24 @@
package com.epmet.dao; package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; import com.epmet.dto.result.StaffLatestAgencyResultDTO;
import com.epmet.entity.StaffLoginHistoryEntity; import com.epmet.entity.StaffAgencyHistoryEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
* 工作人员登录日志表 * 工作人员登录组织日志表
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-20 * @since v1.0.0 2020-04-20
*/ */
@Mapper @Mapper
public interface StaffLoginHistoryDao extends BaseDao<StaffLoginHistoryEntity> { public interface StaffAgencyHistoryDao extends BaseDao<StaffAgencyHistoryEntity> {
/** /**
* @return com.epmet.dto.result.LatestStaffWechatLoginDTO
* @param openId * @param openId
* @return com.epmet.dto.result.LatestStaffWechatLoginDTO
* @Author yinzuomei * @Author yinzuomei
* @Description 获取当前微信上次登录的账号信息 * @Description 获取当前微信上次登录的账号信息
* @Date 2020/4/20 12:45 * @Date 2020/4/20 12:45
**/ **/
LatestStaffWechatLoginResultDTO selectLatestStaffWechatLoginRecord(String openId); StaffLatestAgencyResultDTO selectLatestStaffWechatLoginRecord(String openId);
} }

33
epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffLoginHistoryService.java → epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java
View File

@ -20,51 +20,51 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.StaffLoginHistoryDTO; import com.epmet.dto.StaffAgencyHistoryDTO;
import com.epmet.dto.form.StaffLoginHistoryFormDTO; import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; import com.epmet.dto.result.StaffLatestAgencyResultDTO;
import com.epmet.entity.StaffLoginHistoryEntity; import com.epmet.entity.StaffAgencyHistoryEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 工作人员登录日志表 * 工作人员登录组织日志表
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-20 * @since v1.0.0 2020-04-20
*/ */
public interface StaffLoginHistoryService extends BaseService<StaffLoginHistoryEntity> { public interface StaffAgencyHistoryService extends BaseService<StaffAgencyHistoryEntity> {
/** /**
* 默认分页 * 默认分页
* *
* @param params * @param params
* @return PageData<StaffLoginHistoryDTO> * @return PageData<StaffAgencyHistoryDTO>
* @author generator * @author generator
* @date 2020-04-20 * @date 2020-04-20
*/ */
PageData<StaffLoginHistoryDTO> page(Map<String, Object> params); PageData<StaffAgencyHistoryDTO> page(Map<String, Object> params);
/** /**
* 默认查询 * 默认查询
* *
* @param params * @param params
* @return java.util.List<StaffLoginHistoryDTO> * @return java.util.List<StaffAgencyHistoryDTO>
* @author generator * @author generator
* @date 2020-04-20 * @date 2020-04-20
*/ */
List<StaffLoginHistoryDTO> list(Map<String, Object> params); List<StaffAgencyHistoryDTO> list(Map<String, Object> params);
/** /**
* 单条查询 * 单条查询
* *
* @param id * @param id
* @return StaffLoginHistoryDTO * @return StaffAgencyHistoryDTO
* @author generator * @author generator
* @date 2020-04-20 * @date 2020-04-20
*/ */
StaffLoginHistoryDTO get(String id); StaffAgencyHistoryDTO get(String id);
/** /**
* 默认保存 * 默认保存
@ -74,7 +74,7 @@ public interface StaffLoginHistoryService extends BaseService<StaffLoginHistoryE
* @author generator * @author generator
* @date 2020-04-20 * @date 2020-04-20
*/ */
void save(StaffLoginHistoryDTO dto); void save(StaffAgencyHistoryDTO dto);
/** /**
* 默认更新 * 默认更新
@ -84,7 +84,7 @@ public interface StaffLoginHistoryService extends BaseService<StaffLoginHistoryE
* @author generator * @author generator
* @date 2020-04-20 * @date 2020-04-20
*/ */
void update(StaffLoginHistoryDTO dto); void update(StaffAgencyHistoryDTO dto);
/** /**
* 批量删除 * 批量删除
@ -96,6 +96,7 @@ public interface StaffLoginHistoryService extends BaseService<StaffLoginHistoryE
*/ */
void delete(String[] ids); void delete(String[] ids);
/** /**
* @param openId * @param openId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.LatestStaffWechatLoginDTO> * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.LatestStaffWechatLoginDTO>
@ -103,7 +104,7 @@ public interface StaffLoginHistoryService extends BaseService<StaffLoginHistoryE
* @Description 获取当前微信上次登录的账号信息 * @Description 获取当前微信上次登录的账号信息
* @Date 2020/4/20 12:43 * @Date 2020/4/20 12:43
**/ **/
Result<LatestStaffWechatLoginResultDTO> getLatestStaffWechatLoginRecord(String openId); Result<StaffLatestAgencyResultDTO> getLatestStaffWechatLoginRecord(String openId);
/** /**
* @param formDTO * @param formDTO
@ -112,5 +113,5 @@ public interface StaffLoginHistoryService extends BaseService<StaffLoginHistoryE
* @Description 保存登录日志 * @Description 保存登录日志
* @Date 2020/4/20 14:33 * @Date 2020/4/20 14:33
**/ **/
Result saveStaffLoginRecord(StaffLoginHistoryFormDTO formDTO); Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO);
} }

60
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffLoginHistoryServiceImpl.java → epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyHistoryServiceImpl.java
View File

@ -24,12 +24,12 @@ import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.StaffLoginHistoryDao; import com.epmet.dao.StaffAgencyHistoryDao;
import com.epmet.dto.StaffLoginHistoryDTO; import com.epmet.dto.StaffAgencyHistoryDTO;
import com.epmet.dto.form.StaffLoginHistoryFormDTO; import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
import com.epmet.dto.result.LatestStaffWechatLoginResultDTO; import com.epmet.dto.result.StaffLatestAgencyResultDTO;
import com.epmet.entity.StaffLoginHistoryEntity; import com.epmet.entity.StaffAgencyHistoryEntity;
import com.epmet.service.StaffLoginHistoryService; import com.epmet.service.StaffAgencyHistoryService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -41,56 +41,57 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 工作人员登录日志表 * 工作人员登录组织日志表
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-20 * @since v1.0.0 2020-04-20
*/ */
@Service @Service
public class StaffLoginHistoryServiceImpl extends BaseServiceImpl<StaffLoginHistoryDao, StaffLoginHistoryEntity> implements StaffLoginHistoryService { public class StaffAgencyHistoryServiceImpl extends BaseServiceImpl<StaffAgencyHistoryDao, StaffAgencyHistoryEntity> implements StaffAgencyHistoryService {
private static final Logger logger = LoggerFactory.getLogger(StaffLoginHistoryServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(StaffAgencyHistoryServiceImpl.class);
@Override @Override
public PageData<StaffLoginHistoryDTO> page(Map<String, Object> params) { public PageData<StaffAgencyHistoryDTO> page(Map<String, Object> params) {
IPage<StaffLoginHistoryEntity> page = baseDao.selectPage( IPage<StaffAgencyHistoryEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false), getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params) getWrapper(params)
); );
return getPageData(page, StaffLoginHistoryDTO.class); return getPageData(page, StaffAgencyHistoryDTO.class);
} }
@Override @Override
public List<StaffLoginHistoryDTO> list(Map<String, Object> params) { public List<StaffAgencyHistoryDTO> list(Map<String, Object> params) {
List<StaffLoginHistoryEntity> entityList = baseDao.selectList(getWrapper(params)); List<StaffAgencyHistoryEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, StaffLoginHistoryDTO.class); return ConvertUtils.sourceToTarget(entityList, StaffAgencyHistoryDTO.class);
} }
private QueryWrapper<StaffLoginHistoryEntity> getWrapper(Map<String, Object> params){ private QueryWrapper<StaffAgencyHistoryEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP); String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<StaffLoginHistoryEntity> wrapper = new QueryWrapper<>(); QueryWrapper<StaffAgencyHistoryEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper; return wrapper;
} }
@Override @Override
public StaffLoginHistoryDTO get(String id) { public StaffAgencyHistoryDTO get(String id) {
StaffLoginHistoryEntity entity = baseDao.selectById(id); StaffAgencyHistoryEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, StaffLoginHistoryDTO.class); return ConvertUtils.sourceToTarget(entity, StaffAgencyHistoryDTO.class);
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void save(StaffLoginHistoryDTO dto) { public void save(StaffAgencyHistoryDTO dto) {
StaffLoginHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffLoginHistoryEntity.class); StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyHistoryEntity.class);
insert(entity); insert(entity);
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(StaffLoginHistoryDTO dto) { public void update(StaffAgencyHistoryDTO dto) {
StaffLoginHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffLoginHistoryEntity.class); StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyHistoryEntity.class);
updateById(entity); updateById(entity);
} }
@ -102,20 +103,19 @@ public class StaffLoginHistoryServiceImpl extends BaseServiceImpl<StaffLoginHist
} }
@Override @Override
public Result<LatestStaffWechatLoginResultDTO> getLatestStaffWechatLoginRecord(String openId) { public Result<StaffLatestAgencyResultDTO> getLatestStaffWechatLoginRecord(String openId) {
if (StringUtils.isNotBlank(openId)) { if (StringUtils.isNotBlank(openId)) {
logger.error("openId 不能为空"); logger.error("openId 不能为空");
return new Result(); return new Result();
} }
LatestStaffWechatLoginResultDTO latestStaffWechatLoginDTO = baseDao.selectLatestStaffWechatLoginRecord(openId); StaffLatestAgencyResultDTO latestStaffWechatLoginDTO = baseDao.selectLatestStaffWechatLoginRecord(openId);
return new Result<LatestStaffWechatLoginResultDTO>().ok(latestStaffWechatLoginDTO); return new Result<StaffLatestAgencyResultDTO>().ok(latestStaffWechatLoginDTO);
} }
@Override @Override
public Result saveStaffLoginRecord(StaffLoginHistoryFormDTO formDTO) { public Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO) {
StaffLoginHistoryEntity entity = ConvertUtils.sourceToTarget(formDTO, StaffLoginHistoryEntity.class); StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(formDTO, StaffAgencyHistoryEntity.class);
insert(entity); insert(entity);
return new Result(); return new Result();
} }
} }
Write Preview
Loading…
Cancel
Save