Browse Source

fix sysconfig

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
cd5beba06b
3 changed files with 38 additions and 6 deletions
  1. +14
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/SysConfigService.java
  3. +22
    -2
      mallinkService/src/main/java/com/iformall/service/impl/SysConfigServiceImpl.java

+ 14
- 4
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java View File

@@ -1,9 +1,14 @@
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.MallRole;
import com.iformall.domain.po.MallRolePermission;
import com.iformall.domain.po.SysConfig;
import com.iformall.domain.po.SysConfigValue;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.service.SysConfigService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -25,13 +30,18 @@ public class SysConfigController extends BaseController {
@Autowired
private SysConfigService sysConfigService;

@ApiOperation("列表接口")
@ApiOperation("角色列表")
@GetMapping("list")
public ResultData list() {
//@RequiresPermissions("sys:role:list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) {
SysConfig config = new SysConfig();
config.setStatus(0);
List<SysConfig> list = sysConfigService.getList(config, getTenantInfo());
return new ResultData(list);
PageInfo<SysConfig> page = sysConfigService.listAsPage(config, pageNum, pageSize, getTenantInfo());
return new ResultData(page);
}
@ApiOperation("详情接口")


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/SysConfigService.java View File

@@ -8,6 +8,8 @@ import java.util.List;

public interface SysConfigService {

PageInfo<SysConfig> listAsPage(SysConfig record, Integer pageIndex, Integer pageSize,TenantEntity tenantEntity);
/**
* 根据实体查询列表
*


+ 22
- 2
mallinkService/src/main/java/com/iformall/service/impl/SysConfigServiceImpl.java View File

@@ -13,6 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker;

@Service
@@ -29,6 +32,25 @@ public class SysConfigServiceImpl implements SysConfigService {
@Qualifier("objectCommonRedisTemplate")
RedisTemplate<String, Object> baseRedisTemplate;

@Override
public PageInfo<SysConfig> listAsPage(SysConfig record, Integer pageIndex, Integer pageSize,TenantEntity tenantEntity) {
PageInfo<SysConfig> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> sysConfigMapper.findList(record));
if (null != page && null != page.getList()) {
for (SysConfig config : page.getList()) {
SysConfigValue cvq = new SysConfigValue();
cvq.setConfigItemId(config.getId());
cvq.updateTenantInfo(tenantEntity);
SysConfigValue configValue = sysConfigValueMapper.findByItemId(cvq);
if (null != configValue) {
config.setConfigItemValue(configValue.getConfigItemValue());
}
}
}
return page;
}

@Override
public List<SysConfig> getList(SysConfig record,TenantEntity tenantEntity) {
List<SysConfig> list = sysConfigMapper.findList(record);
@@ -106,7 +128,5 @@ public class SysConfigServiceImpl implements SysConfigService {
RedisCacheUtils.removeCache(baseRedisTemplate, String.format(cache_prex, tenantEntity.getTenantId(),config.getConfigItemKey()));
}

}

Loading…
Cancel
Save