【7.2.5】【timer】移除timer的包装类

kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java

@@ -34,8 +34,6 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.timer.modular.entity.SysTimers;
 import cn.stylefeng.roses.kernel.timer.modular.param.SysTimersParam;
 import cn.stylefeng.roses.kernel.timer.modular.service.SysTimersService;
-import cn.stylefeng.roses.kernel.timer.modular.wrapper.TimerWrapper;
-import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -140,7 +138,6 @@ public class SysTimersController {
      * @date 2020/6/30 18:26
      */
     @GetResource(name = "分页查询定时任务", path = "/sysTimers/page")
-    @Wrapper(TimerWrapper.class)
     public ResponseData<PageResult<SysTimers>> page(SysTimersParam sysTimersParam) {
         return new SuccessResponseData<>(sysTimersService.findPage(sysTimersParam));
     }

kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java

@@ -26,6 +26,8 @@ package cn.stylefeng.roses.kernel.timer.modular.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
+import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
+import cn.stylefeng.roses.kernel.system.api.format.UserFormatProcess;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -97,4 +99,10 @@ public class SysTimers extends BaseEntity {
     @ChineseDescription("是否删除")
     private String delFlag;
 
+    @Override
+    @SimpleFieldFormat(processClass = UserFormatProcess.class)
+    public Long getCreateUser() {
+        return super.getCreateUser();
+    }
+
 }

kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/wrapper/TimerWrapper.java

@@ -1,67 +0,0 @@
-/*
- * Copyright [2020-2030] [https://www.stylefeng.cn]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Guns源码头部的版权声明。
- * 3.请保留源码和相关描述文件的项目出处，作者声明等。
- * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns
- * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns
- * 6.若您的项目无法满足以上几点，可申请商业授权
- */
-package cn.stylefeng.roses.kernel.timer.modular.wrapper;
-
-import cn.hutool.extra.spring.SpringUtil;
-import cn.stylefeng.roses.kernel.system.api.UserServiceApi;
-import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO;
-import cn.stylefeng.roses.kernel.timer.modular.entity.SysTimers;
-import cn.stylefeng.roses.kernel.wrapper.api.BaseWrapper;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 定时任务查询结果包装
- *
- * @author fengshuonan
- * @date 2021/3/1 23:45
- */
-public class TimerWrapper implements BaseWrapper<SysTimers> {
-
-    @Override
-    public Map<String, Object> doWrap(SysTimers beWrappedModel) {
-
-        HashMap<String, Object> resultMap = new HashMap<>();
-        UserServiceApi userServiceApi = SpringUtil.getBean(UserServiceApi.class);
-
-        if (beWrappedModel.getCreateUser() != null) {
-            SysUserDTO sysUserDTO = userServiceApi.getUserInfoByUserId(beWrappedModel.getCreateUser());
-            if (sysUserDTO != null) {
-                resultMap.put("createUserName", sysUserDTO.getRealName());
-            }
-        }
-
-        if (beWrappedModel.getUpdateUser() != null) {
-            SysUserDTO sysUserDTO = userServiceApi.getUserInfoByUserId(beWrappedModel.getUpdateUser());
-            if (sysUserDTO != null) {
-                resultMap.put("updateUserName", sysUserDTO.getRealName());
-            }
-        }
-
-        return resultMap;
-    }
-
-}