Merge remote-tracking branch 'origin/main'

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/OrderPartsController.java

@@ -96,7 +96,7 @@ public class OrderPartsController {
     @GetMapping("getPartsByOrderId")
     @Operation(summary = "批量查询有生产单号id、房间id，柜体id的板材")
     @PreAuthorize("@ss.hasPermission('executor:plate:getPlatesByOrderId')")
-    public  CommonResult<PageResult<OrderPartsRespVO>> getPPartsByOrderId(@Valid PlateTermsPageReqVO pageVO) {
+    public  CommonResult<PageResult<PartGoodsRespVO>> getPPartsByOrderId(@Valid PlateTermsPageReqVO pageVO) {
         return success(orderPartsService.getPartsPageByTerms(pageVO));
     }
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java

@@ -47,7 +47,7 @@ public interface OrderPartsMapper extends BaseMapperX<OrderPartsDO> {
     }
 
 
-    IPage<OrderPartsRespVO> selectProductList(@Param("page") IPage<OrderPartsRespVO> page , @Param("orderId")Long orderId, @Param("roomId")Long roomId , @Param("bodyId")Long bodyId,@Param("organId")Long organId);
+    IPage<PartGoodsRespVO> selectProductList(@Param("page") IPage<PartGoodsRespVO> page , @Param("orderId")Long orderId, @Param("roomId")Long roomId , @Param("bodyId")Long bodyId,@Param("organId")Long organId);
 
     List<PartGoodsRespVO> selectPartDetail(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted);// 配件明细
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsService.java

@@ -67,7 +67,7 @@ public interface OrderPartsService {
      * @param pageReqVO:
      * @return PageResult<PlateDO>
      */
-    PageResult<OrderPartsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO);
+    PageResult<PartGoodsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO);
 
     /**
      * 分组查询

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsServiceImpl.java

@@ -108,10 +108,10 @@ public class OrderPartsServiceImpl implements OrderPartsService {
     }
 
     @Override
-    public PageResult<OrderPartsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO) {
-        PageDTO<OrderPartsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-        IPage<OrderPartsRespVO> pageRes = orderPartsMapper.selectProductList(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(),getUserOrganId());
-        return new PageResult<OrderPartsRespVO>(pageRes.getRecords(), pageRes.getTotal());
+    public PageResult<PartGoodsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO) {
+        PageDTO<PartGoodsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        IPage<PartGoodsRespVO> pageRes = orderPartsMapper.selectProductList(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(),getUserOrganId());
+        return new PageResult<PartGoodsRespVO>(pageRes.getRecords(), pageRes.getTotal());
     }
 
     @Override

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml

@@ -3,11 +3,12 @@
 <mapper namespace="com.cf.imes.module.executor.dal.mysql.orderParts.OrderPartsMapper">
 
     <select id="selectProductList"
-            resultType="com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO">
+            resultType="com.cf.imes.module.executor.controller.admin.orderParts.vo.PartGoodsRespVO">
         SELECT distinct a.id, a.goods_id, a.name, a.material, a.type, a.model, a.spec, a.brand, a.factory,
-               a.unit, a.price, a.is_composite, a.remark, b.num
+               a.unit, a.price, a.is_composite, a.remark, b.num, c.id as bodyId, c.room_id, c.name as bodyName, c.room_name
         FROM order_parts a
                  LEFT JOIN order_item b ON a.id = b.parts_id and a.organ_id = b.organ_id
+                 LEFT JOIN order_body c on b.body_id = c.id and b.organ_id = c.organ_id and c.order_id = b.order_id
         WHERE b.organ_id =#{organId} and  b.order_id = #{orderId}
           AND (#{roomId} IS NULL OR b.room_id = #{roomId})
           AND (#{bodyId} IS NULL OR b.body_id = #{bodyId})

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

@@ -6,6 +6,7 @@ import com.bstek.designer.excel.ExcelParserUtils;
 import com.bstek.ureport.definition.ReportDefinition;
 import com.bstek.ureport.dsl.ReportParserLexer;
 import com.bstek.ureport.dsl.ReportParserParser;
+import com.bstek.ureport.exception.ReportException;
 import com.bstek.ureport.export.ExportUtils;
 import com.bstek.ureport.export.ProducerEnum;
 import com.bstek.ureport.export.html.HtmlReport;
@@ -21,6 +22,7 @@ import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateReqV
 import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateRespVO;
 import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO;
 import com.cf.imes.module.report.service.template.ReportTemplateService;
+import com.cf.imes.module.report.validation.template.ReportTemplateProducerTypeInEnum;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,7 +33,6 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -64,14 +65,21 @@ public class ReportTemplateController {
     private ReportTemplateService templateService;
 
     @PutMapping("/template")
-    @Operation(summary = "创建报表模板信息")
+    @Operation(summary = "创建报表模板")
 //    @PreAuthorize("@ss.hasPermission('report:template:create')")
     public CommonResult<Long> createTemplate(@Valid @RequestBody ReportTemplateSaveReqVO createReqVO) {
         return success(templateService.createReportTemplate(createReqVO));
     }
 
+    @PutMapping("/template/copy")
+    @Operation(summary = "复制报表模板")
+//    @PreAuthorize("@ss.hasPermission('report:template:create')")
+    public CommonResult<Long> copyTemplate(@Valid @RequestBody ReportTemplateSaveReqVO createReqVO) {
+        return success(templateService.copyReportTemplate(createReqVO));
+    }
+
     @PostMapping("/template")
-    @Operation(summary = "更新报表模板信息")
+    @Operation(summary = "更新报表模板")
 //    @PreAuthorize("@ss.hasPermission('report:template:update')")
     public CommonResult<Boolean> updateTemplate(@Valid @RequestBody ReportTemplateSaveReqVO updateReqVO) {
         templateService.updateReportTemplate(updateReqVO);
@@ -79,7 +87,7 @@ public class ReportTemplateController {
     }
 
     @DeleteMapping("/template/{id}")
-    @Operation(summary = "删除报表模板信息")
+    @Operation(summary = "删除报表模板")
     @Parameter(name = "id", description = "模板id", required = true)
 //    @PreAuthorize("@ss.hasPermission('report:template:delete')")
     public CommonResult<Boolean> deleteReportTemplate(@PathVariable("id") Long id) {
@@ -110,6 +118,18 @@ public class ReportTemplateController {
         return success(templateService.preview(params));
     }
 
+    @PostMapping("/template/print")
+    @Operation(summary = "模板预览打印")
+    public void print(@RequestBody PreviewParameters reportParameters, HttpServletResponse response) {
+        templateService.print(reportParameters, response);
+    }
+
+    @PostMapping("/template/download/{type}")
+    @Operation(summary = "模板预览下载")
+    public void print(@PathVariable @Valid @ReportTemplateProducerTypeInEnum String type, @RequestBody PreviewParameters reportParameters, HttpServletResponse response) {
+        templateService.download(type, reportParameters, response);
+    }
+
     @PostMapping("/template/export")
     @Operation(summary = "模板导出")
 //    @PreAuthorize("@ss.hasPermission('report:template:query')")
@@ -120,6 +140,8 @@ public class ReportTemplateController {
             out = response.getOutputStream();
             ProducerEnum p = ProducerEnum.valueOf(reqDTO.getProducerType().toUpperCase());
             ExportUtils.export(out, report, p);
+        } catch (ReportException rex) {
+            throw rex;
         } catch (Exception ex) {
             log.error("[generateExcel] 报表模板生成excel异常", ex);
         } finally {

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/framework/ureport/bean/MockSpringBeanDatasource.java

@@ -0,0 +1,28 @@
+package com.cf.imes.module.report.framework.ureport.bean;
+
+import com.cf.imes.module.report.framework.ureport.annotation.CfReportSpringbeanDatasource;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Gqr
+ * @since 2024/9/2 9:38
+ */
+@CfReportSpringbeanDatasource(value = "MockSpringBeanDatasource", name = "模拟springbean数据源")
+public class MockSpringBeanDatasource {
+    public List<Map<String, Object>> mockResult(String dsName, String datasetName, Map<String, Object> parameters) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
+        Map<String, Object> resultMap1 = new HashMap<>();
+        resultMap1.put("key", 1);
+        resultMap1.put("value", "模拟1");
+
+        Map<String, Object> resultMap2 = new HashMap<>();
+        resultMap2.put("key", 2);
+        resultMap2.put("value", "模拟2");
+        return resultList;
+    }
+}

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/framework/web/core/handler/ReportExceptionHandler.java

@@ -0,0 +1,27 @@
+package com.cf.imes.module.report.framework.web.core.handler;
+
+import com.bstek.ureport.exception.ReportException;
+import com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants;
+import com.cf.imes.framework.common.pojo.CommonResult;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * 自定义报表异常处理器
+ *
+ * @author Gqr
+ * @since 2024/9/2 14:52
+ */
+@RestControllerAdvice
+@AllArgsConstructor
+@Slf4j
+public class ReportExceptionHandler {
+
+    @ExceptionHandler(value = ReportException.class)
+    public CommonResult<?> reportExceptionHandler(ReportException ex) {
+        log.warn("[reportExceptionHandler]", ex);
+        return CommonResult.error(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(), String.format("报表异常:%s", ex.getMessage()));
+    }
+}

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

@@ -9,6 +9,7 @@ import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateReqV
 import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO;
 import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -20,7 +21,7 @@ import java.util.List;
  */
 public interface ReportTemplateService {
     /**
-     * 创建报表模板信息
+     * 创建报表模板
      *
      * @param createReqVO 创建信息
      * @return 编号
@@ -28,14 +29,21 @@ public interface ReportTemplateService {
     Long createReportTemplate(@Valid ReportTemplateSaveReqVO createReqVO);
 
     /**
-     * 更新报表模板信息
+     * 复制报表模版
+     * @param createReqVO
+     * @return
+     */
+    Long copyReportTemplate(@Valid ReportTemplateSaveReqVO createReqVO);
+
+    /**
+     * 更新报表模板
      *
      * @param updateReqVO 更新信息
      */
     void updateReportTemplate(@Valid ReportTemplateSaveReqVO updateReqVO);
 
     /**
-     * 删除报表模板信息
+     * 删除报表模板
      *
      * @param id 编号
      */
@@ -81,4 +89,18 @@ public interface ReportTemplateService {
      * @return
      */
     Report generateReport(ReportTemplateGenerateReqDTO dto);
+
+    /**
+     * 模版预览打印
+     */
+    void print(PreviewParameters params, HttpServletResponse response);
+
+    /**
+     * 模版预览下载
+     *
+     * @param type     文件类型
+     * @param params
+     * @param response
+     */
+    void download(String type, PreviewParameters params, HttpServletResponse response);
 }

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

@@ -19,11 +19,16 @@ import com.bstek.ureport.definition.datasource.DatasourceDefinition;
 import com.bstek.ureport.definition.datasource.JdbcDatasourceDefinition;
 import com.bstek.ureport.definition.datasource.SpringBeanDatasourceDefinition;
 import com.bstek.ureport.exception.ReportComputeException;
+import com.bstek.ureport.exception.ReportException;
+import com.bstek.ureport.export.ExportUtils;
+import com.bstek.ureport.export.ProducerEnum;
 import com.bstek.ureport.export.ReportRender;
 import com.bstek.ureport.export.html.HtmlProducer;
 import com.bstek.ureport.export.html.HtmlReport;
 import com.bstek.ureport.model.Report;
 import com.bstek.ureport.parser.ReportParser;
+import com.bstek.ureport.utils.ToolUtils;
+import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.aop.OrganIgnore;
@@ -51,13 +56,17 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATATEMPLATE_BUILDIN_OPERATION_PERMISSION_ERROR;
@@ -113,6 +122,51 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
         return templateId;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long copyReportTemplate(ReportTemplateSaveReqVO createReqVO) {
+        Long templateId = createReqVO.getId();
+        // 校验存在
+        ReportTemplateDO reportTemplateDO = validateTemplateExists(templateId);
+        // 校验内置模板操作权限
+        validateSystemTemplate(reportTemplateDO);
+        ReportTemplateDO copyTemplateDO = BeanUtils.toBean(reportTemplateDO, ReportTemplateDO.class);
+        // 重置id
+        copyTemplateDO.setId(null);
+        copyTemplateDO.setName(createReqVO.getName());
+        // 新增模版
+        templateMapper.insert(copyTemplateDO);
+        Long newtemplateId = copyTemplateDO.getId();
+
+        // 复制datasource、dataset
+        List<ReportDatasourceDO> templateDatasourceList = datasourceService.getTemplateDatasourceList(ReportDatasourceReqVO.builder().templateId(templateId).build());
+        List<ReportDatasourceSaveReqVO> copyDatasourceList = new ArrayList<>();
+        // 遍历数据源
+        templateDatasourceList.forEach(ds -> {
+            ReportDatasourceSaveReqVO copyDatasourceSaveReqVO = JsonUtils.parseObject(JsonUtils.toJsonString(ds), ReportDatasourceSaveReqVO.class);
+            copyDatasourceSaveReqVO.setId(null);
+            copyDatasourceSaveReqVO.setTemplateId(newtemplateId);
+
+            List<ReportDatasetDO> templateDatasetList = ds.getDatasets();
+            // 遍历数据集
+            if (CollUtil.isNotEmpty(templateDatasetList)) {
+                List<ReportDatasetSaveReqVO> copyDatasetList = new ArrayList<>();
+                templateDatasetList.forEach(dt -> {
+                    ReportDatasetSaveReqVO copyDatasetSaveReqVO = BeanUtils.toBean(dt, ReportDatasetSaveReqVO.class);
+                    copyDatasetSaveReqVO.setId(null);
+                    copyDatasetSaveReqVO.setDatasourceId(null);
+                    copyDatasetList.add(copyDatasetSaveReqVO);
+                });
+                copyDatasourceSaveReqVO.setDatasets(copyDatasetList);
+            }
+            copyDatasourceList.add(copyDatasourceSaveReqVO);
+        });
+        // 更新数据源
+        analyzeDatasource(copyDatasourceList, newtemplateId);
+        // 返回主键
+        return newtemplateId;
+    }
+
     /**
      * 解析数据源集合并入库
      *
@@ -120,6 +174,9 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
      * @param templateId 模板id
      */
     private void analyzeDatasource(List<ReportDatasourceSaveReqVO> datasource, Long templateId) {
+        if (CollUtil.isEmpty(datasource)) {
+            return;
+        }
         datasource.forEach(ds -> {
             // 更新/新增数据源
             Long datasourceId;
@@ -334,6 +391,56 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
         return htmlProducer.produce(reportDefinition, report);
     }
 
+    @Override
+    public void print(PreviewParameters params, HttpServletResponse response) {
+        long start = System.currentTimeMillis();
+        ReportRender reportRender = new ReportRender();
+        ReportDefinition reportDefinition = getReportDefinition(reportRender, params);
+        Report report = reportRender.render(reportDefinition, params.getQuery());
+        Map<String, String> chartImages = params.getChartImages();
+        report.setChartImages(chartImages);
+        try {
+            OutputStream out = response.getOutputStream();
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/pdf; charset=UTF-8");
+            // 创建下载文件
+            ProducerEnum p = ProducerEnum.PDF;
+            String downFileName = com.bstek.common.utils.StringUtils.randomFileName() + com.bstek.common.utils.StringUtils.getFileSuffix(p);
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(downFileName, "UTF-8"));
+            response.setHeader("code", "20000");
+            ExportUtils.export(out, report, p);
+            long end = System.currentTimeMillis();
+            ToolUtils.logToConsole("获取打印文件耗时:" + (end - start) + "ms");
+        } catch (Exception ex) {
+            throw new ReportException(ex);
+        }
+    }
+
+    @Override
+    public void download(String type, PreviewParameters params, HttpServletResponse response) {
+        ReportRender reportRender = new ReportRender();
+        ReportDefinition reportDefinition = getReportDefinition(reportRender, params);
+        Report report = reportRender.render(reportDefinition, params.getQuery());
+        Map<String, String> chartImages = params.getChartImages();
+        report.setChartImages(chartImages);
+        try {
+            OutputStream out = response.getOutputStream();
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/octet-stream; charset=UTF-8");
+            // 创建下载文件
+            ProducerEnum p = ProducerEnum.valueOf(type.toUpperCase());
+            String downFileName = com.bstek.common.utils.StringUtils.randomFileName() + com.bstek.common.utils.StringUtils.getFileSuffix(p);
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(downFileName, "UTF-8"));
+            response.setHeader("code", "20000");
+            long start = System.currentTimeMillis();
+            ExportUtils.export(out, report, p);
+            long end = System.currentTimeMillis();
+            ToolUtils.logToConsole("下载 " + type + " 报表耗时:" + (end - start) + "ms");
+        } catch (Exception ex) {
+            throw new ReportException(ex);
+        }
+    }
+
     private ReportDefinition getReportDefinition(ReportRender reportRender, PreviewParameters params) {
         ReportDefinition reportDefinition;
 
@@ -366,6 +473,8 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
 
     @Override
     public Report generateReport(ReportTemplateGenerateReqDTO reqDTO) {
+        // 校验生成文件类型
+        validateProducerType(reqDTO.getProducerType());
         Long templateId = reqDTO.getTemplateId();
         // 校验模板
         validateTemplateExists(templateId);
@@ -383,4 +492,22 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
 
         return reportRender.render(reportDefinition, previewParameters.getQuery());
     }
+
+    /**
+     * 模板生成文件类型校验
+     *
+     * @param type
+     */
+    private void validateProducerType(String type) {
+        boolean match = false;
+        for (ProducerEnum producerEnum : ProducerEnum.values()) {
+            if (Objects.equals(producerEnum.name(), type.toUpperCase())) {
+                match = true;
+                break;
+            }
+        }
+        if (!match) {
+            throw new ReportException("类型错误，请检查是否PDF/WORD/EXCEL");
+        }
+    }
 }

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/validation/template/ReportTemplateProducerTypeInEnum.java

@@ -0,0 +1,36 @@
+package com.cf.imes.module.report.validation.template;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义报表模板生成文件类型入参校验注解
+ *
+ * @author Gqr
+ * @since 2024/7/17 9:33
+ */
+@Target({
+        ElementType.METHOD,
+        ElementType.FIELD,
+        ElementType.ANNOTATION_TYPE,
+        ElementType.CONSTRUCTOR,
+        ElementType.PARAMETER,
+        ElementType.TYPE_USE
+})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Constraint(
+        validatedBy = {ReportTemplateProducerTypeInEnumValidator.class}
+)
+public @interface ReportTemplateProducerTypeInEnum {
+    String message() default "类型错误，请检查是否PDF/WORD/EXCEL";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/validation/template/ReportTemplateProducerTypeInEnumValidator.java

@@ -0,0 +1,37 @@
+package com.cf.imes.module.report.validation.template;
+
+import com.bstek.ureport.export.ProducerEnum;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.Objects;
+
+/**
+ * 自定义报表模板生成文件类型入参校验器
+ *
+ * @author Gqr
+ * @since 2024/7/17 9:33
+ */
+public class ReportTemplateProducerTypeInEnumValidator implements ConstraintValidator<ReportTemplateProducerTypeInEnum, String> {
+
+    @Override
+    public void initialize(ReportTemplateProducerTypeInEnum constraintAnnotation) {
+        ConstraintValidator.super.initialize(constraintAnnotation);
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        if (StringUtils.isEmpty(value)) {
+            return false;
+        }
+        for (ProducerEnum producerEnum : ProducerEnum.values()) {
+            if (Objects.equals(producerEnum.name(), value.toUpperCase())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
+

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java

@@ -47,7 +47,6 @@ public class NotifyMessageController {
     @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
         pageVO.setUserId(getLoginUserId());
-        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO);
         return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class));
     }
@@ -58,7 +57,6 @@ public class NotifyMessageController {
     @Operation(summary = "获得我的站内信分页")
     public CommonResult<PageResult<NotifyMessageRespVO>> getMyMyNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
         pageVO.setUserId(getLoginUserId());
-        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO);
         PageResult<NotifyMessageRespVO> respVOPageResult = BeanUtils.toBean(pageResult, NotifyMessageRespVO.class);
         return success(respVOPageResult);

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyTemplateController.java

@@ -1,6 +1,5 @@
 package com.cf.imes.module.system.controller.admin.notify;
 
-import com.cf.imes.framework.common.enums.UserTypeEnum;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
@@ -80,12 +79,7 @@ public class NotifyTemplateController {
     @Operation(summary = "发送站内信")
     @PreAuthorize("@ss.hasPermission('system:notify-template:send-notify')")
     public CommonResult<Long> sendNotify(@Valid @RequestBody NotifyTemplateSendReqVO sendReqVO) {
-        if (UserTypeEnum.MEMBER.getValue().equals(sendReqVO.getUserType())) {
-            return success(notifySendService.sendSingleNotifyToMember(sendReqVO.getUserId(),
-                    sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
-        } else {
-            return success(notifySendService.sendSingleNotifyToAdmin(sendReqVO.getUserId(),
-                    sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
-        }
+        return success(notifySendService.sendSingleNotifyToAdmin(sendReqVO.getUserId(),
+                sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
     }
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java

@@ -20,9 +20,6 @@ public class NotifyMessagePageReqVO extends PageParam {
     @Schema(description = "用户编号", example = "25025")
     private Long userId;
 
-    @Schema(description = "用户类型", example = "1")
-    private Integer userType;
-
     @Schema(description = "模板编码", example = "test_01")
     private String templateCode;
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java

@@ -13,12 +13,6 @@ public class NotifyMessageRespVO {
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25025")
-    private Long userId;
-
-    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Byte userType;
-
     @Schema(description = "模版编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13013")
     private Long templateId;
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java

@@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 @Schema(description = "管理后台 - 站内信模板的发送 Request VO")
@@ -15,10 +14,6 @@ public class NotifyTemplateSendReqVO {
     //@NotNull(message = "用户id不能为空")
     private Long userId = 0L;
 
-    @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    //@NotNull(message = "用户类型不能为空")
-    private Integer userType = 2;
-
     @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "01")
     @NotEmpty(message = "模板编码不能为空")
     private String templateCode;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notify/NotifySendServiceImpl.java

@@ -14,8 +14,6 @@ import javax.annotation.Resource;
 import java.util.Map;
 import java.util.Objects;
 
-import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
-
 /**
  * 站内信发送 Service 实现类
  *

cf-module-system/cf-module-system-biz/src/main/resources/mapper/message/NotifyMessageMapper.xml

@@ -21,9 +21,6 @@
             <if test="reqVo.createTime != null">
                 and m.create_time between #{reqVo.createTime[0]} and #{reqVo.createTime[1]}
             </if>
-            <if test="reqVo.userType != null">
-                and m.user_type = #{reqVo.userType}
-            </if>
             <if test="reqVo.templateCode != null and reqVo.templateCode != ''">
                 and m.template_code = #{reqVo.templateCode}
             </if>

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/notify/NotifyMessageServiceImplTest.java

@@ -93,7 +93,6 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
        // 准备参数
        NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
        reqVO.setUserId(1L);
-       reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
        reqVO.setTemplateCode("est_01");
        reqVO.setTemplateType(10);
        reqVO.setCreateTime(buildBetweenTime(2022, 1, 1, 2022, 1, 10));
@@ -146,7 +145,6 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
         reqVO.setReadStatus(true);
         reqVO.setCreateTime(buildBetweenTime(2022, 1, 1, 2022, 1, 10));
         reqVO.setUserId(userId);
-        reqVO.setUserType(userType);
 
         // 调用
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(reqVO);
@@ -180,7 +178,6 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
         reqVO.setPageSize(10);
         reqVO.setPageNo(1);
         reqVO.setUserId(userId);
-        reqVO.setUserType(userType);
         // 调用
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(reqVO);
         // 断言