Browse Source

【pc端-user模块】【修改小程序用户登录日志接口】魏凯 2020-08-11

feature/dangjian
weikai 5 years ago
parent
commit
c4219a6655
  1. 64
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserLoginLogController.java
  2. 33
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserLoginLogDao.java
  3. 56
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserLoginLogEntity.java
  4. 65
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserLoginLogExcel.java
  5. 17
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
  6. 17
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
  7. 47
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserLoginLogRedis.java
  8. 58
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserLoginLogService.java
  9. 70
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserLoginLogServiceImpl.java
  10. 20
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserLoginLogDao.xml

64
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserLoginLogController.java

@ -1,39 +1,18 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
import com.elink.esua.epdc.excel.UserLoginLogExcel;
import com.elink.esua.epdc.service.UserLoginLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
@ -49,18 +28,6 @@ public class UserLoginLogController {
@Autowired
private UserLoginLogService userLoginLogService;
@GetMapping("page")
public Result<PageData<UserLoginLogDTO>> page(@RequestParam Map<String, Object> params){
PageData<UserLoginLogDTO> page = userLoginLogService.page(params);
return new Result<PageData<UserLoginLogDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<UserLoginLogDTO> get(@PathVariable("id") String id){
UserLoginLogDTO data = userLoginLogService.get(id);
return new Result<UserLoginLogDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody UserLoginLogDTO dto){
//效验数据
@ -68,27 +35,4 @@ public class UserLoginLogController {
userLoginLogService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody UserLoginLogDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
userLoginLogService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
userLoginLogService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<UserLoginLogDTO> list = userLoginLogService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, UserLoginLogExcel.class);
}
}

33
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserLoginLogDao.java

@ -1,33 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.entity.UserLoginLogEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 用户登录日志表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2020-08-11
*/
@Mapper
public interface UserLoginLogDao extends BaseDao<UserLoginLogEntity> {
}

56
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserLoginLogEntity.java

@ -1,56 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 用户登录日志表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2020-08-11
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("epdc_user_login_log")
public class UserLoginLogEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
/**
* 居民ID
*/
private String userId;
/**
* 居民名称
*/
private String userName;
/**
* 登录时间
*/
private Date loginTime;
}

65
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserLoginLogExcel.java

@ -1,65 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 用户登录日志表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2020-08-11
*/
@Data
public class UserLoginLogExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "居民ID")
private String userId;
@Excel(name = "居民名称")
private String userName;
@Excel(name = "登录时间")
private Date loginTime;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "删除标记 0:未删除,1:已删除 0:未删除,1:已删除")
private String delFlag;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

17
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@ -0,0 +1,17 @@
package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class)
public interface AnalysisFeignClient {
@PostMapping(value = "cloudAnalysis/user/userloginlog", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result saveInformation(@RequestBody UserLoginLogDTO formDto);
}

17
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@ -0,0 +1,17 @@
package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
import com.elink.esua.epdc.feign.AnalysisFeignClient;
import org.springframework.stereotype.Component;
@Component
public class AnalysisFeignClientFallback implements AnalysisFeignClient {
@Override
public Result saveInformation(UserLoginLogDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER,
"saveInformation", formDto);
}
}

47
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserLoginLogRedis.java

@ -1,47 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.redis;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 用户登录日志表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2020-08-11
*/
@Component
public class UserLoginLogRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

58
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserLoginLogService.java

@ -17,13 +17,7 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
import com.elink.esua.epdc.entity.UserLoginLogEntity;
import java.util.List;
import java.util.Map;
/**
* 用户登录日志表
@ -31,38 +25,7 @@ import java.util.Map;
* @author qu qu@elink-cn.com
* @since v1.0.0 2020-08-11
*/
public interface UserLoginLogService extends BaseService<UserLoginLogEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<UserLoginLogDTO>
* @author generator
* @date 2020-08-11
*/
PageData<UserLoginLogDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<UserLoginLogDTO>
* @author generator
* @date 2020-08-11
*/
List<UserLoginLogDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return UserLoginLogDTO
* @author generator
* @date 2020-08-11
*/
UserLoginLogDTO get(String id);
public interface UserLoginLogService{
/**
* 默认保存
*
@ -73,23 +36,4 @@ public interface UserLoginLogService extends BaseService<UserLoginLogEntity> {
*/
void save(UserLoginLogDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-08-11
*/
void update(UserLoginLogDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-08-11
*/
void delete(String[] ids);
}

70
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserLoginLogServiceImpl.java

@ -17,25 +17,11 @@
package com.elink.esua.epdc.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.dao.UserLoginLogDao;
import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
import com.elink.esua.epdc.entity.UserLoginLogEntity;
import com.elink.esua.epdc.redis.UserLoginLogRedis;
import com.elink.esua.epdc.feign.AnalysisFeignClient;
import com.elink.esua.epdc.service.UserLoginLogService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 用户登录日志表
@ -44,61 +30,13 @@ import java.util.Map;
* @since v1.0.0 2020-08-11
*/
@Service
public class UserLoginLogServiceImpl extends BaseServiceImpl<UserLoginLogDao, UserLoginLogEntity> implements UserLoginLogService {
public class UserLoginLogServiceImpl implements UserLoginLogService {
@Autowired
private UserLoginLogRedis userLoginLogRedis;
@Override
public PageData<UserLoginLogDTO> page(Map<String, Object> params) {
IPage<UserLoginLogEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, UserLoginLogDTO.class);
}
@Override
public List<UserLoginLogDTO> list(Map<String, Object> params) {
List<UserLoginLogEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, UserLoginLogDTO.class);
}
private QueryWrapper<UserLoginLogEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<UserLoginLogEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public UserLoginLogDTO get(String id) {
UserLoginLogEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, UserLoginLogDTO.class);
}
private AnalysisFeignClient analysisFeignClient;
@Override
@Transactional(rollbackFor = Exception.class)
public void save(UserLoginLogDTO dto) {
UserLoginLogEntity entity = ConvertUtils.sourceToTarget(dto, UserLoginLogEntity.class);
insert(entity);
analysisFeignClient.saveInformation(dto);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(UserLoginLogDTO dto) {
UserLoginLogEntity entity = ConvertUtils.sourceToTarget(dto, UserLoginLogEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

20
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserLoginLogDao.xml

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.elink.esua.epdc.dao.UserLoginLogDao">
<resultMap type="com.elink.esua.epdc.entity.UserLoginLogEntity" id="userLoginLogMap">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="userName" column="USER_NAME"/>
<result property="loginTime" column="LOGIN_TIME"/>
<result property="revision" column="REVISION"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
</mapper>
Loading…
Cancel
Save