diff --git a/src/main/java/com/xdap/self_development/controller/DeleteController.java b/src/main/java/com/xdap/self_development/controller/DeleteController.java index 071dd9f..950717a 100644 --- a/src/main/java/com/xdap/self_development/controller/DeleteController.java +++ b/src/main/java/com/xdap/self_development/controller/DeleteController.java @@ -1,20 +1,14 @@ package com.xdap.self_development.controller; -import cn.hutool.core.codec.Base64; -import cn.hutool.json.JSONUtil; import com.definesys.mpaas.common.http.Response; import com.xdap.self_development.config.BusinessDatabase; -import com.xdap.self_development.feign.ApaasMyTokenFeign; -import com.xdap.self_development.feign.dto.AppTokenDTO; -import com.xdap.self_development.feign.dto.FileUploadDTO; -import com.xdap.self_development.feign.dto.UserTokenDT0; import com.xdap.self_development.pojo.*; import lombok.extern.slf4j.Slf4j; -import org.bson.types.ObjectId; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.HashMap; diff --git a/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java b/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java index aaab866..e889a0b 100644 --- a/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java +++ b/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import java.util.List; @RestController diff --git a/src/main/java/com/xdap/self_development/controller/form/BenchmarkingReportPageForm.java b/src/main/java/com/xdap/self_development/controller/form/BenchmarkingReportPageForm.java index 6d5efcc..375d325 100644 --- a/src/main/java/com/xdap/self_development/controller/form/BenchmarkingReportPageForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/BenchmarkingReportPageForm.java @@ -1,11 +1,8 @@ package com.xdap.self_development.controller.form; import lombok.Data; -import org.springframework.web.bind.annotation.RequestParam; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; @Data public class BenchmarkingReportPageForm { diff --git a/src/main/java/com/xdap/self_development/controller/form/DepartmentUserForm.java b/src/main/java/com/xdap/self_development/controller/form/DepartmentUserForm.java index 472c9bc..638a56d 100644 --- a/src/main/java/com/xdap/self_development/controller/form/DepartmentUserForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/DepartmentUserForm.java @@ -1,7 +1,6 @@ package com.xdap.self_development.controller.form; import lombok.Data; -import org.springframework.web.bind.annotation.RequestParam; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java b/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java index fe5cbfb..1b47a2a 100644 --- a/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/ParameterForm.java @@ -3,7 +3,6 @@ package com.xdap.self_development.controller.form; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; @Data public class ParameterForm { diff --git a/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java b/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java index e4e0ec2..6d814d2 100644 --- a/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java @@ -1,8 +1,6 @@ package com.xdap.self_development.controller.form; import lombok.Data; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; diff --git a/src/main/java/com/xdap/self_development/controller/form/UpdateParameterForm.java b/src/main/java/com/xdap/self_development/controller/form/UpdateParameterForm.java index 0c11c63..64d2ba4 100644 --- a/src/main/java/com/xdap/self_development/controller/form/UpdateParameterForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/UpdateParameterForm.java @@ -5,7 +5,6 @@ import lombok.Data; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.List; @Data diff --git a/src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java b/src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java index 102dfc2..a8c8d51 100644 --- a/src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java +++ b/src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java @@ -1,13 +1,14 @@ package com.xdap.self_development.pojo; -import com.definesys.mpaas.query.annotation.*; +import com.definesys.mpaas.query.annotation.RowID; +import com.definesys.mpaas.query.annotation.RowIDType; +import com.definesys.mpaas.query.annotation.Table; import com.definesys.mpaas.query.model.MpaasBasePojo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import java.sql.Timestamp; -import java.util.List; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java b/src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java index a61869f..a1b7189 100644 --- a/src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java +++ b/src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java @@ -1,7 +1,5 @@ package com.xdap.self_development.pojo; -import com.definesys.mpaas.query.annotation.SQL; -import com.definesys.mpaas.query.annotation.SQLQuery; import com.definesys.mpaas.query.annotation.Table; import com.xdap.api.moudle.base.entity.NoTenBasePojo; import lombok.Data; diff --git a/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java b/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java index 692d68f..605e5ea 100644 --- a/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java +++ b/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java @@ -1,6 +1,8 @@ package com.xdap.self_development.pojo; -import com.definesys.mpaas.query.annotation.*; +import com.definesys.mpaas.query.annotation.RowID; +import com.definesys.mpaas.query.annotation.RowIDType; +import com.definesys.mpaas.query.annotation.Table; import com.definesys.mpaas.query.model.MpaasBasePojo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java b/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java index 3ffbced..64291a4 100644 --- a/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java +++ b/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.bouncycastle.util.Times; import java.sql.Timestamp; @@ -27,11 +26,12 @@ public class RevisionRecord extends MpaasBasePojo { private String preTemplateId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp createdTime; + private String parameterId; public RevisionRecord(String templateName, Integer version, Integer parameterNumber, String modifyDetails, String templateId, String preTemplateId, - Timestamp createdTime) { + Timestamp createdTime, String parameterId) { this.templateName = templateName; this.version = version; this.parameterNumber = parameterNumber; @@ -39,5 +39,6 @@ public class RevisionRecord extends MpaasBasePojo { this.templateId = templateId; this.preTemplateId = preTemplateId; this.createdTime = createdTime; + this.parameterId = parameterId; } } diff --git a/src/main/java/com/xdap/self_development/pojo/Template.java b/src/main/java/com/xdap/self_development/pojo/Template.java index 39e3d99..30fb39c 100644 --- a/src/main/java/com/xdap/self_development/pojo/Template.java +++ b/src/main/java/com/xdap/self_development/pojo/Template.java @@ -12,11 +12,11 @@ import java.sql.Timestamp; @SQLQuery(value = { // 查找每个模板的最新版本并且优先级按照已发布、审核中、草稿状态转变（只有这三种状态） @SQL(view = "getLatestTemplate", - sql = "SELECT * FROM ( SELECT t.*, ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY CASE WHEN status = 'COMPLETE' THEN 1 WHEN status = 'APPROVING' THEN 2 ELSE 3 END, version DESC) AS rn FROM yfsjglpt_model_template t WHERE status IN ('COMPLETE', 'DRAFT', 'APPROVING') ) ranked WHERE rn = 1" + sql = "SELECT * FROM ( SELECT t.*, ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY CASE WHEN status = 'COMPLETE' THEN 1 WHEN status = 'APPROVING' THEN 2 ELSE 3 END, version DESC) AS rn FROM yfsjglpt_model_template t WHERE status IN ('COMPLETE', 'DRAFT', 'APPROVING') ) ranked WHERE rn = 1 ORDER BY CASE status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC" ), // 获取所有模板的最新版本号（包括所有状态） @SQL(view = "getNewTemplate", - sql = "SELECT t.* FROM yfsjglpt_model_template t JOIN ( SELECT template_name, MAX(version) AS latest_version FROM yfsjglpt_model_template GROUP BY template_name ) latest_template ON t.template_name = latest_template.template_name AND t.version = latest_template.latest_version") + sql = "SELECT t.* FROM yfsjglpt_model_template t JOIN ( SELECT template_name, MAX(version) AS latest_version FROM yfsjglpt_model_template GROUP BY template_name ) latest_template ON t.template_name = latest_template.template_name AND t.version = latest_template.latest_version ") }) @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java b/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java index 758631c..c1b4bb1 100644 --- a/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java +++ b/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java @@ -6,7 +6,7 @@ import lombok.Data; @SQLQuery(value = { @SQL(view = "getParameterAndChange", - sql = "SELECT p.*, r.modify_details FROM yfsjglpt_model_parameter_and_template tap INNER JOIN yfsjglpt_model_parameter p ON tap.parameter_id = p.id LEFT JOIN yfsjglpt_model_revision_record r ON tap.template_id = r.template_id AND p.parameter_number = r.parameter_number WHERE tap.template_id = #templateId ORDER BY p.parameter_number") + sql = "SELECT p.*, r.modify_details FROM ( SELECT *, ROW_NUMBER() OVER (PARTITION BY parameter_id ORDER BY created_time DESC) AS rn FROM yfsjglpt_model_revision_record ) r LEFT JOIN yfsjglpt_model_parameter p ON r.parameter_id = p.id WHERE r.rn = 1 and r.template_id = #templateId") }) @Data public class TemplateChangeView { diff --git a/src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java b/src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java index d7c4da7..c7b92d1 100644 --- a/src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java +++ b/src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java @@ -4,8 +4,6 @@ import com.definesys.mpaas.query.annotation.SQL; import com.definesys.mpaas.query.annotation.SQLQuery; import lombok.Data; -import java.util.List; - @SQLQuery(value = { @SQL(view = "getAllRoleUserAndPerm", sql = "SELECT r.id as roleId, r.role_name as roleName, GROUP_CONCAT(DISTINCT u.username) AS userNames , GROUP_CONCAT(DISTINCT p.permission_name) AS permissionNames FROM yfsjglpt_model_roles r LEFT JOIN yfsjglpt_model_user_roles ur ON r.id = ur.role_id LEFT JOIN yfsjglpt_model_role_permissions rp ON r.id = rp.role_id LEFT JOIN yfsjglpt_model_permissions p ON rp.permission_id = p.id LEFT JOIN xdap_users u ON u.id = ur.user_id GROUP BY r.id, r.role_name, r.description ORDER BY r.role_name") diff --git a/src/main/java/com/xdap/self_development/service/ParameterService.java b/src/main/java/com/xdap/self_development/service/ParameterService.java index 7ceb553..790ecdf 100644 --- a/src/main/java/com/xdap/self_development/service/ParameterService.java +++ b/src/main/java/com/xdap/self_development/service/ParameterService.java @@ -2,7 +2,6 @@ package com.xdap.self_development.service; import com.definesys.mpaas.query.db.PageQueryResult; import com.xdap.self_development.controller.form.ParameterPageForm; -import com.xdap.self_development.controller.form.TemplateRowIdForm; import com.xdap.self_development.controller.form.UpdateParameterForm; import com.xdap.self_development.pojo.Parameter; import com.xdap.self_development.pojo.view.TemplateInfoView; diff --git a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java index f19aec2..1ee4334 100644 --- a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java +++ b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java @@ -5,11 +5,9 @@ import com.xdap.self_development.controller.form.DeptResponsiblePageForm; import com.xdap.self_development.controller.form.ResponsiblePersonForm; import com.xdap.self_development.controller.form.UpdateResponsiblePersonForm; import com.xdap.self_development.pojo.ResponsiblePerson; -import com.xdap.self_development.pojo.Template; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import java.util.List; import java.util.Set; public interface ResponsiblePersonService { diff --git a/src/main/java/com/xdap/self_development/service/TemplateService.java b/src/main/java/com/xdap/self_development/service/TemplateService.java index a926f01..3dfbb5a 100644 --- a/src/main/java/com/xdap/self_development/service/TemplateService.java +++ b/src/main/java/com/xdap/self_development/service/TemplateService.java @@ -9,7 +9,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; public interface TemplateService { PageQueryResult