Merge pull request #473 from mabaiwan/develop

The default order of the drop-down box of the thread pool list
pull/474/head
小马哥 2 years ago committed by GitHub
commit 6144a1b827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data; import lombok.Data;
/** /**
* Thread pool query req dto. * Thread pool query req DTO.
* *
* @author chen.ma * @author chen.ma
* @date 2021/6/30 21:22 * @date 2021/6/30 21:22
@ -30,18 +30,22 @@ import lombok.Data;
public class ThreadPoolQueryReqDTO extends Page { public class ThreadPoolQueryReqDTO extends Page {
/** /**
* tenantId * Tenant id
*/ */
private String tenantId; private String tenantId;
/** /**
* itemId * Item id
*/ */
private String itemId; private String itemId;
/** /**
* tpId * Thread pool id
*/ */
private String tpId; private String tpId;
/**
* Desc
*/
private Boolean desc;
} }

@ -62,7 +62,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
.eq(!StringUtils.isBlank(reqDTO.getItemId()), ConfigAllInfo::getItemId, reqDTO.getItemId()) .eq(!StringUtils.isBlank(reqDTO.getItemId()), ConfigAllInfo::getItemId, reqDTO.getItemId())
.eq(!StringUtils.isBlank(reqDTO.getTpId()), ConfigAllInfo::getTpId, reqDTO.getTpId()) .eq(!StringUtils.isBlank(reqDTO.getTpId()), ConfigAllInfo::getTpId, reqDTO.getTpId())
.eq(ConfigAllInfo::getDelFlag, DelEnum.NORMAL) .eq(ConfigAllInfo::getDelFlag, DelEnum.NORMAL)
.orderByDesc(ConfigAllInfo::getGmtCreate); .orderByDesc(reqDTO.getDesc() != null, ConfigAllInfo::getGmtCreate);
return configInfoMapper.selectPage(reqDTO, wrapper).convert(each -> BeanUtil.convert(each, ThreadPoolRespDTO.class)); return configInfoMapper.selectPage(reqDTO, wrapper).convert(each -> BeanUtil.convert(each, ThreadPoolRespDTO.class));
} }
@ -112,7 +112,6 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
public void alarmEnable(String id, Integer isAlarm) { public void alarmEnable(String id, Integer isAlarm) {
ConfigAllInfo configAllInfo = configInfoMapper.selectById(id); ConfigAllInfo configAllInfo = configInfoMapper.selectById(id);
configAllInfo.setIsAlarm(isAlarm); configAllInfo.setIsAlarm(isAlarm);
// TODO: 是否报警变更, 虽然通知了客户端, 但是并没有在客户端实时生效, 需要考虑一个好的场景思路
configService.insertOrUpdate(null, false, configAllInfo); configService.insertOrUpdate(null, false, configAllInfo);
} }
} }

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save