diff --git a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java index 793a382..1afc090 100644 --- a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java +++ b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java @@ -37,6 +37,7 @@ public class WrapperUtils { StringBuilder allSql = new StringBuilder(); for (Field field : fields) { + Class fieldType = field.getType(); Condition condition = field.getAnnotation(Condition.class); Object value = ReflectUtil.getFieldValue(query, field); if (ObjectUtil.isEmpty(value)) { @@ -74,8 +75,15 @@ public class WrapperUtils { .append(name).append(" is null ").append(" "); } case eq -> { - if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" = ").append("'").append(value).append("'").append(" "); + if (StringUtils.isNotEmpty(tableName)) { + if(fieldType.equals(String.class)) { + allSql.append(" AND ").append(tableName).append(".") + .append(name).append(" = ").append("'").append(value).append("'").append(" "); + } else { + allSql.append(" AND ").append(tableName).append(".") + .append(name).append(" = ").append(value).append(" "); + } + } } case like -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java index 5b0f86b..8d5b2d5 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java @@ -79,7 +79,7 @@ public class TerminalQuery extends CommonParam { * 终端来源 */ @Range(min = 1, max = 10, message = "终端来源输入错误") - @Condition(name = "inspection_source", type = Condition.ConditionType.eq, tableName = "ti") + @Condition(name = "terminal_source", type = Condition.ConditionType.eq, tableName = "t") private Integer terminalSource; /** * 商户状态 @@ -130,4 +130,7 @@ public class TerminalQuery extends CommonParam { private Long terminalId; @Condition(name = "store_id", type = Condition.ConditionType.eq, tableName = "s") private Long storeId; + + @Condition(name = "terminal_status", type = Condition.ConditionType.eq, tableName = "t") + private Integer terminalStatus; } diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java index a86f8c5..767f488 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java @@ -45,6 +45,7 @@ public class SysConfig extends BaseEntity private String configValue; /** 系统内置（Y是 N否） */ + @Condition(name = "config_type", type = Condition.ConditionType.eq) @ExcelProperty(value = "系统内置", index = 4) private String configType; diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/query/SysLoginInfoQuery.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/query/SysLoginInfoQuery.java new file mode 100644 index 0000000..a3a5425 --- /dev/null +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/query/SysLoginInfoQuery.java @@ -0,0 +1,25 @@ +package com.chushang.system.entity.query; + +import com.chushang.common.mybatis.annotation.Condition; +import com.chushang.common.mybatis.page.CommonParam; +import lombok.*; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysLoginInfoQuery extends CommonParam { + + @Condition(name = "info_id", type = Condition.ConditionType.eq, tableName = "t") + private Long infoId; + + @Condition(name = "username", type = Condition.ConditionType.like, tableName = "t") + private String username; + + @Condition(name = "status", type = Condition.ConditionType.eq, tableName = "t") + private Integer status; + + @Condition(name = "ipaddr", type = Condition.ConditionType.like, tableName = "t") + private String ipaddr; +} diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysLoginInfoController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysLoginInfoController.java index 128d882..9af472e 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysLoginInfoController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysLoginInfoController.java @@ -10,6 +10,7 @@ import com.chushang.security.annotation.InnerAuth; import com.chushang.security.annotation.RequiresPermissions; import com.chushang.system.entity.dto.ListLoginLogDTO; import com.chushang.system.entity.po.SysLoginInfo; +import com.chushang.system.entity.query.SysLoginInfoQuery; import com.chushang.system.feign.RemoteLoginInfoService; import com.chushang.system.service.SysLoginInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -27,9 +28,8 @@ public class SysLoginInfoController { @GetMapping(value = "/list") @RequiresPermissions("system:log:list") - public AjaxResult listLoginInfo(SysLoginInfo loginInfo){ - CommonParam commonParam = CommonParam.buildPageRequest(); - return AjaxResult.success(sysLoginInfoService.pagePostList(loginInfo, commonParam)); + public AjaxResult listLoginInfo(SysLoginInfoQuery query){ + return AjaxResult.success(sysLoginInfoService.pageList(query)); } @DeleteMapping(value = "/{infoId}") diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysLoginInfoMapper.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysLoginInfoMapper.java index e517767..7269414 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysLoginInfoMapper.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysLoginInfoMapper.java @@ -1,7 +1,17 @@ package com.chushang.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chushang.datascope.annotation.DataScope; import com.chushang.system.entity.po.SysLoginInfo; +import com.chushang.system.entity.query.SysLoginInfoQuery; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface SysLoginInfoMapper extends BaseMapper { + + @DataScope(deptAlias = "t") + List pageList(@Param("query") SysLoginInfoQuery query, + Page page); } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java index 3b63977..0fa5046 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java @@ -2,6 +2,7 @@ package com.chushang.system.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.mybatis.page.CommonParam; @@ -11,6 +12,9 @@ import com.chushang.system.entity.dto.ListLoginLogDTO; import com.chushang.system.entity.po.SysDictType; import com.chushang.system.entity.po.SysLoginInfo; import com.chushang.system.entity.po.SysPost; +import com.chushang.system.entity.query.SysLoginInfoQuery; + +import java.util.List; public interface SysLoginInfoService extends IService { @@ -29,4 +33,7 @@ public interface SysLoginInfoService extends IService { ); return new PageResult(page); } + + PageResult pageList(SysLoginInfoQuery query); + } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java index 4d905e1..ce63cdc 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java @@ -1,19 +1,30 @@ package com.chushang.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.common.mybatis.page.CommonParam; -import com.chushang.system.entity.po.SysDictType; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.system.entity.po.SysLoginInfo; -import com.chushang.system.entity.po.SysPost; +import com.chushang.system.entity.query.SysLoginInfoQuery; import com.chushang.system.mapper.SysLoginInfoMapper; import com.chushang.system.service.SysLoginInfoService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service public class SysLoginInfoServiceImpl extends ServiceImpl implements SysLoginInfoService { + + + @Override + public PageResult pageList(SysLoginInfoQuery query) { + WrapperUtils.buildSql(query); + CommonParam commonParam = CommonParam.buildPageRequest(); + Page page = new Page<>(commonParam.getPage(), commonParam.getLimit()); + List terminalVOS = baseMapper.pageList(query, page); + return new PageResult(terminalVOS, page); + } } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysLoginInfoMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysLoginInfoMapper.xml new file mode 100644 index 0000000..11a3aaa --- /dev/null +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysLoginInfoMapper.xml @@ -0,0 +1,30 @@ + + + + + select t.info_id, t.username, t.status, t.ipaddr, t.msg, t.access_time, t.create_time, t.update_time, t.del_state, t.version,t.create_by,t.update_by + from sys_login_info t where 1=1 + + + + + + + + + + + + + + + + + +