Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-03 9ab9153464fccb835c3818b1bbe195d5a3cf7252

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java

@@ -12,4 +12,14 @@
    /**桶名称-可不传*/
    private String bucketName;

    private String fileName;

    private String method;

    public FileSignVo() {
    }

    public FileSignVo(String fileUrl) {
        this.fileUrl = fileUrl;
    }
}

 phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java

@@ -14,6 +14,10 @@
    private Date startTime;
    /**开单结束时间*/
    private Date endTime;
    /**订单支付开始*/
    private Date orderPayStartTime;
    /**订单支付结束*/
    private Date orderPayEndTime;
    /**订单号*/
    private String orderNo;
    /**所属门店*/
@@ -24,6 +28,14 @@
    private Integer deductionStatus;
    /**项目分类*/
    private String typeId;
    /**品项分类*/
    private String goodsClassify;
    /**月份时间*/
    private String monthTime;
    /**月份时间开始*/
    private String startMonthTime;
    /**月份时间结束*/
    private String endMonthTime;

    /*******保存参数********/
    /**操作人标识*/

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java

@@ -53,6 +53,14 @@
     * @return 使用FileSignReturnVo转化
     */
    @PostMapping(value = "/cos/signUrl")
    Response downloadFile(@RequestBody FileSignVo fileSignVo);
    Result signUrl(@RequestBody FileSignVo fileSignVo);

    /**
     *生成上传签名
     * @param fileSignVo 对象
     * @return 使用FileSignReturnVo转化
     */
    @PostMapping(value = "/cos/policy")
    Result policy(@RequestBody FileSignVo fileSignVo);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java

@@ -21,5 +21,10 @@
    @PostMapping("/deduction/surface/list")
    Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto);

    /**
     * 未执行明细快照列表
     */
    @PostMapping("/deduction/surface/list/data")
    Result surfaceListData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java

@@ -34,5 +34,11 @@
    @PostMapping(value = "/exp/deduction/surface")
    Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);

    /**
     * 导出划扣快照报表
     * 转换无
     */
    @PostMapping(value = "/exp/deduction/surface/data")
    Result deductionSurfaceData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);

}

 phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.vo.cos;

import lombok.Data;

/**
 * @ClassName OssRecoverVO
 * @Description cos生成签名返回vo
 * @Author wrh
 * @Date 2023/6/30 17:30
 * @Version 1.0
 */
@Data
public class OssRecoverVO {

    private String accessid;
    //签名
    private String signature;
    private String dir;
    private String host;
    //过期时间
    private String expire;



}