From 3928a07c9b73bbeb68c3c30a715665d0976cb783 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 11 Jun 2019 14:31:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97][=E4=BF=AE=E6=94=B9]:=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E5=8F=8A=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/MallUserActionController.java | 9 +- .../iformall/domain/po/MallUserAction.java | 16 ++-- .../iformall/domain/vo/MallUserActionVo.java | 87 +++++++++++++++++++ .../iformall/mapper/MallUserActionMapper.java | 7 +- .../service/MallUserActionService.java | 5 +- .../impl/MallUserActionServiceImpl.java | 5 +- .../resources/mapper/MallUserActionMapper.xml | 68 +++++++++++++-- 7 files changed, 171 insertions(+), 26 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java index 0a8df68ab..ad5936482 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java @@ -1,10 +1,9 @@ package com.iformall.controller.sys; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserAction; +import com.iformall.domain.vo.MallUserActionVo; import com.iformall.service.MallUserActionService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -26,10 +25,10 @@ public class MallUserActionController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute MallUserAction userAction, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute MallUserActionVo userAction, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserActionController::list"); - if (null == userAction) userAction = new MallUserAction(); - final PageInfo page = mallUserActionService.listAsPage(userAction, pageNum, pageSize); + if (null == userAction) userAction = new MallUserActionVo(); + final PageInfo page = mallUserActionService.listAsPage(userAction, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java index 420160928..393b3a0af 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java @@ -1,18 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; + import javax.persistence.*; import java.util.*; -import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "mall_user_action") @Data -public class MallUserAction implements Serializable { - private static final long serialVersionUID = 1L; +@EqualsAndHashCode(callSuper = true) +public class MallUserAction extends BaseEntity { @Id protected Long id; @@ -28,7 +28,7 @@ public class MallUserAction implements Serializable { private Long userId; @io.swagger.annotations.ApiModelProperty(value="类型 0-controller, 1-service",name="type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value="",name="ip") + @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; @io.swagger.annotations.ApiModelProperty(value="功能描述",name="actionDesc") private String actionDesc; @@ -97,4 +97,10 @@ public class MallUserAction implements Serializable { this.setSortColumns(Field.valueOf(sortColumns)); } } + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java new file mode 100644 index 000000000..ec8d78626 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java @@ -0,0 +1,87 @@ +package com.iformall.domain.vo; + + +import com.iformall.domain.po.MallUserAction; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * Created by syf on 2018/8/30. + */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class MallUserActionVo extends MallUserAction { + + @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") + private String name; + + public static enum Field + { + Id_ASC("mua.`id` ASC"),Id_DESC("mua.`id` DESC") + ,TenantId_ASC("mua.`tenant_id` ASC"),TenantId_DESC("mua.`tenant_id` DESC") + ,UserId_ASC("mua.`user_id` ASC"),UserId_DESC("mua.`user_id` DESC") + ,Name_ASC("mui.`name` ASC"),Name_DESC("mui.`name` DESC") + ,Type_ASC("mua.`type` ASC"),Type_DESC("mua.`type` DESC") + ,Ip_ASC("mua.`ip` ASC"),Ip_DESC("mua.`ip` DESC") + ,ActionDesc_ASC("mua.`action_desc` ASC"),ActionDesc_DESC("mua.`action_desc` DESC") + ,ActionTime_ASC("mua.`action_time` ASC"),ActionTime_DESC("mua.`action_time` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(MallUserAction.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(MallUserAction.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new MallUserAction.Field[fList.size()])); + } else { + this.setSortColumns(MallUserAction.Field.valueOf(sortColumns)); + } + } + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java index dd2abe9e0..1316c1754 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java @@ -2,16 +2,15 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; -import org.apache.ibatis.annotations.Param; +import com.iformall.domain.vo.MallUserActionVo; import com.iformall.domain.po.MallUserAction; public interface MallUserActionMapper extends CommonMapper { List findList(MallUserAction mallUserAction); - - - + + List findListVo(MallUserActionVo mallUserAction); } diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java b/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java index 5ce272c1b..19f7d9c7b 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java @@ -1,9 +1,8 @@ package com.iformall.service; -import java.util.*; - import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserAction; +import com.iformall.domain.vo.MallUserActionVo; public interface MallUserActionService { @@ -15,7 +14,7 @@ public interface MallUserActionService { * @param pageSize * @return */ - PageInfo listAsPage(MallUserAction record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(MallUserActionVo record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java index 8525e652a..18aa0b34a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserAction; +import com.iformall.domain.vo.MallUserActionVo; import com.iformall.mapper.MallUserActionMapper; import com.iformall.service.MallUserActionService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,8 +19,8 @@ public class MallUserActionServiceImpl implements MallUserActionService { MallUserActionMapper mallUserActionMapper; @Override - public PageInfo listAsPage(MallUserAction record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallUserActionMapper.findList(record)); + public PageInfo listAsPage(MallUserActionVo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallUserActionMapper.findListVo(record)); } @Override diff --git a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml index 04fde2677..358e54ece 100644 --- a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml @@ -15,14 +15,14 @@ - where 1 = 1 + where 1 = 1 and `id` = #{id} and `user_id` = #{userId} - - + + and `type` = #{type} @@ -35,17 +35,71 @@ and `action_time` = #{actionTime} - and id in + and id in #{idItem} order by ${sortColumns} + + + + + + + + + + + + + + + mua.`id`,mua.`user_id`,mua.`type`,mua.`ip`,mua.`action_desc`,mua.`action_time`,mui.`name` + + + + where 1 = 1 + + and mua.`id` = #{id} + + + and mua.`user_id` = #{userId} + + + and mui.`name` like concat('%', #{name},'%') + + + and mua.`type` = #{type} + + + and mua.`ip` like concat('%', #{ip},'%') + + + and mua.`action_desc` like concat('%', #{actionDesc},'%') + + + and mua.`action_time` = #{actionTime} + + + and mua.id in + + #{idItem} + + + order by ${sortColumns} + - + select + from mall_user_action mua + left join mall_user_info mui on mua.user_id = mui.id +