jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

规范化代码格式1.0

Browse Source
This commit is contained in:
zjh 2026-01-21 10:26:21 +08:00
parent dbfabe83be
commit ea74cebeff
148 changed files with 1105 additions and 2212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/xdap/self_development/controller/ActivitiProcessController.java
View File

@ -2,15 +2,14 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.xdap.self_development.controller.form.ApprovalUserNodeDTO;
import com.xdap.self_development.controller.form.HandleApprovalRequest;
import com.xdap.self_development.controller.form.HandleReturnNodeForm;
import com.xdap.self_development.controller.form.UpdateNodeForm;
import com.xdap.self_development.controller.request.ApprovalNodeRequest;
import com.xdap.self_development.controller.request.EngineReviewListRequest;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.EngineReviewListPojo;
import com.xdap.self_development.pojo.dto.*;
import com.xdap.self_development.domain.pojo.EngineReviewListPojo;
import com.xdap.self_development.domain.dto.*;
import com.xdap.self_development.service.ActivitiProcessService;
import com.xdap.self_development.service.EngineReviewListService;
import org.springframework.beans.factory.annotation.Autowired;
@ -80,7 +79,7 @@ public class ActivitiProcessController {
public Response initiateApproval(@RequestParam(value = "modelID") String modelID , @RequestParam(value = "userID") String userID) {
List<ActivitiDataDTO> msg = activitiProcessService.initiateApproval(modelID,userID);
return Response.ok().data(msg);
};
}
// //平台发起审批时生成本地审批流
// @PostMapping(value = "/startActivitiByPlatform")
// public Response startActivitiByPlatform(@RequestBody ApprovalByPlatformRequest request) {
@ -106,19 +105,22 @@ public class ActivitiProcessController {
public Response handleApproval(@RequestBody HandleApprovalDTO handleApprovalDTO) {
String msg = activitiProcessService.handleApproval(handleApprovalDTO);
return Response.ok().data(msg);
};
}
//查看审批
@PostMapping(value = "/showEngReview")
public Response showEngReview(@RequestBody EngineReviewListRequest engineReviewListRequest) {
PageResultDTO<EngineReviewListPojo> msg = engineReviewListService.selectEngineReviewListByUserId(engineReviewListRequest);
return Response.ok().data(msg);
};
}
//申请人退回审批
@GetMapping(value = "/returnApproval")
public Response returnApproval(@RequestParam(value = "approvalId") String approvalId) {
String msg = engineReviewListService.returnApproval(approvalId);
return Response.ok().data(msg);
};
}
// 获取是否直送
@GetMapping("/getIsDirect")
public Response getIsDirect(

6
src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java
View File

@ -3,9 +3,9 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.xdap.self_development.controller.request.AnalysisRequest;
import com.xdap.self_development.controller.request.ReportRequest;
import com.xdap.self_development.pojo.DataEntryEngineModelPojo;
import com.xdap.self_development.pojo.view.AnalysisModelParamterView;
import com.xdap.self_development.pojo.view.AnalysisModelParamterViewAndParam;
import com.xdap.self_development.domain.pojo.DataEntryEngineModelPojo;
import com.xdap.self_development.domain.view.AnalysisModelParamterView;
import com.xdap.self_development.domain.view.AnalysisModelParamterViewAndParam;
import com.xdap.self_development.service.AnalysisCommonParametersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

11
src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java
View File

@ -4,10 +4,10 @@ import com.definesys.mpaas.common.http.Response;
import com.definesys.mpaas.query.db.PageQueryResult;
import com.xdap.self_development.controller.form.*;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.BenchmarkingReport;
import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
import com.xdap.self_development.pojo.view.ApprovalFlowNodeView;
import com.xdap.self_development.pojo.view.TodoAndReportView;
import com.xdap.self_development.domain.pojo.BenchmarkingReportPojo;
import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
import com.xdap.self_development.domain.view.ApprovalFlowNodeView;
import com.xdap.self_development.domain.view.TodoAndReportView;
import com.xdap.self_development.service.BenchmarkingReportService;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@ -17,7 +17,6 @@ import javax.annotation.Resource;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
@RestController
@RequestMapping("/custom/benchmark")
@ -204,7 +203,7 @@ public class BenchmarkingReportController {
public Response getReportDetail(
@NotBlank String reportId
) {
BenchmarkingReport report = benchmarkingReportService
BenchmarkingReportPojo report = benchmarkingReportService
.getReportDetail(reportId);
return Response.ok().data(report);
}

4
src/main/java/com/xdap/self_development/controller/CommonParameterController.java
View File

@ -3,7 +3,7 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.xdap.self_development.controller.form.*;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.AnalysisCommonParameters;
import com.xdap.self_development.domain.pojo.AnalysisCommonParametersPojo;
import com.xdap.self_development.service.CommonParameterService;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@ -70,7 +70,7 @@ public class CommonParameterController {
public Response getAnalysisCommonParameter(
@NotBlank @RequestParam String userId
) {
List<AnalysisCommonParameters> list = commonParameterService.getAnalysisCommonParameter(userId);
List<AnalysisCommonParametersPojo> list = commonParameterService.getAnalysisCommonParameter(userId);
return Response.ok().data(list);
}

8
src/main/java/com/xdap/self_development/controller/DataEntryController.java
View File

@ -7,8 +7,8 @@ import com.xdap.runtime.service.RuntimeDatasourceService;
import com.xdap.runtime.service.RuntimeUserService;
import com.xdap.self_development.controller.form.OptionForm;
import com.xdap.self_development.controller.form.TemplateForm;
import com.xdap.self_development.pojo.Parameter;
import com.xdap.self_development.pojo.Template;
import com.xdap.self_development.domain.pojo.ParameterPojo;
import com.xdap.self_development.domain.pojo.TemplatePojo;
import com.xdap.self_development.service.DataEntryService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -56,14 +56,14 @@ public class DataEntryController {
// 筛选条件 模板的模糊搜索
@GetMapping("/getTemplateByCondition")
public Response getTemplateByCondition(@RequestParam("templateName") String templateName) {
List<Template> templates = dataEntryService.getTemplateByCondition(templateName);
List<TemplatePojo> templates = dataEntryService.getTemplateByCondition(templateName);
return Response.ok().data(templates);
}
// 筛选条件 参数的模糊搜索
@GetMapping("/getParameterByCondition")
public Response getParameterByCondition(OptionForm form) {
List<Parameter> parameters = dataEntryService.getParameterByCondition(form);
List<ParameterPojo> parameters = dataEntryService.getParameterByCondition(form);
return Response.ok().data(parameters);
}

4
src/main/java/com/xdap/self_development/controller/DataEntryEngineModelController.java
View File

@ -3,8 +3,8 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.xdap.self_development.controller.request.DataEntryEngineModelPageRequest;
import com.xdap.self_development.pojo.dto.DataEntryEngineModelDto;
import com.xdap.self_development.pojo.dto.PageResultDTO;
import com.xdap.self_development.domain.dto.DataEntryEngineModelDto;
import com.xdap.self_development.domain.dto.PageResultDTO;
import com.xdap.self_development.service.DataEntryEngineModelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

16
src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
View File

@ -4,8 +4,8 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.xdap.api.moudle.user.pojo.XdapUsers;
import com.xdap.self_development.controller.request.EngineParamDetailRequest;
import com.xdap.self_development.pojo.EngineParamDetailPojo;
import com.xdap.self_development.pojo.dto.EngineParamDetailDTO;
import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
import com.xdap.self_development.domain.dto.EngineParamDetailDTO;
import com.xdap.self_development.service.EngineParamDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -98,11 +98,7 @@ public class EngineParamDetailController {
//修改
@PostMapping(value = "/updateParamValue")
public Response updateParamValue(@RequestBody List<EngineParamDetailPojo> engineParamDetailPojos,@RequestParam("userID") String currentUserId) {
try {
engineParamDetailService.updateParamValue(engineParamDetailPojos, currentUserId);
} catch (Exception e) {
throw e;
}
engineParamDetailService.updateParamValue(engineParamDetailPojos, currentUserId);
return Response.ok().data("修改成功,保存草稿,准备进入审批");
}
@ -110,11 +106,7 @@ public class EngineParamDetailController {
@PostMapping(value = "/updateToInsertFiledBy")
public Response updateToInsertFiledBy(@RequestBody List<EngineParamDetailPojo> engineParamDetailPojos,
@RequestParam(value = "userID") String userID) {
try {
engineParamDetailService.updateToInsertFiledBy(engineParamDetailPojos, userID);
} catch (Exception e) {
throw e;
}
engineParamDetailService.updateToInsertFiledBy(engineParamDetailPojos, userID);
return Response.ok().data("修改成功");
}

6
src/main/java/com/xdap/self_development/controller/ParameterController.java
View File

@ -5,8 +5,8 @@ import com.xdap.self_development.common.MyPageResult;
import com.xdap.self_development.controller.form.ParameterPageForm;
import com.xdap.self_development.controller.form.UpdateParameterForm;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.Parameter;
import com.xdap.self_development.pojo.view.TemplateInfoView;
import com.xdap.self_development.domain.pojo.ParameterPojo;
import com.xdap.self_development.domain.view.TemplateInfoView;
import com.xdap.self_development.service.ParameterService;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@ -31,7 +31,7 @@ public class ParameterController {
throw new CommonException(error.getDefaultMessage());
});
}
MyPageResult<Parameter> list = parameterService.getParameterByCondition(form);
MyPageResult<ParameterPojo> list = parameterService.getParameterByCondition(form);
return Response.ok().data(list);
}

12
src/main/java/com/xdap/self_development/controller/PermissionController.java
View File

@ -5,26 +5,20 @@ import com.definesys.mpaas.common.http.Response;
import com.xdap.self_development.controller.request.ModelRolesRequest;
import com.xdap.self_development.controller.request.RolePerJoinRequest;
import com.xdap.self_development.controller.request.UserRoleBindingRequest;
import com.xdap.self_development.pojo.ModelRolesPojo;
import com.xdap.self_development.pojo.dto.PageResultDTO;
import com.xdap.self_development.pojo.view.MenuListView;
import com.xdap.self_development.pojo.view.MenuParamView;
import com.xdap.self_development.pojo.view.ParametersView;
import com.xdap.self_development.domain.pojo.ModelRolesPojo;
import com.xdap.self_development.domain.view.MenuListView;
import com.xdap.self_development.domain.view.MenuParamView;
import com.xdap.self_development.service.ModelMenuPermissionService;
import com.xdap.self_development.service.ModelRoleService;
import com.xdap.self_development.service.ParameterService;
import com.xdap.self_development.service.TemplateService;
import org.apache.commons.lang3.ObjectUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/custom/permission")

8
src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java
View File

@ -8,8 +8,8 @@ import com.xdap.runtime.service.RuntimeDatasourceService;
import com.xdap.self_development.common.MyResponse;
import com.xdap.self_development.controller.form.*;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.ResponsiblePerson;
import com.xdap.self_development.pojo.view.DepartmentUserView;
import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
import com.xdap.self_development.domain.view.DepartmentUserView;
import com.xdap.self_development.service.ResponsiblePersonService;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@ -80,7 +80,7 @@ public class ResponsiblePersonController {
throw new CommonException(error.getDefaultMessage());
});
}
PageQueryResult<ResponsiblePerson> deptResponsible =
PageQueryResult<ResponsiblePersonPojo> deptResponsible =
responsiblePersonService.getDeptResponsible(form);
return Response.ok().data(deptResponsible);
}
@ -96,7 +96,7 @@ public class ResponsiblePersonController {
throw new CommonException(error.getDefaultMessage());
});
}
PageQueryResult<ResponsiblePerson> deptResponsible =
PageQueryResult<ResponsiblePersonPojo> deptResponsible =
responsiblePersonService.getDeptFilled(form);
return Response.ok().data(deptResponsible);
}

2
src/main/java/com/xdap/self_development/controller/TcDataQueryController.java
View File

@ -6,7 +6,7 @@ import com.xdap.self_development.controller.request.AnalysisRequest;
import com.xdap.self_development.controller.request.AnalysisVerRequest;
import com.xdap.self_development.controller.request.ModelComparisonExportRequest;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.EngineParamDetailPojo;
import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
import com.xdap.self_development.service.TcDataQueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;

9
src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java
View File

@ -5,11 +5,10 @@ import com.definesys.mpaas.query.db.PageQueryResult;
import com.xdap.runtime.service.RuntimeDatasourceService;
import com.xdap.self_development.controller.form.*;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
import com.xdap.self_development.pojo.view.ApprovalFlowNodeView;
import com.xdap.self_development.pojo.view.DepartmentUserView;
import com.xdap.self_development.pojo.view.TemplateChangeView;
import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
import com.xdap.self_development.domain.view.ApprovalFlowNodeView;
import com.xdap.self_development.domain.view.DepartmentUserView;
import com.xdap.self_development.domain.view.TemplateChangeView;
import com.xdap.self_development.service.TemplateApprovalService;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;

8
src/main/java/com/xdap/self_development/controller/TemplateController.java
View File

@ -5,7 +5,7 @@ import com.definesys.mpaas.query.db.PageQueryResult;
import com.xdap.self_development.common.MyResponse;
import com.xdap.self_development.controller.form.*;
import com.xdap.self_development.exception.CommonException;
import com.xdap.self_development.pojo.Template;
import com.xdap.self_development.domain.pojo.TemplatePojo;
import com.xdap.self_development.service.TemplateService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
@ -45,7 +45,7 @@ public class TemplateController {
});
}
PageQueryResult<Template> page = templateService.getTemplateByCondition(form);
PageQueryResult<TemplatePojo> page = templateService.getTemplateByCondition(form);
return Response.ok().data(page);
}
@ -54,7 +54,7 @@ public class TemplateController {
public Response getTemplateById(
@NotBlank String templateId
) {
Template template = templateService.getTemplateById(templateId);
TemplatePojo template = templateService.getTemplateById(templateId);
return Response.ok().data(template);
}
@ -70,7 +70,7 @@ public class TemplateController {
throw new CommonException(error.getDefaultMessage());
});
}
List<Template> list = templateService.getTemplateVersion(form);
List<TemplatePojo> list = templateService.getTemplateVersion(form);
return Response.ok().data(list);
}

10
src/main/java/com/xdap/self_development/controller/TodoTaskController.java
View File

@ -4,11 +4,11 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.xdap.self_development.controller.request.TodoReturnRequest;
import com.xdap.self_development.controller.request.TodoTaskRequest;
import com.xdap.self_development.pojo.CompletedTaskPojo;
import com.xdap.self_development.pojo.InitiatedTaskPojo;
import com.xdap.self_development.pojo.TodoTaskPojo;
import com.xdap.self_development.pojo.dto.EngineParamDetailDTO;
import com.xdap.self_development.pojo.dto.PageResultDTO;
import com.xdap.self_development.domain.pojo.CompletedTaskPojo;
import com.xdap.self_development.domain.pojo.InitiatedTaskPojo;
import com.xdap.self_development.domain.pojo.TodoTaskPojo;
import com.xdap.self_development.domain.dto.EngineParamDetailDTO;
import com.xdap.self_development.domain.dto.PageResultDTO;
import com.xdap.self_development.service.TodoTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

6
src/main/java/com/xdap/self_development/controller/YcTaskResultController.java
View File

@ -3,9 +3,9 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.xdap.self_development.controller.request.YcGetTodoTaskRequest;
import com.xdap.self_development.pojo.dto.PageResultDTO;
import com.xdap.self_development.pojo.dto.YcTodoTaskCommonResultDTO;
import com.xdap.self_development.pojo.dto.YcTodoTaskResultDTO;
import com.xdap.self_development.domain.dto.PageResultDTO;
import com.xdap.self_development.domain.dto.YcTodoTaskCommonResultDTO;
import com.xdap.self_development.domain.dto.YcTodoTaskResultDTO;
import com.xdap.self_development.service.TodoTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

3
src/main/java/com/xdap/self_development/controller/form/ApprovalPersonForm.java
View File

@ -1,11 +1,8 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@Data
public class ApprovalPersonForm {

1
src/main/java/com/xdap/self_development/controller/form/ApprovalUserNodeDTO.java
View File

@ -1,7 +1,6 @@
package com.xdap.self_development.controller.form;
import com.xdap.api.moudle.user.pojo.XdapUsers;
import com.xdap.self_development.pojo.view.XdapUserView;
import lombok.Data;
import java.util.List;

2
src/main/java/com/xdap/self_development/controller/form/ModelCommonItem.java
View File

@ -1,6 +1,6 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.view.ParametersView;
import com.xdap.self_development.domain.view.ParametersView;
import lombok.Data;
import java.util.List;

3
src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterInsertForm.java
View File

@ -1,11 +1,10 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.view.ParameterItem;
import com.xdap.self_development.domain.view.ParameterItem;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data

3
src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterUpdateForm.java
View File

@ -1,11 +1,10 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.view.ParameterItem;
import com.xdap.self_development.domain.view.ParameterItem;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data

2
src/main/java/com/xdap/self_development/controller/form/RestartReportApprovalForm.java
View File

@ -1,6 +1,6 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;

2
src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java
View File

@ -1,6 +1,6 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;

2
src/main/java/com/xdap/self_development/controller/form/StartApprovalRequest.java
View File

@ -1,6 +1,6 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;

3
src/main/java/com/xdap/self_development/controller/form/UpdateBenchmarkingReportForm.java
View File

@ -1,11 +1,8 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@Data
public class UpdateBenchmarkingReportForm {

2
src/main/java/com/xdap/self_development/controller/form/UpdateNodeForm.java
View File

@ -1,6 +1,6 @@
package com.xdap.self_development.controller.form;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;

4
src/main/java/com/xdap/self_development/controller/request/ApprovalNodeRequest.java
View File

@ -1,7 +1,7 @@
package com.xdap.self_development.controller.request;
import com.xdap.self_development.pojo.EngineParamDetailPojo;
import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
import lombok.Data;
import java.util.List;

4
src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java → src/main/java/com/xdap/self_development/domain/dto/ActivitiDataAndRecordDTO.java
View File

@ -1,7 +1,7 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdap.self_development.pojo.view.FlowNode;
import com.xdap.self_development.domain.view.FlowNode;
import lombok.Data;
import java.util.ArrayList;

2
src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataDTO.java → src/main/java/com/xdap/self_development/domain/dto/ActivitiDataDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/feign/dto/AppTokenDTO.java → src/main/java/com/xdap/self_development/domain/dto/AppTokenDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.feign.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodeDTO.java → src/main/java/com/xdap/self_development/domain/dto/ApprovalNodeDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodesDTO.java → src/main/java/com/xdap/self_development/domain/dto/ApprovalNodesDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import com.xdap.self_development.controller.form.ApprovalUserNodeDTO;
import lombok.Data;

4
src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java → src/main/java/com/xdap/self_development/domain/dto/DataEntryEngineModelDto.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
@ -6,6 +6,7 @@ import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;
import com.definesys.mpaas.query.model.MpaasBasePojo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@ -17,6 +18,7 @@ import java.util.Date;
* @author Lys111
* @since 2025-11-12
*/
@EqualsAndHashCode(callSuper = true)
@SQLQuery(value = {
@SQL(view = "selectVersionByConditionPage",
sql = "WITH ranked_models AS ( SELECT deem.*, epd.major_version AS parameterVersion, ROW_NUMBER() OVER (PARTITION BY deem.id, epd.major_version ORDER BY deem.id) AS rn FROM data_entry_engine_model deem JOIN engine_param_detail epd ON deem.id = epd.engine_model_id ) SELECT * FROM ranked_models WHERE rn = 1 ORDER BY model_name, parameterVersion")

2
src/main/java/com/xdap/self_development/pojo/dto/EngineParamDetailDTO.java → src/main/java/com/xdap/self_development/domain/dto/EngineParamDetailDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import com.xdap.api.moudle.user.pojo.XdapUsers;
import lombok.Data;

2
src/main/java/com/xdap/self_development/feign/dto/FileDataDTO.java → src/main/java/com/xdap/self_development/domain/dto/FileDataDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.feign.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/feign/dto/FileUploadDTO.java → src/main/java/com/xdap/self_development/domain/dto/FileUploadDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.feign.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/dto/HandleApprovalDTO.java → src/main/java/com/xdap/self_development/domain/dto/HandleApprovalDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/dto/PageResultDTO.java → src/main/java/com/xdap/self_development/domain/dto/PageResultDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/dto/ShowActivitiDTO.java → src/main/java/com/xdap/self_development/domain/dto/ShowActivitiDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/feign/dto/UserTokenDT0.java → src/main/java/com/xdap/self_development/domain/dto/UserTokenDT0.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.feign.dto;
package com.xdap.self_development.domain.dto;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskCommonResultDTO.java → src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskCommonResultDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import lombok.AllArgsConstructor;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java → src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskResultDTO.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.dto;
package com.xdap.self_development.domain.dto;
import lombok.AllArgsConstructor;
import lombok.Data;

2
src/main/java/com/xdap/self_development/enums/ApprovalOrderEnum.java → src/main/java/com/xdap/self_development/domain/enums/ApprovalOrderEnum.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.enums;
package com.xdap.self_development.domain.enums;
import lombok.Getter;

8
src/main/java/com/xdap/self_development/enums/CurrentNodeEnum.java → src/main/java/com/xdap/self_development/domain/enums/CurrentNodeEnum.java
View File

@ -1,5 +1,8 @@
package com.xdap.self_development.enums;
package com.xdap.self_development.domain.enums;
import lombok.Getter;
@Getter
public enum CurrentNodeEnum {
REPAIR("数据维护"),
@ -11,7 +14,4 @@ public enum CurrentNodeEnum {
this.desc = desc;
}
public String getDesc() {
return desc;
}
}

2
src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java → src/main/java/com/xdap/self_development/domain/enums/DistributeStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.enums;
package com.xdap.self_development.domain.enums;
import lombok.Getter;

10
src/main/java/com/xdap/self_development/domain/enums/ParamOperationEnum.java Normal file
View File

@ -0,0 +1,10 @@
package com.xdap.self_development.domain.enums;
public enum ParamOperationEnum {
//新增
INSERT,
//修改
UPDATE,
//删除
DELETE
}

2
src/main/java/com/xdap/self_development/enums/ParamPermissionEnum.java → src/main/java/com/xdap/self_development/domain/enums/ParamPermissionEnum.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.enums;
package com.xdap.self_development.domain.enums;
import lombok.Getter;

2
src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java → src/main/java/com/xdap/self_development/domain/enums/ParamValueVersionEnum.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.enums;
package com.xdap.self_development.domain.enums;
import lombok.Getter;

8
src/main/java/com/xdap/self_development/utils/ParameterOperation.java → src/main/java/com/xdap/self_development/domain/enums/ParameterOperationEnum.java
View File

@ -1,11 +1,11 @@
package com.xdap.self_development.utils;
package com.xdap.self_development.domain.enums;
import lombok.Getter;
import java.util.Arrays;
@Getter
public enum ParameterOperation {
public enum ParameterOperationEnum {
INSERT("insert", "新增"),
UPDATE("update", "更新"),
DELETE("delete", "删除"),
@ -14,12 +14,12 @@ public enum ParameterOperation {
private final String code;
private final String description;
ParameterOperation(String code, String description) {
ParameterOperationEnum(String code, String description) {
this.code = code;
this.description = description;
}
public static ParameterOperation fromCode(String code) {
public static ParameterOperationEnum fromCode(String code) {
return Arrays.stream(values())
.filter(operation -> operation.code.equals(code))
.findFirst()

4
src/main/java/com/xdap/self_development/pojo/AnalysisCommonParameters.java → src/main/java/com/xdap/self_development/domain/pojo/AnalysisCommonParametersPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.*;
import com.definesys.mpaas.query.model.MpaasBasePojo;
@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("yfsjglpt_analysis_common_parameters")
public class AnalysisCommonParameters extends MpaasBasePojo {
public class AnalysisCommonParametersPojo extends MpaasBasePojo {
@RowID(sequence = "analysis_common_parameters_s", type = RowIDType.UUID)
private String id;

2
src/main/java/com/xdap/self_development/pojo/ApprovalConfigPojo.java → src/main/java/com/xdap/self_development/domain/pojo/ApprovalConfigPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;

4
src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java → src/main/java/com/xdap/self_development/domain/pojo/ApprovalFlowPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;
@ -13,7 +13,7 @@ import java.sql.Timestamp;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("yfsjglpt_model_approval_flow")
public class ApprovalFlow extends MpaasBasePojo {
public class ApprovalFlowPojo extends MpaasBasePojo {
@RowID(sequence = "approval_flow_s", type = RowIDType.UUID)
private String id;
private String processTitle;

6
src/main/java/com/xdap/self_development/pojo/ApprovalRecord.java → src/main/java/com/xdap/self_development/domain/pojo/ApprovalRecordPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;
@ -13,7 +13,7 @@ import java.sql.Timestamp;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("yfsjglpt_model_approval_record")
public class ApprovalRecord extends MpaasBasePojo {
public class ApprovalRecordPojo extends MpaasBasePojo {
@RowID(sequence = "approval_record_s", type = RowIDType.UUID)
private String id;
private String flowId;
@ -26,7 +26,7 @@ public class ApprovalRecord extends MpaasBasePojo {
private Timestamp approvalTime;
private Integer approvalLevel;
public ApprovalRecord(String flowId, String node, String userId, String opinion, String result, Timestamp approvalTime, Integer approvalLevel) {
public ApprovalRecordPojo(String flowId, String node, String userId, String opinion, String result, Timestamp approvalTime, Integer approvalLevel) {
this.flowId = flowId;
this.node = node;
this.userId = userId;

4
src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java → src/main/java/com/xdap/self_development/domain/pojo/ApprovalXdapUsersPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.Table;
import com.xdap.api.moudle.base.entity.NoTenBasePojo;
@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Table("xdap_users")
@Data
public class ApprovalXdapUsers extends NoTenBasePojo {
public class ApprovalXdapUsersPojo extends NoTenBasePojo {
private String id;
private String username;
}

4
src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java → src/main/java/com/xdap/self_development/domain/pojo/BenchmarkingReportPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.*;
import com.definesys.mpaas.query.model.MpaasBasePojo;
@ -17,7 +17,7 @@ import java.sql.Timestamp;
@Data
@Table("yfsjglpt_model_benchmarking_report")
@NoArgsConstructor
public class BenchmarkingReport extends MpaasBasePojo {
public class BenchmarkingReportPojo extends MpaasBasePojo {
@RowID(sequence = "benchmarking_report_s", type = RowIDType.UUID)
private String id;

4
src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java → src/main/java/com/xdap/self_development/domain/pojo/ClassificationAttributePojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.definesys.mpaas.query.annotation.Table;
@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("ads_prd_f_tc_flsxb")
public class ClassificationAttribute extends MpaasBasePojo {
public class ClassificationAttributePojo extends MpaasBasePojo {
//图号
@ExcelProperty("PITEM_ID")
private String pitemId;

4
src/main/java/com/xdap/self_development/pojo/CommonParameter.java → src/main/java/com/xdap/self_development/domain/pojo/CommonParameterPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;
@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("yfsjglpt_common_parameter")
public class CommonParameter extends MpaasBasePojo {
public class CommonParameterPojo extends MpaasBasePojo {
@RowID(sequence = "common_parameters_s", type = RowIDType.UUID)
private String id;
private String commonName;

2
src/main/java/com/xdap/self_development/pojo/CompletedTaskPojo.java → src/main/java/com/xdap/self_development/domain/pojo/CompletedTaskPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;

2
src/main/java/com/xdap/self_development/pojo/DataChangeCommentPojo.java → src/main/java/com/xdap/self_development/domain/pojo/DataChangeCommentPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;

2
src/main/java/com/xdap/self_development/pojo/DataEntryEngineModelPojo.java → src/main/java/com/xdap/self_development/domain/pojo/DataEntryEngineModelPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;

2
src/main/java/com/xdap/self_development/pojo/EngineParamDetailPojo.java → src/main/java/com/xdap/self_development/domain/pojo/EngineParamDetailPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;

4
src/main/java/com/xdap/self_development/pojo/EnginePartsCollection.java → src/main/java/com/xdap/self_development/domain/pojo/EnginePartsCollectionPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.definesys.mpaas.query.annotation.Table;
@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("ads_prd_f_yfsjglpt_fdjlbjcjb")
public class EnginePartsCollection extends MpaasBasePojo {
public class EnginePartsCollectionPojo extends MpaasBasePojo {
// 状态机 -> 状态代号
@ExcelProperty("ztj")
private String ztj;

2
src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java → src/main/java/com/xdap/self_development/domain/pojo/EngineReviewListPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.definesys.mpaas.query.annotation.RowID;

4
src/main/java/com/xdap/self_development/pojo/GlobalParameter.java → src/main/java/com/xdap/self_development/domain/pojo/GlobalParameterPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.definesys.mpaas.query.annotation.RowID;
@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
@Data
@Table("yfsjglpt_model_global_parameter")
@NoArgsConstructor
public class GlobalParameter extends MpaasBasePojo {
public class GlobalParameterPojo extends MpaasBasePojo {
@RowID(sequence = "global_parameter_s", type = RowIDType.UUID)
private String id;
@ExcelProperty("子系统")

2
src/main/java/com/xdap/self_development/pojo/InitiatedTaskPojo.java → src/main/java/com/xdap/self_development/domain/pojo/InitiatedTaskPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;

4
src/main/java/com/xdap/self_development/pojo/ModelCommonParameters.java → src/main/java/com/xdap/self_development/domain/pojo/ModelCommonParametersPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.*;
import com.definesys.mpaas.query.model.MpaasBasePojo;
@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("yfsjglpt_model_common_parameters")
public class ModelCommonParameters extends MpaasBasePojo {
public class ModelCommonParametersPojo extends MpaasBasePojo {
@RowID(sequence = "model_common_parameters_s", type = RowIDType.UUID)
private String id;
private String parameterId;

2
src/main/java/com/xdap/self_development/pojo/ModelDepUserRolePojo.java → src/main/java/com/xdap/self_development/domain/pojo/ModelDepUserRolePojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;

2
src/main/java/com/xdap/self_development/pojo/ModelMenuDictionaryPojo.java → src/main/java/com/xdap/self_development/domain/pojo/ModelMenuDictionaryPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;

2
src/main/java/com/xdap/self_development/pojo/ModelMenuParameterPojo.java → src/main/java/com/xdap/self_development/domain/pojo/ModelMenuParameterPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;

4
src/main/java/com/xdap/self_development/pojo/ModelRolePermissionPojo.java → src/main/java/com/xdap/self_development/domain/pojo/ModelRolePermissionPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;
@ -14,7 +14,7 @@ import java.util.Date;
public class ModelRolePermissionPojo {
@RowID(sequence = "yfsjglpt_model_role_permission_s", type = RowIDType.UUID)
/** ID,; */
/* ID,; */
private String id ;
/** 角色ID,; */
private String roleId ;

2
src/main/java/com/xdap/self_development/pojo/ModelRolesPojo.java → src/main/java/com/xdap/self_development/domain/pojo/ModelRolesPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;

2
src/main/java/com/xdap/self_development/pojo/ParamApprovalRecordPojo.java → src/main/java/com/xdap/self_development/domain/pojo/ParamApprovalRecordPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;

10
src/main/java/com/xdap/self_development/pojo/Parameter.java → src/main/java/com/xdap/self_development/domain/pojo/ParameterPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
@ -30,7 +30,7 @@ import lombok.NoArgsConstructor;
@Data
@Table("yfsjglpt_model_parameter")
@NoArgsConstructor
public class Parameter extends MpaasBasePojo {
public class ParameterPojo extends MpaasBasePojo {
@RowID(sequence = "parameter_s", type = RowIDType.UUID)
private String id;
@ExcelProperty("序号")
@ -65,9 +65,9 @@ public class Parameter extends MpaasBasePojo {
@Column(value = "max_number",type=ColumnType.CALCULATE)
private Integer maxNumber;
public Parameter(Integer parameterNumber, String subsystemName, String parameterType,
String partsName, String parameterName, String unit, String parameterSource,
String numberOrFormula, String department, String remarks) {
public ParameterPojo(Integer parameterNumber, String subsystemName, String parameterType,
String partsName, String parameterName, String unit, String parameterSource,
String numberOrFormula, String department, String remarks) {
this.parameterNumber = parameterNumber;
this.subsystemName = subsystemName;
this.parameterType = parameterType;

4
src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java → src/main/java/com/xdap/self_development/domain/pojo/ResponsiblePersonPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.definesys.mpaas.query.annotation.*;
@ -15,7 +15,7 @@ import java.sql.Timestamp;
@SQL(view = "getResponsibleAndName",
sql = "SELECT ymrp.*, xu.username, xu.user_number as userAccount FROM yfsjglpt_model_responsible_person ymrp JOIN xdap_users xu ON ymrp.user_id = xu.id where ymrp.person_level = #level order by creation_date desc")
})
public class ResponsiblePerson extends MpaasBasePojo {
public class ResponsiblePersonPojo extends MpaasBasePojo {
@RowID(sequence = "responsible_person_s", type = RowIDType.UUID)
private String id;
private String departmentId;

14
src/main/java/com/xdap/self_development/pojo/RevisionRecord.java → src/main/java/com/xdap/self_development/domain/pojo/RevisionRecordPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;
@ -15,7 +15,7 @@ import java.sql.Timestamp;
@Data
@NoArgsConstructor
@Table("yfsjglpt_model_revision_record")
public class RevisionRecord extends MpaasBasePojo {
public class RevisionRecordPojo extends MpaasBasePojo {
@RowID(sequence = "revision_record_s", type = RowIDType.UUID)
private String id;
private String templateName;
@ -30,11 +30,11 @@ public class RevisionRecord extends MpaasBasePojo {
private Integer returnNum;
public RevisionRecord(String templateName, Integer version,
Integer parameterNumber, String modifyDetails,
String templateId, String preTemplateId,
Timestamp createTime, String parameterId,
Integer returnNum) {
public RevisionRecordPojo(String templateName, Integer version,
Integer parameterNumber, String modifyDetails,
String templateId, String preTemplateId,
Timestamp createTime, String parameterId,
Integer returnNum) {
this.templateName = templateName;
this.version = version;
this.parameterNumber = parameterNumber;

4
src/main/java/com/xdap/self_development/pojo/TemplateAndParameter.java → src/main/java/com/xdap/self_development/domain/pojo/TemplateAndParameterPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType;
@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
@Table("yfsjglpt_model_parameter_and_template")
public class TemplateAndParameter extends MpaasBasePojo {
public class TemplateAndParameterPojo extends MpaasBasePojo {
@RowID(sequence = "template_and_parameter_s", type = RowIDType.UUID)
private String id;
private String templateId;

10
src/main/java/com/xdap/self_development/pojo/Template.java → src/main/java/com/xdap/self_development/domain/pojo/TemplatePojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.*;
import com.definesys.mpaas.query.model.MpaasBasePojo;
@ -26,7 +26,7 @@ import java.sql.Timestamp;
@Data
@Table("yfsjglpt_model_template")
@NoArgsConstructor
public class Template extends MpaasBasePojo {
public class TemplatePojo extends MpaasBasePojo {
@RowID(sequence = "template_s", type = RowIDType.UUID)
private String id;
private String templateName;
@ -44,9 +44,9 @@ public class Template extends MpaasBasePojo {
@Column(type = ColumnType.CALCULATE)
private Integer maxOrder;
public Template(String templateName, Integer version, String status,
Timestamp createdTime, Timestamp publishedTime,
String createBy, Long orderNum, Integer returnNum) {
public TemplatePojo(String templateName, Integer version, String status,
Timestamp createdTime, Timestamp publishedTime,
String createBy, Long orderNum, Integer returnNum) {
this.templateName = templateName;
this.version = version;
this.status = status;

2
src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java → src/main/java/com/xdap/self_development/domain/pojo/TodoTaskPojo.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo;
package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.RowID;

4
src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterView.java → src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterView.java
View File

@ -1,6 +1,6 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.xdap.self_development.pojo.EngineParamDetailPojo;
import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
import lombok.Data;
import java.util.List;

3
src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterViewAndParam.java → src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterViewAndParam.java
View File

@ -1,6 +1,5 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.xdap.self_development.pojo.EngineParamDetailPojo;
import lombok.Data;
import java.util.List;

2
src/main/java/com/xdap/self_development/pojo/view/ApprovalFlowNodeView.java → src/main/java/com/xdap/self_development/domain/view/ApprovalFlowNodeView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/view/CalculationParameterView.java → src/main/java/com/xdap/self_development/domain/view/CalculationParameterView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;

2
src/main/java/com/xdap/self_development/pojo/view/DepartmentUserView.java → src/main/java/com/xdap/self_development/domain/view/DepartmentUserView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;

2
src/main/java/com/xdap/self_development/pojo/view/FlowNode.java → src/main/java/com/xdap/self_development/domain/view/FlowNode.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

16
src/main/java/com/xdap/self_development/domain/view/MenuListView.java Normal file
View File

@ -0,0 +1,16 @@
package com.xdap.self_development.domain.view;
import lombok.Data;
import java.util.ArrayList;
@Data
public class MenuListView {
private String id;
private String parent_id;
private String menu;
private String menuDesc;
ArrayList<MenuListView> listViews;
}

4
src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java → src/main/java/com/xdap/self_development/domain/view/MenuParamView.java
View File

@ -1,11 +1,9 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
@Data
@AllArgsConstructor

2
src/main/java/com/xdap/self_development/pojo/view/ParameterItem.java → src/main/java/com/xdap/self_development/domain/view/ParameterItem.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import lombok.Data;

2
src/main/java/com/xdap/self_development/pojo/view/ParametersView.java → src/main/java/com/xdap/self_development/domain/view/ParametersView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;

2
src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java → src/main/java/com/xdap/self_development/domain/view/TemplateChangeView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;

2
src/main/java/com/xdap/self_development/pojo/view/TemplateInfoView.java → src/main/java/com/xdap/self_development/domain/view/TemplateInfoView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import lombok.Data;

6
src/main/java/com/xdap/self_development/pojo/view/TodoAndReportListView.java → src/main/java/com/xdap/self_development/domain/view/TodoAndReportListView.java
View File

@ -1,9 +1,9 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdap.self_development.pojo.ApprovalXdapUsers;
import com.xdap.self_development.domain.pojo.ApprovalXdapUsersPojo;
import lombok.Data;
import java.sql.Timestamp;
@ -24,7 +24,7 @@ public class TodoAndReportListView {
private String createBy;
private String currentUsers;
private String username;
private List<ApprovalXdapUsers> currentApprovers;
private List<ApprovalXdapUsersPojo> currentApprovers;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp createdTime;
}

2
src/main/java/com/xdap/self_development/pojo/view/TodoAndReportView.java → src/main/java/com/xdap/self_development/domain/view/TodoAndReportView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;

7
src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java → src/main/java/com/xdap/self_development/domain/view/TodoAndTemplateView.java
View File

@ -1,10 +1,9 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdap.self_development.pojo.ApprovalXdapUsers;
import lombok.AllArgsConstructor;
import com.xdap.self_development.domain.pojo.ApprovalXdapUsersPojo;
import lombok.Data;
import java.sql.Timestamp;
@ -29,7 +28,7 @@ public class TodoAndTemplateView {
private String createBy;
private String currentUsers;
private String username;
private List<ApprovalXdapUsers> currentApprovers;
private List<ApprovalXdapUsersPojo> currentApprovers;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp createdTime;
}

2
src/main/java/com/xdap/self_development/pojo/view/XdapUserView.java → src/main/java/com/xdap/self_development/domain/view/XdapUserView.java
View File

@ -1,4 +1,4 @@
package com.xdap.self_development.pojo.view;
package com.xdap.self_development.domain.view;
import com.definesys.mpaas.query.annotation.SQL;
import com.definesys.mpaas.query.annotation.SQLQuery;

14
src/main/java/com/xdap/self_development/enums/IsDeleteEnum.java
View File

@ -1,14 +0,0 @@
package com.xdap.self_development.enums;
public enum IsDeleteEnum {
/**
* 已删除
*/
DELETED,
/**
* 未删除
*/
NOT_DELETED,
}

10
src/main/java/com/xdap/self_development/enums/ParamOperation.java
View File

@ -1,10 +0,0 @@
package com.xdap.self_development.enums;
public enum ParamOperation {
//新增
INSERT,
//修改
UPDATE,
//删除
DELETE;
}

7
src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java
View File

@ -1,15 +1,14 @@
package com.xdap.self_development.feign;
import com.xdap.common.config.FeignConfig;
import com.xdap.self_development.feign.dto.*;
import com.xdap.self_development.domain.dto.AppTokenDTO;
import com.xdap.self_development.domain.dto.FileUploadDTO;
import com.xdap.self_development.domain.dto.UserTokenDT0;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.Map;
@FeignClient(
name = "apaas-client",
url = "${apaas.token.url}",

51
src/main/java/com/xdap/self_development/interceptor/CustomRequestInterceptor.java
View File

@ -1,51 +0,0 @@
package com.xdap.self_development.interceptor;
import com.xdap.api.moudle.user.vo.LoginUserVo;
import com.xdap.runtime.service.RuntimeAppContextService;
import com.xdap.runtime.service.RuntimeUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Slf4j
//@Component
public class CustomRequestInterceptor implements HandlerInterceptor {
// @Resource
// private RuntimeAppContextService runtimeAppContextService;
// @Resource
// private RuntimeUserService runtimeUserService;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
Object handler) throws Exception {
log.info("=== 请求开始 ===");
log.info("请求URL: {}", request.getRequestURL());
log.info("请求方法: {}", request.getMethod());
log.info("客户端IP: {}", request.getRemoteAddr());
return true; // 返回true表示继续处理
}
@Override
public void postHandle(HttpServletRequest request, HttpServletResponse response,
Object handler, ModelAndView modelAndView) throws Exception {
log.info("=== 请求处理完成，准备渲染视图 ===");
}
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
Object handler, Exception ex) throws Exception {
log.info("=== 请求结束 ===");
if (ex != null) {
log.error("请求处理过程中发生异常: {}", ex.getMessage());
}
}
}

14
src/main/java/com/xdap/self_development/listener/EngineModelListener.java
View File

@ -7,10 +7,10 @@ import com.alibaba.excel.util.ListUtils;
import com.definesys.mpaas.query.MpaasQueryFactory;
import com.xdap.api.moudle.user.pojo.XdapUsers;
import com.xdap.self_development.controller.request.DataEntryEngineModelExcel;
import com.xdap.self_development.enums.DistributeStatusEnum;
import com.xdap.self_development.enums.ParamValueVersionEnum;
import com.xdap.self_development.domain.enums.DistributeStatusEnum;
import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
import com.xdap.self_development.exception.ExcelImportException;
import com.xdap.self_development.pojo.*;
import com.xdap.self_development.domain.pojo.*;
import com.xdap.self_development.service.EngineParamDetailService;
import com.xdap.self_development.service.ResponsiblePerService;
import lombok.extern.slf4j.Slf4j;
@ -121,7 +121,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
ArrayList<DataEntryEngineModelPojo> modelPojos = new ArrayList<>();
List<Parameter> parameters = engineParamDetailService.selectAllByNewVersion();
List<ParameterPojo> parameters = engineParamDetailService.selectAllByNewVersion();
//写入机型
for (DataEntryEngineModelExcel modelExcel : cachedDataList) {
DataEntryEngineModelPojo modelPojo = new DataEntryEngineModelPojo();
@ -150,7 +150,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
}
//为每个机型绑定参数
private void saveDataParamDetail(ArrayList<DataEntryEngineModelPojo> modelPojos, List<Parameter> parameters) {
private void saveDataParamDetail(ArrayList<DataEntryEngineModelPojo> modelPojos, List<ParameterPojo> parameters) {
/**
* 遍历机型
* 查找参数 将每个机型都把参数，和参数所属的填写部门关联上
@ -158,7 +158,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
*/
List<EngineParamDetailPojo> engineParamDetailPojos = new ArrayList<>();
for (DataEntryEngineModelPojo modelPojo : modelPojos) {
for (Parameter parameter : parameters) {
for (ParameterPojo parameter : parameters) {
EngineParamDetailPojo engineParamDetailPojo = new EngineParamDetailPojo();
engineParamDetailPojo.setEngineModelId(modelPojo.getId());
@ -177,7 +177,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
engineParamDetailPojo.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
engineParamDetailPojos.add(engineParamDetailPojo);
//为每个参数生成默认责任人
List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());
List<ResponsiblePersonPojo> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());
if (ObjectUtils.isNotEmpty(personPojos)) {
// 不再默认生成责任人 engineParamDetailPojo.setResponsiblePersonId(personPojos.get(0).getId());
}

10
src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
View File

@ -6,9 +6,9 @@ import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.excel.util.ListUtils;
import com.definesys.mpaas.query.MpaasQueryFactory;
import com.xdap.self_development.controller.request.EngineParamDetailExcel;
import com.xdap.self_development.enums.ParamOperation;
import com.xdap.self_development.enums.ParamValueVersionEnum;
import com.xdap.self_development.pojo.*;
import com.xdap.self_development.domain.enums.ParamOperationEnum;
import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
import com.xdap.self_development.domain.pojo.*;
import com.xdap.self_development.service.DataEntryEngineModelService;
import com.xdap.self_development.service.DataEntryService;
import com.xdap.self_development.service.ResponsiblePerService;
@ -126,7 +126,7 @@ public class EngineParamDetailListener implements ReadListener<EngineParamDetail
.update("minor_version", paramDetailExcel.getParameterValue())
.update("version_status",ParamValueVersionEnum.DRAFT.getCode())
.update("last_updated_by", userId)
.update("operation",String.valueOf(ParamOperation.UPDATE))
.update("operation",String.valueOf(ParamOperationEnum.UPDATE))
.rowid("id", detailPojos.get(0).getId())
.doUpdate(EngineParamDetailPojo.class);
} else if(ObjectUtils.isEmpty(detailPojos)&&ObjectUtils.isNotEmpty(paramDetailExcel.getId())){
@ -156,7 +156,7 @@ public class EngineParamDetailListener implements ReadListener<EngineParamDetail
// //todo通过部门+姓名存入填写人 最好根据工号
// engineParamDetailPojo.setFilledBy();
// engineParamDetailPojo.setVersionStatus(ParamValueVersionEnum.DRAFT.getCode());
// engineParamDetailPojo.setOperation(String.valueOf(ParamOperation.INSERT));
// engineParamDetailPojo.setOperation(String.valueOf(ParamOperationEnum.INSERT));
// engineParamDetailPojo.setCreatedBy(createdBy);
// engineParamDetailPojo.setCreatedDate(createdDate);
// engineParamDetailPojo.setLastUpdatedBy(lastModifiedBy);

10
src/main/java/com/xdap/self_development/listener/PersonReadListener.java
View File

@ -3,8 +3,8 @@ package com.xdap.self_development.listener;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import com.xdap.self_development.common.MyResponse;
import com.xdap.self_development.pojo.ResponsiblePerson;
import com.xdap.self_development.pojo.view.XdapUserView;
import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
import com.xdap.self_development.domain.view.XdapUserView;
import com.xdap.self_development.service.ResponsiblePersonService;
import java.sql.Timestamp;
@ -12,10 +12,10 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
public class PersonReadListener implements ReadListener<ResponsiblePerson> {
public class PersonReadListener implements ReadListener<ResponsiblePersonPojo> {
MyResponse problems;
private final ResponsiblePersonService responsiblePersonService;
private List<ResponsiblePerson> cachedDataList;
private List<ResponsiblePersonPojo> cachedDataList;
public PersonReadListener(ResponsiblePersonService responsiblePersonService, MyResponse problems) {
this.problems = problems;
@ -24,7 +24,7 @@ public class PersonReadListener implements ReadListener<ResponsiblePerson> {
}
@Override
public void invoke(ResponsiblePerson responsiblePerson, AnalysisContext analysisContext) {
public void invoke(ResponsiblePersonPojo responsiblePerson, AnalysisContext analysisContext) {
if (
responsiblePerson.getDepartment() == null ||
responsiblePerson.getUsername() == null ||

Some files were not shown because too many files have changed in this diff Show More