odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(core): rename Cs prefix to Kit for base classes and utilities

Browse Source 
- Renamed CsArgs to KitArgs and updated internal references
- Renamed CsBaseCreateTimeTb to KitBaseCreateTimeTb and extended KitObject
- Renamed CsBaseTimeTb to KitBaseTimeTb and extended KitObject
- Renamed CsBaseUpdateTimeTb to KitBaseUpdateTimeTb and extended KitObject
- Renamed CsBaseUserCreateTimeTb to KitBaseUserCreateTimeTb and extended KitObject
- Renamed CsBaseUserTimeLogicTb to KitBaseUserTimeLogicTb and extended KitObject
- Renamed CsBaseUserTimeTb to KitBaseUserTimeTb and extended KitObject
- Renamed CsObject to KitObject as base serializable class
- Renamed CsPageArgs to KitPageArgs and kept same generic structure
- Renamed CsPageResult to KitPageResult and updated factory methods
- Renamed CsSelectOptionVo to KitSelectOptionVo and extended KitObject
- Updated BootApplication to use KitSpringBeanHolder instead of CsSpringBeanHolder
- Renamed CsRequestHolder to KitRequestHolder and kept same functionality
- Renamed CsScriptHelper to KitScriptHelper and maintained component behavior
- Renamed CsSpringBeanHolder to KitSpringBeanHolder and updated internal usage
- Updated SwaggerConfig to import KitAnonTagUtil instead of CsAnonTagUtil
- Renamed CsHealthCheckPointService to KitHealthCheckPointService in controller and service layers
- Renamed CsMpQTypeEnum to KitMpQTypeEnum for dynamic query types
- Renamed CsMpQuery annotation to KitMpQuery and updated default type reference
- Renamed CsMpMapper to KitMpMapper and updated imports for page utilities
- Renamed CsMpService to KitMpService and updated page result references
- Renamed CsMpServiceImpl to KitMpServiceImpl and updated query utility usage
- Renamed CsMpAnyQUtil to KitMpAnyQUtil and updated internal query builder calls
- Renamed CsMpCmdGenUtil to KitMpCmdGenUtil and updated superclass reference
- Renamed CsMpQUtil to KitMpQUtil and updated annotation and handler references
- Updated model classes (CaptchaModel, ContentRsaEncodeSettingModel, JwtAuthSettingModel, OSSConfigModel) to extend KitObject instead of CsObject
This commit is contained in:
odboy
2025-11-28 15:58:37 +08:00
parent b1fdced5cc
commit 6e3061cf04
289 changed files with 6483 additions and 6482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskJobBean.java
+5 -5
View File
@@ -17,7 +17,7 @@
package cn.odboy.task.core;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.CsSpringBeanHolder;
import cn.odboy.framework.context.KitSpringBeanHolder;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.exception.ServerException;
import cn.odboy.task.constant.TaskJobKeys;
@@ -57,8 +57,8 @@ public class TaskJobBean extends QuartzJobBean implements InterruptableJob {
public void executeInternal(JobExecutionContext context) {
this.workThread = Thread.currentThread();
// ========================== 获取代理类 ==========================
TaskInstanceInfoService taskInstanceInfoService = CsSpringBeanHolder.getBean(TaskInstanceInfoService.class);
TaskInstanceDetailService taskInstanceDetailService = CsSpringBeanHolder.getBean(TaskInstanceDetailService.class);
TaskInstanceInfoService taskInstanceInfoService = KitSpringBeanHolder.getBean(TaskInstanceInfoService.class);
TaskInstanceDetailService taskInstanceDetailService = KitSpringBeanHolder.getBean(TaskInstanceDetailService.class);
// ========================== 获取参数 ==========================
JobDataMap dataMap = context.getMergedJobDataMap();
long id = dataMap.getLong(TaskJobKeys.ID);
@@ -126,7 +126,7 @@ public class TaskJobBean extends QuartzJobBean implements InterruptableJob {
isFound = true;
}
}
TaskInstanceStepDetailService taskInstanceStepDetailService = CsSpringBeanHolder.getBean(TaskInstanceStepDetailService.class);
TaskInstanceStepDetailService taskInstanceStepDetailService = KitSpringBeanHolder.getBean(TaskInstanceStepDetailService.class);
List<String> bizCodeList = taskInstanceDetails.stream().map(TaskInstanceDetailTb::getBizCode).distinct().toList();
List<TaskInstanceDetailTb> taskInstanceDetailTbs = taskInstanceDetailService.queryByInstanceIdAndBizCodeList(id, bizCodeList);
List<Long> taskInstanceDetailIds = taskInstanceDetailTbs.stream().map(TaskInstanceDetailTb::getId).toList();
@@ -174,7 +174,7 @@ public class TaskJobBean extends QuartzJobBean implements InterruptableJob {
for (TaskTemplateNodeVo taskTemplateNodeVo : taskTemplateNodes) {
String code = taskTemplateNodeVo.getCode();
try {
TaskStepExecutor executor = CsSpringBeanHolder.getBean("taskStep" + getBeanAlias(code));
TaskStepExecutor executor = KitSpringBeanHolder.getBean("taskStep" + getBeanAlias(code));
taskInstanceDetailService.fastStart(id, code, dataMap);
executor.execute(codeIdMap.getOrDefault(code, null), dataMap, taskTemplateNodeVo);
taskInstanceDetailService.fastSuccessWithInfo(id, code, null);
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskManage.java
+5 -5
View File
@@ -17,7 +17,7 @@ package cn.odboy.task.core;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.CsSpringBeanHolder;
import cn.odboy.framework.context.KitSpringBeanHolder;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.task.constant.TaskChangeTypeEnum;
import cn.odboy.task.constant.TaskJobKeys;
@@ -31,7 +31,7 @@ import cn.odboy.task.dal.model.TaskTemplateNodeVo;
import cn.odboy.task.service.TaskInstanceDetailService;
import cn.odboy.task.service.TaskInstanceInfoService;
import cn.odboy.task.service.TaskTemplateInfoService;
import cn.odboy.util.CsDateUtil;
import cn.odboy.util.KitDateUtil;
import com.alibaba.fastjson2.JSON;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -101,7 +101,7 @@ public class TaskManage {
throw new BadRequestException("没有查询到任务编排明细");
}
// ========================== 创建任务 ==========================
TaskManage taskManage = CsSpringBeanHolder.getBean(TaskManage.class);
TaskManage taskManage = KitSpringBeanHolder.getBean(TaskManage.class);
TaskInstanceInfoTb newInstance =
taskManage.saveTaskInstanceInfoTb(contextName, changeTypeEnum, language, envAlias, source, reason, dataMap, templateInfo);
dataMap.put(TaskJobKeys.ID, newInstance.getId());
@@ -243,9 +243,9 @@ public class TaskManage {
instanceNodeVo.setStartTime(taskInstanceDetail.getStartTime());
instanceNodeVo.setFinishTime(taskInstanceDetail.getFinishTime());
if (taskInstanceDetail.getFinishTime() == null) {
instanceNodeVo.setDurationDesc(CsDateUtil.formatSecondsDuration(taskInstanceDetail.getStartTime(), new Date()));
instanceNodeVo.setDurationDesc(KitDateUtil.formatSecondsDuration(taskInstanceDetail.getStartTime(), new Date()));
} else {
instanceNodeVo.setDurationDesc(CsDateUtil.formatSecondsDuration(taskInstanceDetail.getStartTime(), taskInstanceDetail.getFinishTime()));
instanceNodeVo.setDurationDesc(KitDateUtil.formatSecondsDuration(taskInstanceDetail.getStartTime(), taskInstanceDetail.getFinishTime()));
}
instanceNodeVo.setRunningDesc(taskInstanceDetail.getExecuteInfo());
instanceNodeVo.setStatus(taskInstanceDetail.getExecuteStatus());
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceDetailTb.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package cn.odboy.task.dal.dataobject;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -40,7 +40,7 @@ import java.util.Date;
@ToString
@TableName("task_instance_detail")
@Schema(name = "TaskInstanceDetailTb对象", description = "任务实例明细")
public class TaskInstanceDetailTb extends CsObject {
public class TaskInstanceDetailTb extends KitObject {
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
private Date createTime;
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceInfoTb.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package cn.odboy.task.dal.dataobject;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -41,7 +41,7 @@ import java.util.Date;
@ToString
@TableName("task_instance_info")
@Schema(name = "TaskInstanceInfoTb对象", description = "任务实例")
public class TaskInstanceInfoTb extends CsObject {
public class TaskInstanceInfoTb extends KitObject {
@CreatedBy
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建人", hidden = true)
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package cn.odboy.task.dal.dataobject;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -40,7 +40,7 @@ import java.util.Date;
@ToString
@TableName("task_instance_step_detail")
@Schema(name = "TaskInstanceStepDetailTb对象")
public class TaskInstanceStepDetailTb extends CsObject {
public class TaskInstanceStepDetailTb extends KitObject {
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
private Date createTime;
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/dataobject/TaskTemplateInfoTb.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package cn.odboy.task.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -38,7 +38,7 @@ import lombok.ToString;
@ToString
@TableName("task_template_info")
@Schema(name = "TaskTemplateInfoTb对象", description = "任务模板")
public class TaskTemplateInfoTb extends CsBaseUserTimeTb {
public class TaskTemplateInfoTb extends KitBaseUserTimeTb {
/**
* id
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/model/TaskInstanceNodeVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.task.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import lombok.Getter;
import lombok.Setter;
@@ -29,7 +29,7 @@ import java.util.Date;
*/
@Getter
@Setter
public class TaskInstanceNodeVo extends CsObject {
public class TaskInstanceNodeVo extends KitObject {
/**
* 业务编码
*/
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/model/TaskTemplateInfoVo.java
+2 -2
View File
@@ -15,13 +15,13 @@
*/
package cn.odboy.task.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class TaskTemplateInfoVo extends CsObject {
public class TaskTemplateInfoVo extends KitObject {
private String changeType;
private String name;
private String description;
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/model/TaskTemplateNodeOperateButtonVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.task.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import lombok.Getter;
import lombok.Setter;
@@ -30,7 +30,7 @@ import java.util.Map;
*/
@Getter
@Setter
public class TaskTemplateNodeOperateButtonVo extends CsObject {
public class TaskTemplateNodeOperateButtonVo extends KitObject {
/**
* 按钮类型（service:调用某个服务并传递参数 link:带参跳转）
*/
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/model/TaskTemplateNodeVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.task.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import lombok.Getter;
import lombok.Setter;
@@ -32,7 +32,7 @@ import java.util.Map;
*/
@Getter
@Setter
public class TaskTemplateNodeVo extends CsObject {
public class TaskTemplateNodeVo extends KitObject {
/**
* 业务编码
*/