明细接口改造

yifu-common/yifu-common-dapr/pom.xml

@@ -50,6 +50,12 @@
 			<version>1.0.0</version>
 			<scope>compile</scope>
 		</dependency>
+        <dependency>
+            <groupId>com.yifu.cloud.plus.v1</groupId>
+            <artifactId>yifu-common-ekp</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 	<properties>

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/config/DaprEkpProperties.java

+package com.yifu.cloud.plus.v1.yifu.common.dapr.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author huyc
+ * @Date 2024-02-28
+ * @Description
+ * @Version 1.0
+ */
+@Data
+@Component
+@PropertySource("classpath:daprConfig.properties")
+@ConfigurationProperties(value = "dapr.ekp", ignoreInvalidFields = false)
+public class DaprEkpProperties {
+	/*
+	 * @author fxj
+	 * @date  14:34
+	 * @Description  dapr sidercar url  如：http://localhost:3005/v1.0/invoke/
+	 **/
+	String appUrl;
+	/*
+	 * @author fxj
+	 * @date  14:35
+	 * @decription  app_id  如："yifu_upms_sider"
+	 **/
+	String appId;
+
+	String appPort;
+
+	String httpPort;
+
+	String grpcPort;
+
+	String metricsPort;
+}

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/EkpDaprUtils.java

+package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
+
+import com.alibaba.fastjson.JSON;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprEkpProperties;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+import java.util.List;
+
+/**
+ * @Author huyc
+ * @Date 2024-02-28
+ * @Description
+ * @Version 1.0
+ */
+@Log4j2
+@EnableConfigurationProperties(DaprEkpProperties.class)
+public class EkpDaprUtils {
+
+	@Autowired
+	private DaprEkpProperties daprProperties;
+
+	/**
+	 * @Author huyc
+	 * @Description 更新结算信息
+	 * @Date 16:18 2024/02/28
+	 * @Param
+	 * @return
+	 **/
+	public R<Boolean> pushSocialInfoToEkp(List<EkpPushSocialParam> unPushList) {
+		return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpSocialPush/inner/pushSocialInfoToEkp", JSON.toJSONString(unPushList), Boolean.class, SecurityConstants.FROM_IN);
+	}
+}

yifu-common/yifu-common-dapr/src/main/resources/META-INF/spring.factories

@@ -5,4 +5,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils,\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil,\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil,\
-    com.yifu.cloud.plus.v1.yifu.common.dapr.util.SalaryDaprUtil
+    com.yifu.cloud.plus.v1.yifu.common.dapr.util.SalaryDaprUtil,\
+    com.yifu.cloud.plus.v1.yifu.common.dapr.util.EkpDaprUtils

yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpSocialInfo.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.ekp.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 社保明细表
+ *
+ * @author huyc
+ * @date 2024-02-29 11:21:56
+ */
+@Data
+@TableName("ekp_social_info")
+@EqualsAndHashCode()
+@Schema(description = "社保明细表")
+public class EkpSocialInfo {
+
+	@Schema(description = "fdId")
+	private String fdId;
+
+	private String fd3add9dd7833db8;
+
+	private String fd3add9de0be85e4;
+
+	private String fd3add9e1a670144;
+
+	private String fd3adfe8c70d3fd4;
+
+	private String fd3adfe8c8468e54;
+
+	private String fd3adfe95c169c48;
+
+	private String fd3adfe8c73cb5a4;
+
+	private String fd3adfe8c81a0e42;
+
+	private String fd3adfe8c79989d4;
+
+	private String fd3adfe8c7e4cf7a;
+
+	private Date fd3adfe8cb96c41e;
+
+	private Date fd3adfe8cf632700;
+
+	private Date fd3adfe8cff746bc;
+
+	private Double fd3adfeb4e8064a8;
+
+	private Double fd3adfeb52a4d2e2;
+
+	private Double fd3adfeb52fbe966;
+
+	private Double fd3adfeb5366dd82;
+
+	private Double fd3adfeb53c70f72;
+
+	private Double fd3adfeb5413fb44;
+
+	private Double fd3adfeb7b624f06;
+
+	private String fd3add9ea428879a;
+
+	private String fd3add9eaeed2560;
+
+	private String fd3adfeb830523b6;
+
+	private String fd3adfeb8489e6c2;
+
+	private Double fd3adfeb7bd97464;
+
+	private String fd3add9edfbc6f7e;
+
+	private String fd3add9eed23894a;
+
+	private String fd3adfeb83a704c8;
+
+	private String fd3adfeb84175f28;
+
+	private String fd3aeafa25916e82;
+
+	private Double fd3af9f2fa79ee72;
+
+	private Double fd3af9f2ec516c30;
+
+	private Double fd3af9f2fcde9158;
+
+	private Double fd3af9f285ee1e38;
+
+	private Double fd3af9f2dd5d8fb8;
+
+	private Double fd3af9f2e03295dc;
+
+	private Double fd3af9f27a3974e6;
+
+	private Double fd3af9f25b851e94;
+
+	private Double fd3af9f27efdd912;
+
+	private Double fd3af9f3059e5b9c;
+
+	private Double fd3af9f26a3cae94;
+
+	private Double fd3af9f263e094c6;
+
+	private Double fd3af9f2617e530a;
+
+	private Double fd3af9f281651734;
+
+	private Double fd3af9f2e9208e4e;
+
+	private Double fd3af9f2e6dfb3f4;
+
+	private Double fd3af9f2f8290f24;
+
+	private Double fd3af9f2e237f794;
+
+	private Double fd3af9f2e45a5d78;
+
+	private Double fd3af9f283a6f288;
+
+	private Double fd3af9f2db1e5e16;
+
+	private Double fd3af9f27ce947ac;
+
+	private Double fd3af9f2ff2c9f42;
+
+	private Double fd3af9f25f5e9cc4;
+
+	private Double fd3af9f2883941b4;
+
+	private Double fd3af9f267a03bd6;
+
+	private Double fd3af9f303037214;
+
+	private Double fd3af9f2d8df88c0;
+
+	private Double fd3af9f257b1b586;
+
+	private String fd3b0194c7336de0;
+
+	private String fd3b0b716e771e06;
+
+	private String fd3b1354c3add8c2;
+
+	private String fd3b16e2f436ff98Text;
+
+	private String fd3b16e2f436ff98;
+
+	private String fd3b178e3ba5e258;
+
+	private Double fd3b35a57b6e9d0a;
+
+	private Double fd3b35a5b0b04d54;
+
+	private Double fd3b35a57aee1428;
+
+	private Double fd3b35a5b03100c4;
+
+	private String fd3b3cab5f343a90;
+
+	private String fd3b3e41ac916e66;
+
+	private String fd3b438e61af0a56;
+
+	private String fd3b5cc5e697079a;
+
+	private String fd3b6495a5ad6e10;
+
+	private Date createTime;
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpSocialInfoController.java

+package com.yifu.cloud.plus.v1.ekp.controller;/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 社保明细推送
+ * @author huyc
+ * @date 2024-02-28 17:01:22
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/ekpSocialPush" )
+@Tag(name = "社保明细推送")
+public class TEkpSocialInfoController {
+
+	/**
+	 * @param viewVo
+	 * @Description: 推送社保明细数据
+	 * @Author: huyc
+	 * @Date: 2024/2/29
+	 * @return:
+	 **/
+	@Inner
+	@PostMapping("/inner/pushSocialInfoToEkp")
+	public Boolean pushSocialInfoToEkp(@RequestBody List<EkpSocialViewVo> viewVo) {
+//		return tPaymentInfoService.updateSocialSettleStatus(viewVo);
+		return null;
+	}
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpSocialInfoMapper.java

+package com.yifu.cloud.plus.v1.ekp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 社保明细表
+ *
+ * @author huyc
+ * @date 2024-02-29 11:21:56
+ */
+@Mapper
+public interface EkpSocialInfoMapper extends BaseMapper<EkpSocialInfo> {
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpSocialInfoService.java

+package com.yifu.cloud.plus.v1.ekp.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
+
+/**
+ * 社保明细表
+ *
+ * @author huyc
+ * @date 2024-02-29 11:21:56
+ */
+public interface EkpSocialInfoService extends IService<EkpSocialInfo> {
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java

+package com.yifu.cloud.plus.v1.ekp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
+import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
+import com.yifu.cloud.plus.v1.ekp.service.EkpSocialInfoService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+/**
+ * 社保明细表
+ *
+ * @author huyc
+ * @date 2024-02-29 11:21:56
+ */
+@Log4j2
+@Service
+public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, EkpSocialInfo> implements EkpSocialInfoService {
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpSocialPushInfoVo.java

+package com.yifu.cloud.plus.v1.ekp.vo;
+
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author huyc
+ * @Date 2024/2/29
+ * @Description 社保明细推送相关参数
+ * @Version 1.0
+ */
+@Data
+public class EkpSocialPushInfoVo implements Serializable {
+
+	/**
+	 * 社保明细
+	 **/
+	private List<EkpPushSocialParam> unPushInfo;
+
+}

yifu-ekp/yifu-ekp-biz/src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ spring:
             type: CLASS_BASED
         tables:
           t_payment_info:
-            actual-data-nodes: ds0.ekp_9264ea0160848a681328_20$->{23..24}
+            actual-data-nodes: ds0.ekp_social_info_20$->{23..24}
             key-generate-strategy:
               column: fd_id
               key-generator-name: snowflake

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSocialInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper">
+
+  <resultMap id="ekpSocialInfoMap" type="com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo">
+    <id property="fdId" column="fd_id"/>
+    <result property="fd3add9dd7833db8" column="fd_3add9dd7833db8"/>
+    <result property="fd3add9de0be85e4" column="fd_3add9de0be85e4"/>
+    <result property="fd3add9e1a670144" column="fd_3add9e1a670144"/>
+    <result property="fd3adfe8c70d3fd4" column="fd_3adfe8c70d3fd4"/>
+    <result property="fd3adfe8c8468e54" column="fd_3adfe8c8468e54"/>
+    <result property="fd3adfe95c169c48" column="fd_3adfe95c169c48"/>
+    <result property="fd3adfe8c73cb5a4" column="fd_3adfe8c73cb5a4"/>
+    <result property="fd3adfe8c81a0e42" column="fd_3adfe8c81a0e42"/>
+    <result property="fd3adfe8c79989d4" column="fd_3adfe8c79989d4"/>
+    <result property="fd3adfe8c7e4cf7a" column="fd_3adfe8c7e4cf7a"/>
+    <result property="fd3adfe8cb96c41e" column="fd_3adfe8cb96c41e"/>
+    <result property="fd3adfe8cf632700" column="fd_3adfe8cf632700"/>
+    <result property="fd3adfe8cff746bc" column="fd_3adfe8cff746bc"/>
+    <result property="fd3adfeb4e8064a8" column="fd_3adfeb4e8064a8"/>
+    <result property="fd3adfeb52a4d2e2" column="fd_3adfeb52a4d2e2"/>
+    <result property="fd3adfeb52fbe966" column="fd_3adfeb52fbe966"/>
+    <result property="fd3adfeb5366dd82" column="fd_3adfeb5366dd82"/>
+    <result property="fd3adfeb53c70f72" column="fd_3adfeb53c70f72"/>
+    <result property="fd3adfeb5413fb44" column="fd_3adfeb5413fb44"/>
+    <result property="fd3adfeb7b624f06" column="fd_3adfeb7b624f06"/>
+    <result property="fd3add9ea428879a" column="fd_3add9ea428879a"/>
+    <result property="fd3add9eaeed2560" column="fd_3add9eaeed2560"/>
+    <result property="fd3adfeb830523b6" column="fd_3adfeb830523b6"/>
+    <result property="fd3adfeb8489e6c2" column="fd_3adfeb8489e6c2"/>
+    <result property="fd3adfeb7bd97464" column="fd_3adfeb7bd97464"/>
+    <result property="fd3add9edfbc6f7e" column="fd_3add9edfbc6f7e"/>
+    <result property="fd3add9eed23894a" column="fd_3add9eed23894a"/>
+    <result property="fd3adfeb83a704c8" column="fd_3adfeb83a704c8"/>
+    <result property="fd3adfeb84175f28" column="fd_3adfeb84175f28"/>
+    <result property="fd3aeafa25916e82" column="fd_3aeafa25916e82"/>
+    <result property="fd3af9f2fa79ee72" column="fd_3af9f2fa79ee72"/>
+    <result property="fd3af9f2ec516c30" column="fd_3af9f2ec516c30"/>
+    <result property="fd3af9f2fcde9158" column="fd_3af9f2fcde9158"/>
+    <result property="fd3af9f285ee1e38" column="fd_3af9f285ee1e38"/>
+    <result property="fd3af9f2dd5d8fb8" column="fd_3af9f2dd5d8fb8"/>
+    <result property="fd3af9f2e03295dc" column="fd_3af9f2e03295dc"/>
+    <result property="fd3af9f27a3974e6" column="fd_3af9f27a3974e6"/>
+    <result property="fd3af9f25b851e94" column="fd_3af9f25b851e94"/>
+    <result property="fd3af9f27efdd912" column="fd_3af9f27efdd912"/>
+    <result property="fd3af9f3059e5b9c" column="fd_3af9f3059e5b9c"/>
+    <result property="fd3af9f26a3cae94" column="fd_3af9f26a3cae94"/>
+    <result property="fd3af9f263e094c6" column="fd_3af9f263e094c6"/>
+    <result property="fd3af9f2617e530a" column="fd_3af9f2617e530a"/>
+    <result property="fd3af9f281651734" column="fd_3af9f281651734"/>
+    <result property="fd3af9f2e9208e4e" column="fd_3af9f2e9208e4e"/>
+    <result property="fd3af9f2e6dfb3f4" column="fd_3af9f2e6dfb3f4"/>
+    <result property="fd3af9f2f8290f24" column="fd_3af9f2f8290f24"/>
+    <result property="fd3af9f2e237f794" column="fd_3af9f2e237f794"/>
+    <result property="fd3af9f2e45a5d78" column="fd_3af9f2e45a5d78"/>
+    <result property="fd3af9f283a6f288" column="fd_3af9f283a6f288"/>
+    <result property="fd3af9f2db1e5e16" column="fd_3af9f2db1e5e16"/>
+    <result property="fd3af9f27ce947ac" column="fd_3af9f27ce947ac"/>
+    <result property="fd3af9f2ff2c9f42" column="fd_3af9f2ff2c9f42"/>
+    <result property="fd3af9f25f5e9cc4" column="fd_3af9f25f5e9cc4"/>
+    <result property="fd3af9f2883941b4" column="fd_3af9f2883941b4"/>
+    <result property="fd3af9f267a03bd6" column="fd_3af9f267a03bd6"/>
+    <result property="fd3af9f303037214" column="fd_3af9f303037214"/>
+    <result property="fd3af9f2d8df88c0" column="fd_3af9f2d8df88c0"/>
+    <result property="fd3af9f257b1b586" column="fd_3af9f257b1b586"/>
+    <result property="fd3b0194c7336de0" column="fd_3b0194c7336de0"/>
+    <result property="fd3b0b716e771e06" column="fd_3b0b716e771e06"/>
+    <result property="fd3b1354c3add8c2" column="fd_3b1354c3add8c2"/>
+    <result property="fd3b16e2f436ff98Text" column="fd_3b16e2f436ff98_text"/>
+    <result property="fd3b16e2f436ff98" column="fd_3b16e2f436ff98"/>
+    <result property="fd3b178e3ba5e258" column="fd_3b178e3ba5e258"/>
+    <result property="fd3b35a57b6e9d0a" column="fd_3b35a57b6e9d0a"/>
+    <result property="fd3b35a5b0b04d54" column="fd_3b35a5b0b04d54"/>
+    <result property="fd3b35a57aee1428" column="fd_3b35a57aee1428"/>
+    <result property="fd3b35a5b03100c4" column="fd_3b35a5b03100c4"/>
+    <result property="fd3b3cab5f343a90" column="fd_3b3cab5f343a90"/>
+    <result property="fd3b3e41ac916e66" column="fd_3b3e41ac916e66"/>
+    <result property="fd3b438e61af0a56" column="fd_3b438e61af0a56"/>
+    <result property="fd3b5cc5e697079a" column="fd_3b5cc5e697079a"/>
+    <result property="fd3b6495a5ad6e10" column="fd_3b6495a5ad6e10"/>
+    <result property="createTime" column="create_time"/>
+  </resultMap>
+
+</mapper>