Merge remote-tracking branch 'origin/main'

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java

@@ -24,8 +24,8 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
     default PageResult<RemainPlateDO> selectPage(RemainPlatePageReqVO reqVO) {
         LambdaQueryWrapperX<RemainPlateDO> wrapper = new LambdaQueryWrapperX<RemainPlateDO>()
                 .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId().toString() : null)
-                .eqIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null)
-                .eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId().toString() : null)
+                .likeIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null)
+                .likeIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId().toString() : null)
                 .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId())
                 .eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting())

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasetController.java

@@ -61,7 +61,7 @@ public class ReportDatasetController {
 
     @GetMapping("/dataset/{id}")
     @Operation(summary = "获得报表数据集")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('report:dataset:query')")
     public CommonResult<ReportDatasetRespVO> getDataset(@PathVariable("id") Long id) {
         ReportDatasetDO dataset = datasetService.getDataset(id);
@@ -71,7 +71,9 @@ public class ReportDatasetController {
     @GetMapping("/datasets")
     @Operation(summary = "获取数据源下的报表数据集列表")
     @PreAuthorize("@ss.hasPermission('report:dataset:query')")
-    public CommonResult<List<ReportDatasetRespVO>> getDatasetPage(@Valid ReportDatasetReqVO pageReqVO) {
-        return success(BeanUtils.toBean(datasetService.getDatasetList(pageReqVO), ReportDatasetRespVO.class));
+    public CommonResult<List<ReportDatasetRespVO>> getDatasetPage(@RequestParam(value = "datasourceId") Long datasourceId,
+                                                                  @RequestParam(value = "name", required = false) String name) {
+        ReportDatasetReqVO reqVO = new ReportDatasetReqVO(name, datasourceId);
+        return success(BeanUtils.toBean(datasetService.getDatasetList(reqVO), ReportDatasetRespVO.class));
     }
 }

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasourceController.java

@@ -71,7 +71,10 @@ public class ReportDatasourceController {
     @GetMapping("/datasources")
     @Operation(summary = "获取报表模板下的报表数据源")
     @PreAuthorize("@ss.hasPermission('report:datasource:query')")
-    public CommonResult<List<ReportDatasourceRespVO>> getDatasourcePage(@Valid ReportDatasourceReqVO pageReqVO) {
-        return success(BeanUtils.toBean(datasourceService.getTemplateDatasourceList(pageReqVO), ReportDatasourceRespVO.class));
+    public CommonResult<List<ReportDatasourceRespVO>> getDatasourcePage(@RequestParam(value = "reportId") Long reportId,
+                                                                        @RequestParam(value = "name", required = false) String name,
+                                                                        @RequestParam(value = "type", required = false) Integer type) {
+        ReportDatasourceReqVO reqVO = new ReportDatasourceReqVO(reportId, name, type);
+        return success(BeanUtils.toBean(datasourceService.getTemplateDatasourceList(reqVO), ReportDatasourceRespVO.class));
     }
 }

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java

@@ -16,7 +16,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 
 import java.util.List;
@@ -40,7 +39,6 @@ public class ReportTemplateController {
     @PutMapping("/template")
     @Operation(summary = "创建报表模板信息")
     @PreAuthorize("@ss.hasPermission('report:template:create')")
-    @PermitAll
     public CommonResult<Long> createTemplate(@Valid @RequestBody ReportTemplateSaveReqVO createReqVO) {
         OrganContextHolder.setOrganId(1L);
         return success(templateService.createReportTemplate(createReqVO));
@@ -75,8 +73,9 @@ public class ReportTemplateController {
     @GetMapping("/templates")
     @Operation(summary = "获得报表模板信息列表")
     @PreAuthorize("@ss.hasPermission('report:template:query')")
-    @PermitAll
-    public CommonResult<List<ReportTemplateRespVO>> getTemplatePage(@Valid ReportTemplateReqVO pageReqVO) {
-        return success(BeanUtils.toBean(templateService.getReportTemplateList(pageReqVO), ReportTemplateRespVO.class));
+    public CommonResult<List<ReportTemplateRespVO>> getTemplatePage(@RequestParam(value = "name", required = false) String name,
+                                                                    @RequestParam(value = "type", required = false) Integer type) {
+        ReportTemplateReqVO reqVO = new ReportTemplateReqVO(name, type);
+        return success(BeanUtils.toBean(templateService.getReportTemplateList(reqVO), ReportTemplateRespVO.class));
     }
 }

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetReqVO.java

@@ -1,7 +1,9 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 /**
@@ -11,6 +13,8 @@ import lombok.ToString;
 @Schema(description = "管理后台 - 报表数据集 Request VO")
 @Data
 @ToString(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportDatasetReqVO {
     @Schema(description = "数据集名称", example = "测试数据集")
     private String name;

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetRespVO.java

@@ -1,7 +1,9 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -12,6 +14,8 @@ import java.util.List;
  */
 @Schema(description = "管理后台 - 报表数据集 Response VO")
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportDatasetRespVO {
     @Schema(description = "数据集id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetSaveReqVO.java

@@ -1,8 +1,10 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -14,6 +16,8 @@ import java.util.List;
 @Schema(description = "管理后台 - 报表数据集新增/修改 Request VO")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportDatasetSaveReqVO {
     @Schema(description = "数据集id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceReqVO.java

@@ -1,7 +1,9 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 /**
@@ -11,6 +13,8 @@ import lombok.ToString;
 @Schema(description = "管理后台 - 报表数据源 Request VO")
 @Data
 @ToString(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportDatasourceReqVO {
     @Schema(description = "模板id", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long reportId;

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceRespVO.java

@@ -1,7 +1,9 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
@@ -11,6 +13,8 @@ import java.time.LocalDateTime;
  */
 @Schema(description = "管理后台 - 报表数据源 Response VO")
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportDatasourceRespVO {
 
     @Schema(description = "数据源id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceSaveReqVO.java

@@ -1,8 +1,10 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 
@@ -13,8 +15,10 @@ import javax.validation.constraints.NotNull;
 @Schema(description = "管理后台 - 报表数据源新增/修改 Request VO")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportDatasourceSaveReqVO {
-    @Schema(description = "数据源id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "数据源id", example = "1")
     private Long id;
 
     @Schema(description = "模板id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateReqVO.java

@@ -1,7 +1,9 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 /**
@@ -11,6 +13,8 @@ import lombok.ToString;
 @Schema(description = "管理后台 - 报表模板信息列表 Request VO")
 @Data
 @ToString(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportTemplateReqVO {
     @Schema(description = "模板名称", example = "生产单模板")
     private String name;

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java

@@ -1,7 +1,9 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
@@ -11,8 +13,10 @@ import java.time.LocalDateTime;
  */
 @Schema(description = "管理后台 - 报表模板信息 Response VO")
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ReportTemplateRespVO {
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15176")
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
 
     @Schema(description = "模板名称", example = "生产单模板")
@@ -21,7 +25,7 @@ public class ReportTemplateRespVO {
     @Schema(description = "报表模板")
     private String template;
 
-    @Schema(description = "模板类型，0内置、1自定义", example = "2")
+    @Schema(description = "模板类型，0内置、1自定义", example = "0")
     private Long type;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java

@@ -1,8 +1,12 @@
 package com.cf.imes.module.report.controller.admin.template.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
 
 /**
  * @author Gqr
@@ -11,9 +15,11 @@ import lombok.Data;
 @Schema(description = "管理后台 - 报表模板信息新增/修改 Request VO")
 @Data
 @Builder
-public class ReportTemplateSaveReqVO {
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportTemplateSaveReqVO  {
 
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "主键", example = "1")
     private Long id;
 
     @Schema(description = "模板名称", example = "生产单模板")

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImpl.java

@@ -67,7 +67,7 @@ public class ReportDatasetServiceImpl implements ReportDatasetService {
     @Override
     public List<ReportDatasetDO> getDatasetList(ReportDatasetReqVO reqVO) {
         return datasetMapper.selectList(new LambdaQueryWrapperX<ReportDatasetDO>()
-                .eq(ReportDatasetDO::getDatasourceId, reqVO.getDatasourceId())
+                .eqIfPresent(ReportDatasetDO::getDatasourceId, reqVO.getDatasourceId())
                 .likeIfPresent(ReportDatasetDO::getName, reqVO.getName())
                 .orderByDesc(ReportDatasetDO::getCreateTime));
     }

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImpl.java

@@ -72,9 +72,9 @@ public class ReportDatasourceServiceImpl implements ReportDatasourceService {
     @Override
     public List<ReportDatasourceDO> getTemplateDatasourceList(ReportDatasourceReqVO reqVO) {
         return datasourceMapper.selectList(new LambdaQueryWrapperX<ReportDatasourceDO>()
-                .eq(ReportDatasourceDO::getReportId, reqVO.getReportId())
+                .eqIfPresent(ReportDatasourceDO::getReportId, reqVO.getReportId())
                 .likeIfPresent(ReportDatasourceDO::getName, reqVO.getName())
-                .eq(ReportDatasourceDO::getType, reqVO.getType())
+                .eqIfPresent(ReportDatasourceDO::getType, reqVO.getType())
                 .orderByDesc(ReportDatasourceDO::getCreateTime));
     }
 }

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cf.imes.module.report.service.template;
 
+import cn.hutool.core.util.URLUtil;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateReqVO;
@@ -30,9 +31,10 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
 
     @Override
     public Long createReportTemplate(ReportTemplateSaveReqVO createReqVO) {
-        String templateContent = createReqVO.getTemplate();
+        String templateContent = URLUtil.decode(createReqVO.getTemplate());
         if(StringUtils.isNotEmpty(templateContent)) {
             // todo template压缩待完善
+            createReqVO.setTemplate(templateContent);
         }
         // 插入
         ReportTemplateDO template = BeanUtils.toBean(createReqVO, ReportTemplateDO.class);
@@ -82,7 +84,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
     public List<ReportTemplateDO> getReportTemplateList(ReportTemplateReqVO reqVO) {
         return templateMapper.selectList(new LambdaQueryWrapperX<ReportTemplateDO>()
                 .likeIfPresent(ReportTemplateDO::getName, reqVO.getName())
-                .eq(ReportTemplateDO::getType, reqVO.getType())
+                .eqIfPresent(ReportTemplateDO::getType, reqVO.getType())
                 .orderByDesc(ReportTemplateDO::getCreateTime));
     }
 }