optimize payscale pdf download

yd-api/pom.xml

@@ -156,6 +156,10 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.9</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

yd-api/src/main/java/com/yd/api/practitioner/PayScalePdfRequestVO.java

@@ -2,6 +2,15 @@ package com.yd.api.practitioner;
 
 public class PayScalePdfRequestVO {
     private Integer monShId;
+    private Long practitionerId;
+
+    public Long getPractitionerId() {
+        return practitionerId;
+    }
+
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
+    }
 
     public Integer getMonShId() {
         return monShId;

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -7,6 +7,7 @@ import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
 import com.yd.api.practitioner.vo.media.MediaGetReqVO;
 import com.yd.api.practitioner.vo.media.MediaGetRespVO;
 import com.yd.api.practitioner.vo.opportunity.*;
+import com.yd.api.practitioner.vo.payscale.PayScalePdfResponseVO;
 import com.yd.api.practitioner.vo.payscale.PayScaleQueryRequestVO;
 import com.yd.api.practitioner.vo.payscale.PayScaleQueryResponseVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
@@ -462,11 +463,14 @@ public class PractitionerController {
     /**
      * 获取经纪人的薪资表
      * @param requestVO 请求信息
-     * @param response 请求信息
      * @return 返回信息
      */
-    @PostMapping(value = "/payScalePdf", produces = MediaType.APPLICATION_PDF_VALUE)
-    public String payScalePdf(@RequestBody PayScalePdfRequestVO requestVO, HttpServletResponse response){
-        return practitionerBasicInfoService.payScalePdf(requestVO,response);
+    @PostMapping(value = "/payScalePdf")
+    public Object payScalePdf(@RequestBody PayScalePdfRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        PayScalePdfResponseVO responseVO =  practitionerBasicInfoService.payScalePdf(requestVO);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
     }
 }

yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerBasicInfoService.java

@@ -38,8 +38,7 @@ public interface PractitionerBasicInfoService {
     /**
      * 获取经纪人的薪资表
      * @param requestVO 请求信息
-     * @param response 请求信息
      * @return 响应信息
      */
-    String payScalePdf(PayScalePdfRequestVO requestVO, HttpServletResponse response);
+    PayScalePdfResponseVO payScalePdf(PayScalePdfRequestVO requestVO);
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScalePdfResponseVO.java

@@ -3,8 +3,17 @@ package com.yd.api.practitioner.vo.payscale;
 import com.yd.api.result.CommonResult;
 
 public class PayScalePdfResponseVO {
+    private String url;
     private CommonResult commonResult;
 
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
     public CommonResult getCommonResult() {
         return commonResult;
     }

yd-api/src/main/java/com/yd/dal/entity/customer/practitioner/PractitionerBasicInfo.java

@@ -8,6 +8,7 @@ public class PractitionerBasicInfo {
     private String titleCode;
     private String titleName;
     private String gender;
+    private String mobileNo;
 
     public Long getCustomerId() {
         return customerId;
@@ -65,4 +66,11 @@ public class PractitionerBasicInfo {
         this.gender = gender;
     }
 
+    public String getMobileNo() {
+        return mobileNo;
+    }
+
+    public void setMobileNo(String mobileNo) {
+        this.mobileNo = mobileNo;
+    }
 }

yd-api/src/main/java/com/yd/dal/entity/practitioner/payscale/PayScaleBasicInfo.java

+package com.yd.dal.entity.practitioner.payscale;
+
+public class PayScaleBasicInfo {
+    private Integer monShId;
+    private String salMstId;
+    private String drpTitleCode;
+    private String monDtlType;
+    private String monDtlItem;
+    private Integer monDtlPeriod;
+    private Double monDtlAmount;
+    private Double monDtlRAmount;
+    private String createDate;
+    private String createUser;
+    private String uploadPath;
+    private String uploadTime;
+
+    public Integer getMonShId() {
+        return monShId;
+    }
+
+    public void setMonShId(Integer monShId) {
+        this.monShId = monShId;
+    }
+
+    public String getSalMstId() {
+        return salMstId;
+    }
+
+    public void setSalMstId(String salMstId) {
+        this.salMstId = salMstId;
+    }
+
+    public String getDrpTitleCode() {
+        return drpTitleCode;
+    }
+
+    public void setDrpTitleCode(String drpTitleCode) {
+        this.drpTitleCode = drpTitleCode;
+    }
+
+    public String getMonDtlType() {
+        return monDtlType;
+    }
+
+    public void setMonDtlType(String monDtlType) {
+        this.monDtlType = monDtlType;
+    }
+
+    public String getMonDtlItem() {
+        return monDtlItem;
+    }
+
+    public void setMonDtlItem(String monDtlItem) {
+        this.monDtlItem = monDtlItem;
+    }
+
+    public Double getMonDtlAmount() {
+        return monDtlAmount;
+    }
+
+    public void setMonDtlAmount(Double monDtlAmount) {
+        this.monDtlAmount = monDtlAmount;
+    }
+
+    public Double getMonDtlRAmount() {
+        return monDtlRAmount;
+    }
+
+    public void setMonDtlRAmount(Double monDtlRAmount) {
+        this.monDtlRAmount = monDtlRAmount;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public Integer getMonDtlPeriod() {
+        return monDtlPeriod;
+    }
+
+    public void setMonDtlPeriod(Integer monDtlPeriod) {
+        this.monDtlPeriod = monDtlPeriod;
+    }
+
+    public String getUploadPath() {
+        return uploadPath;
+    }
+
+    public void setUploadPath(String uploadPath) {
+        this.uploadPath = uploadPath;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+}

yd-api/src/main/java/com/yd/dal/mapper/customer/AclFileUploadMapper.java

@@ -22,4 +22,6 @@ public interface AclFileUploadMapper {
     CustomerFileUpload findByTargetTypeAndTargetUseForAndTargetId(@Param("targetType")Integer targetType, @Param("targetUseFor")Integer targetUseFor, @Param("practitionerId")Long practitionerId);
 
     List<AclFileUpload> findByAclFileUpload(AclFileUpload fileUpload);
+
+    AclFileUpload findByTargetIdAndRemark(@Param("type")Integer type, @Param("targetId")Long targetId, @Param("remark")String remark);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java

@@ -7,6 +7,7 @@ import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
+import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -58,5 +59,7 @@ public interface AclPractitionerMapper {
 
     List<PayScaleInfo> findPayScaleByPractitionerEG(@Param("practitionerIdEG")String practitionerIdEG);
 
-    String findFilePathByMonShId(@Param("monShId")Integer monShId);
+    PayScaleBasicInfo findFilePathByMonShId(@Param("monShId")Integer monShId);
+
+    PractitionerBasicInfo findByIdEG(@Param("practitionerIdEG")String practitionerIdEG);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/service/customer/AclFileUploadDALService.java

@@ -42,4 +42,13 @@ public interface AclFileUploadDALService {
      * @param aclFileUpload
      */
     void saveFileUpload(AclFileUpload aclFileUpload);
+
+    /**
+     * 根据条件查询
+     * @param type 类型
+     * @param targetId id
+     * @param remark 备注
+     * @return
+     */
+    AclFileUpload findByTargetIdAndRemark(Integer type, Long targetId, String remark);
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java

@@ -7,6 +7,7 @@ import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
+import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -153,5 +154,12 @@ public interface AclPractitionerDALService {
      * @param monShId 流水号
      * @return 结果
      */
-    String findFilePathByMonShId(Integer monShId);
+    PayScaleBasicInfo findFilePathByMonShId(Integer monShId);
+
+    /**
+     * 根据EGolden查询
+     * @param practitionerIdEG id
+     * @return 返回
+     */
+    PractitionerBasicInfo findByIdEG(String practitionerIdEG);
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclFileUploadDALServiceImpl.java

@@ -6,6 +6,7 @@ import com.yd.dal.mapper.customer.AclFileUploadMapper;
 import com.yd.dal.service.customer.AclFileUploadDALService;
 import com.yd.util.intercept.annotation.TargetDataSource;
 import com.yd.util.intercept.commons.DataSourceKey;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -47,4 +48,9 @@ public class AclFileUploadDALServiceImpl implements AclFileUploadDALService {
     public void saveFileUpload(AclFileUpload aclFileUpload) {
         aclFileUploadMapper.insertSelective(aclFileUpload);
     }
+
+    @Override
+    public AclFileUpload findByTargetIdAndRemark(Integer type,Long targetId, String remark ) {
+        return aclFileUploadMapper.findByTargetIdAndRemark(type,targetId,remark);
+    }
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java

@@ -8,6 +8,7 @@ import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
+import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
 import com.yd.dal.mapper.customer.AclPractitionerMapper;
 import com.yd.dal.service.customer.AclPractitionerDALService;
 import com.yd.util.deshandler.DESTypeHandler;
@@ -145,7 +146,13 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
 
     @Override
     @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
-    public String findFilePathByMonShId(Integer monShId) {
+    public PayScaleBasicInfo findFilePathByMonShId(Integer monShId) {
         return aclPractitionerMapper.findFilePathByMonShId(monShId);
     }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
+    public PractitionerBasicInfo findByIdEG(String practitionerIdEG) {
+        return aclPractitionerMapper.findByIdEG(practitionerIdEG);
+    }
 }

yd-api/src/main/java/com/yd/rmi/ali/oss/service/OssService.java

 package com.yd.rmi.ali.oss.service;
 
+import com.yd.rmi.ali.oss.vo.OssRequestVO;
+import com.yd.rmi.ali.oss.vo.OssResponseVO;
+
 import java.io.InputStream;
 
 public interface OssService {
 
 	String putFileToOss(String string, String key, InputStream is) throws Exception;
+
+	OssResponseVO ossOperate(OssRequestVO ossRequestVO);
 }
 

yd-api/src/main/java/com/yd/rmi/ali/oss/service/impl/OssServiceImpl.java

@@ -85,8 +85,8 @@ public class OssServiceImpl implements OssService {
 		}
 		return url;
 	}
-
-	private OssResponseVO ossOperate(OssRequestVO ossRequestVO) {
+	@Override
+	public OssResponseVO ossOperate(OssRequestVO ossRequestVO) {
 		OssResponseVO ossResponseVO = new OssResponseVO();
 		boolean success = true;
 		String message = ZHBErrorConfig.getErrorInfo("800000");

yd-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -11,7 +11,7 @@
 800000=执行成功！
 ##系统提示信息
 810001=token无效或者错误！
-820001=为查询到相应结果。
+820001=未查询到相应结果。
 
 830001=该用户非寿险经纪人。
 830002=只有寿险经纪人才有权限进入！

yd-api/src/main/resources/mapper/customer/AclFileUploadMapper.xml

@@ -289,4 +289,10 @@
     </where>
   </select>
 
+  <select id="findByTargetIdAndRemark" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_file_upload
+    where target_type = #{type,jdbcType=INTEGER} and target_id = #{targetId,jdbcType=BIGINT} and remark = #{remark,jdbcType=VARCHAR} and is_active = 1
+  </select>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -699,7 +699,7 @@
     from ag_acl_customer c inner join ag_acl_practitioner p on c.id = p.customer_id
                            left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id
                            left join ag_acl_practitioner_setting s on p.id = s.practitioner_id
-                           inner join ag_md_drop_options o on s.practitioner_level = o.id
+                           left join ag_md_drop_options o on s.practitioner_level = o.id
     where c.login = #{mobileNo};
   </select>
 
@@ -885,8 +885,30 @@
     from mon011 t where FK_SAL_MST_ID = #{practitionerIdEG,jdbcType=VARCHAR};
   </select>
 
-  <select id="findFilePathByMonShId" resultType="java.lang.String">
-    select t.UPLOAD_PATH
+  <select id="findFilePathByMonShId" resultType="com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo">
+    select
+        t.MON_SH_ID as monShId,
+        t.FK_SAL_MST_ID as salMstId,
+        t.FK_DRP_TITLE_CODE as drpTitleCode,
+        t.MON_DTL_TYPE as monDtlType,
+        t.MON_DTL_ITEM as monDtlItem,
+        t.MON_DTL_PERIOD as monDtlPeriod,
+        ifnull(t.MON_DTL_AMOUNT,0) as monDtlAmount,
+        ifnull(t.MON_DTL_RAMOUNT,0) as monDtlRAmount,
+        date_format(t.CREATE_DATE, '%Y-%m-%d %H:%i:%s') as createDate,
+        t.CREATE_USER as createUser,
+        t.UPLOAD_PATH as uploadPath,
+        t.UPLOAD_TIME as uploadTime
         from mon011 t where t.MON_SH_ID = #{monShId,jdbcType=INTEGER}
   </select>
+
+  <select id="findByIdEG" resultMap="base_result_map_practitioner_info">
+    SELECT
+    p.SAL_MST_ID as practitionerId,
+    p.SAL_MST_NAME as name,
+    p.SAL_MST_GENDER as gender,
+    p.SAL_MST_MOBILE as mobileNo
+    FROM sal001 p
+    where p.SAL_MST_ID = #{practitionerIdEG,jdbcType=VARCHAR} limit 1
+  </select>
 </mapper>
\ No newline at end of file