修改分页排序以及线程池删除记录日志.

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.toolkit.ConditionUtil;
 import cn.hippo4j.common.toolkit.ContentUtil;
 import cn.hippo4j.common.toolkit.Md5Util;
-import cn.hippo4j.common.toolkit.UserContext;
 import cn.hippo4j.config.event.LocalDataChangeEvent;
 import cn.hippo4j.config.mapper.ConfigInfoMapper;
 import cn.hippo4j.config.model.ConfigAllInfo;
@@ -60,7 +59,6 @@ public class ConfigServiceImpl implements ConfigService {
                 .eq(ConfigInfoBase::getTpId, configInfo.getTpId());
         ConfigAllInfo existConfig = configInfoMapper.selectOne(queryWrapper);
 
-        String userName = UserContext.getUserName();
         ConfigServiceImpl configService = ApplicationContextHolder.getBean(this.getClass());
         configInfo.setCapacity(getQueueCapacityByType(configInfo));
 
@@ -69,10 +67,10 @@ public class ConfigServiceImpl implements ConfigService {
                     .condition(
                             existConfig == null,
                             () -> configService.addConfigInfo(configInfo),
-                            () -> configService.updateConfigInfo(userName, configInfo)
+                            () -> configService.updateConfigInfo(configInfo)
                     );
         } catch (Exception ex) {
-            updateConfigInfo(userName, configInfo);
+            updateConfigInfo(configInfo);
         }
 
         ConfigChangePublisher.notifyConfigChange(new LocalDataChangeEvent(identify, ContentUtil.getGroupKey(configInfo)));
@@ -95,13 +93,12 @@ public class ConfigServiceImpl implements ConfigService {
     }
 
     @LogRecord(
-            bizNo = "{{#config.itemId}}:{{#config.tpId}}",
+            bizNo = "{{#config.itemId}}_{{#config.tpId}}",
             category = "THREAD_POOL_UPDATE",
-            operator = "{{#operator}}",
             success = "核心线程: {{#config.coreSize}}, 最大线程: {{#config.maxSize}}, 队列类型: {{#config.queueType}}, 队列容量: {{#config.capacity}}, 拒绝策略: {{#config.rejectedType}}",
             detail = "{{#config.toString()}}"
     )
-    public void updateConfigInfo(String operator, ConfigAllInfo config) {
+    public void updateConfigInfo(ConfigAllInfo config) {
         LambdaUpdateWrapper<ConfigAllInfo> wrapper = Wrappers.lambdaUpdate(ConfigAllInfo.class)
                 .eq(ConfigAllInfo::getTpId, config.getTpId())
                 .eq(ConfigAllInfo::getItemId, config.getItemId())

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java

@@ -60,7 +60,8 @@ public class NotifyServiceImpl implements NotifyService {
         LambdaQueryWrapper<NotifyInfo> queryWrapper = Wrappers.lambdaQuery(NotifyInfo.class)
                 .eq(StrUtil.isNotBlank(reqDTO.getTenantId()), NotifyInfo::getTenantId, reqDTO.getTenantId())
                 .eq(StrUtil.isNotBlank(reqDTO.getItemId()), NotifyInfo::getItemId, reqDTO.getItemId())
-                .eq(StrUtil.isNotBlank(reqDTO.getTpId()), NotifyInfo::getTpId, reqDTO.getTpId());
+                .eq(StrUtil.isNotBlank(reqDTO.getTpId()), NotifyInfo::getTpId, reqDTO.getTpId())
+                .orderByDesc(NotifyInfo::getGmtModified);
 
         IPage<NotifyInfo> resultPage = notifyInfoMapper.selectPage(reqDTO, queryWrapper);
         return resultPage.convert(each -> BeanUtil.convert(each, NotifyRespDTO.class));

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java

@@ -10,6 +10,7 @@ import cn.hippo4j.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO;
 import cn.hippo4j.config.service.biz.ConfigService;
 import cn.hippo4j.config.service.biz.ThreadPoolService;
 import cn.hippo4j.config.toolkit.BeanUtil;
+import cn.hippo4j.tools.logrecord.annotation.LogRecord;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -39,7 +40,8 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
                 .eq(!StringUtils.isBlank(reqDTO.getTenantId()), ConfigAllInfo::getTenantId, reqDTO.getTenantId())
                 .eq(!StringUtils.isBlank(reqDTO.getItemId()), ConfigAllInfo::getItemId, reqDTO.getItemId())
                 .eq(!StringUtils.isBlank(reqDTO.getTpId()), ConfigAllInfo::getTpId, reqDTO.getTpId())
-                .eq(ConfigAllInfo::getDelFlag, DelEnum.NORMAL);
+                .eq(ConfigAllInfo::getDelFlag, DelEnum.NORMAL)
+                .orderByDesc(ConfigAllInfo::getGmtModified);
 
         return configInfoMapper.selectPage(reqDTO, wrapper).convert(each -> BeanUtil.convert(each, ThreadPoolRespDTO.class));
     }
@@ -64,6 +66,12 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
         configService.insertOrUpdate(identify, BeanUtil.convert(reqDTO, ConfigAllInfo.class));
     }
 
+    @LogRecord(
+            bizNo = "{{#reqDTO.itemId}}_{{#reqDTO.tpId}}",
+            category = "THREAD_POOL_DELETE",
+            success = "删除线程池: {{#reqDTO.tpId}}",
+            detail = "{{#reqDTO.toString()}}"
+    )
     @Override
     public void deletePool(ThreadPoolDelReqDTO reqDTO) {
         configInfoMapper.delete(

hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/CustomOperatorGetServiceImpl.java

@@ -0,0 +1,22 @@
+package cn.hippo4j.config.service.handler;
+
+import cn.hippo4j.common.toolkit.UserContext;
+import cn.hippo4j.tools.logrecord.model.Operator;
+import cn.hippo4j.tools.logrecord.service.OperatorGetService;
+import org.springframework.stereotype.Component;
+
+/**
+ * Custom operator get service.
+ *
+ * @author chen.ma
+ * @date 2021/11/28 17:57
+ */
+@Component
+public class CustomOperatorGetServiceImpl implements OperatorGetService {
+
+    @Override
+    public Operator getUser() {
+        return new Operator(UserContext.getUserName());
+    }
+
+}