Skip to content

T
tanpu-community
Commit d1ba9594 authored by 吴泽佳's avatar 吴泽佳
Browse files
Options

基金数据由直连库改为feign调用

parent e4929e95
Show whitespace changes
Inline Side-by-side
Showing with 240 additions and 2063 deletions
community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoNew.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoResp.java
View file @ d1ba9594
...@@ -20,9 +20,7 @@ import java.util.List; ...@@ -20,9 +20,7 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "用户信息 圈子使用") @ApiModel(description = "用户信息 圈子使用")
public class UserInfoNew implements Serializable { public class UserInfoResp {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主页等级 1普通主页 2首席投顾主页 3机构主页") @ApiModelProperty("主页等级 1普通主页 2首席投顾主页 3机构主页")
private Integer personalCenterType; private Integer personalCenterType;
......
community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fund/FundCompanySimpleVO.java 0 → 100644
View file @ d1ba9594
package com.tanpu.community.api.beans.vo.feign.fund;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author: zejia zj wu
* @create: 2021-07-29 10:16
**/
@ApiModel("基金公司信息 社区专用 ")
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Data
public class FundCompanySimpleVO {
@ApiModelProperty(value="公司成立日期")
private Long establishDate;
@ApiModelProperty(value="备案编码")
private String registerNumber;
@ApiModelProperty(value="基金数量")
private Integer fundCount;
}
community-service/src/main/java/com/tanpu/community/config/FeignConfiguration.java 0 → 100644
View file @ d1ba9594
package com.tanpu.community.config;
import feign.Logger;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @description:
* @author: zejia zj wu
* @create: 2021-07-23 19:48
**/
@Configuration
public class FeignConfiguration {
@Bean
Logger.Level feignLoggerLevel() {
//这里记录所有，根据实际情况选择合适的日志level
return Logger.Level.FULL;
}
}
community-service/src/main/java/com/tanpu/community/controller/HomePageController.java
View file @ d1ba9594
...@@ -11,8 +11,8 @@ import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq; ...@@ -11,8 +11,8 @@ import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq;
import com.tanpu.community.api.beans.req.page.Page; import com.tanpu.community.api.beans.req.page.Page;
import com.tanpu.community.api.beans.req.page.Pageable; import com.tanpu.community.api.beans.req.page.Pageable;
import com.tanpu.community.api.beans.resp.Customer; import com.tanpu.community.api.beans.resp.Customer;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.manager.HomePageManager; import com.tanpu.community.manager.HomePageManager;
import com.tanpu.community.manager.ThemeManager; import com.tanpu.community.manager.ThemeManager;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -45,9 +45,9 @@ public class HomePageController { ...@@ -45,9 +45,9 @@ public class HomePageController {
@ApiOperation(value = "个人中心 查询") @ApiOperation(value = "个人中心 查询")
@GetMapping(value = "/queryUserInfoNew") @GetMapping(value = "/queryUserInfoNew")
@AuthLogin @AuthLogin
public CommonResp<UserInfoNew> queryUsersListNew(@RequestParam(value = "userId", required = false) String userId) { public CommonResp<UserInfoResp> queryUsersListNew(@RequestParam(value = "userId", required = false) String userId) {
String userIdMyself = userHolder.getUserId(); String userIdMyself = userHolder.getUserId();
return CommonResp.success(homePageManager.queryUsersListNew(userIdMyself, userId)); return CommonResp.success(homePageManager.queryUsersInfo(userIdMyself, userId));
} }
// 理财师客户列表查询 (供圈子服务调用) // 理财师客户列表查询 (供圈子服务调用)
......
community-service/src/main/java/com/tanpu/community/dao/FundDataSourceConfig.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.tanpu.community.api.CommunityConstant;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
/**
* created by xd on 2021/6/3
*/
@Configuration
@Slf4j
@MapperScan(basePackages = CommunityConstant.PACKAGE_BASE + ".dao.mapper.fund", sqlSessionTemplateRef = "fundSqlSessionTemplate")
public class FundDataSourceConfig {
@ConfigurationProperties(prefix = "spring.datasource.fund")
@Bean(name = "fundDataSource")
public DataSource dataSource() {
return DataSourceBuilder.create().build();
}
@Bean(name = "fundSqlSessionFactory")
public SqlSessionFactory sqlSessionFactory(@Qualifier("fundDataSource") DataSource dataSource) throws Exception {
MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
bean.setDataSource(dataSource);
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(
"classpath*:mapper/fund/*.xml"));
return bean.getObject();
}
@Bean(name = "fundTransactionManager")
public DataSourceTransactionManager fundTransactionManager(@Qualifier("fundDataSource") DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
@Bean(name = "fundSqlSessionTemplate")
public SqlSessionTemplate fundSqlSessionTemplate(@Qualifier("fundSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
return new SqlSessionTemplate(sqlSessionFactory);
}
}
community-service/src/main/java/com/tanpu/community/dao/JydbDataSourceConfig.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.tanpu.community.api.CommunityConstant;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
/**
* created by xd on 2021/6/3
*/
@Configuration
@Slf4j
@MapperScan(basePackages = CommunityConstant.PACKAGE_BASE + ".dao.mapper.jydb", sqlSessionTemplateRef = "jydbSqlSessionTemplate")
public class JydbDataSourceConfig {
@ConfigurationProperties(prefix = "spring.datasource.jydb")
@Bean(name = "jydbDataSource")
public DataSource dataSource() {
return DataSourceBuilder.create().build();
}
@Bean(name = "jydbSqlSessionFactory")
public SqlSessionFactory sqlSessionFactory(@Qualifier("jydbDataSource") DataSource dataSource) throws Exception {
MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
bean.setDataSource(dataSource);
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(
"classpath*:mapper/jydb/*.xml"));
return bean.getObject();
}
@Bean(name = "jydbTransactionManager")
public DataSourceTransactionManager jydbTransactionManager(@Qualifier("jydbDataSource") DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
@Bean(name = "jydbSqlSessionTemplate")
public SqlSessionTemplate jydbSqlSessionTemplate(@Qualifier("jydbSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
return new SqlSessionTemplate(sqlSessionFactory);
}
}
community-service/src/main/java/com/tanpu/community/dao/entity/fund/CompanyInfo.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.entity.fund;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Builder;
import lombok.Data;
/**
* 公司基本信息表
*/
@ApiModel(value="com-tanpu-community-dao-entity-fund-CompanyInfo")
@Data
@Builder
@TableName(value = "company_info")
public class CompanyInfo implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value="")
private String id;
/**
* 公司id
*/
@TableField(value = "p_company_id")
@ApiModelProperty(value="公司id")
private String pCompanyId;
/**
* 公司中文全称
*/
@TableField(value = "company_name")
@ApiModelProperty(value="公司中文全称")
private String companyName;
/**
* 公司中文简称
*/
@TableField(value = "company_short_name")
@ApiModelProperty(value="公司中文简称")
private String companyShortName;
/**
* 基金管理人全称（英文）
*/
@TableField(value = "company_english_name")
@ApiModelProperty(value="基金管理人全称（英文）")
private String companyEnglishName;
/**
* 公司类型：1-私募证券投资、2-公募基金公司、3-银行、4-证券公司、5-信托公司、6-审计机构，7-法律顾问，8-投资顾问，9-行政管理人,10-上市公司，11-期货公司，12-基金公司子公司，13工作室，14-私募股权投资，15-证券公司子公司，16-期货公司子公司，17-私募创业投资，-1-私募其他投资
*/
@TableField(value = "company_type")
@ApiModelProperty(value="公司类型：1-私募证券投资、2-公募基金公司、3-银行、4-证券公司、5-信托公司、6-审计机构，7-法律顾问，8-投资顾问，9-行政管理人,10-上市公司，11-期货公司，12-基金公司子公司，13工作室，14-私募股权投资，15-证券公司子公司，16-期货公司子公司，17-私募创业投资，-1-私募其他投资")
private Integer companyType;
/**
* 组织机构代码
*/
@TableField(value = "organization_number")
@ApiModelProperty(value="组织机构代码")
private String organizationNumber;
/**
* 公司成立日期
*/
@TableField(value = "establish_date")
@ApiModelProperty(value="公司成立日期")
private Date establishDate;
/**
* 公司注册国家：1-中国大陆、2-香港、3-新加坡、4-开曼群岛、5-台湾、6-英属维尔京群岛BVI、-1-其他
*/
@TableField(value = "domicile_id")
@ApiModelProperty(value="公司注册国家：1-中国大陆、2-香港、3-新加坡、4-开曼群岛、5-台湾、6-英属维尔京群岛BVI、-1-其他")
private Integer domicileId;
/**
* 公司注册地址
*/
@TableField(value = "company_address")
@ApiModelProperty(value="公司注册地址")
private String companyAddress;
/**
* 办公地址
*/
@TableField(value = "company_address2")
@ApiModelProperty(value="办公地址")
private String companyAddress2;
/**
* 城市
*/
@TableField(value = "city")
@ApiModelProperty(value="城市")
private String city;
/**
* 省
*/
@TableField(value = "province")
@ApiModelProperty(value="省")
private String province;
/**
* 国家
*/
@TableField(value = "country")
@ApiModelProperty(value="国家")
private String country;
/**
* 注册城市
*/
@TableField(value = "reg_city")
@ApiModelProperty(value="注册城市")
private String regCity;
/**
* 注册省
*/
@TableField(value = "reg_province")
@ApiModelProperty(value="注册省")
private String regProvince;
/**
* 注册国家
*/
@TableField(value = "reg_country")
@ApiModelProperty(value="注册国家")
private String regCountry;
/**
* 联系电话
*/
@TableField(value = "contact_phone")
@ApiModelProperty(value="联系电话")
private String contactPhone;
/**
* 邮政编码
*/
@TableField(value = "post_code")
@ApiModelProperty(value="邮政编码")
private String postCode;
/**
* 传真
*/
@TableField(value = "fax")
@ApiModelProperty(value="传真")
private String fax;
/**
* 邮箱
*/
@TableField(value = "email")
@ApiModelProperty(value="邮箱")
private String email;
/**
* 公司网址
*/
@TableField(value = "website")
@ApiModelProperty(value="公司网址")
private String website;
/**
* 公司注册资本，<量纲：万元>
*/
@TableField(value = "registered_capital")
@ApiModelProperty(value="公司注册资本，<量纲：万元> ")
private BigDecimal registeredCapital;
/**
* 公司简介
*/
@TableField(value = "company_profile")
@ApiModelProperty(value="公司简介")
private String companyProfile;
/**
* 是否有海外基金，0-否，1-是，-1-其他
*/
@TableField(value = "offshore_fund")
@ApiModelProperty(value="是否有海外基金，0-否，1-是，-1-其他")
private Integer offshoreFund;
/**
* 投资理念
*/
@TableField(value = "philosopy")
@ApiModelProperty(value="投资理念")
private String philosopy;
/**
* 公司状态：1-运行；2-注销
*/
@TableField(value = "company_status")
@ApiModelProperty(value="公司状态：1-运行；2-注销")
private Integer companyStatus;
/**
* 公司注册资本货币单位：1-人民币，2-港币，3-美元，-1-其他
*/
@TableField(value = "base_currency_crc")
@ApiModelProperty(value="公司注册资本货币单位：1-人民币，2-港币，3-美元，-1-其他")
private Integer baseCurrencyCrc;
/**
* 备案编码
*/
@TableField(value = "register_number")
@ApiModelProperty(value="备案编码")
private String registerNumber;
/**
* 备案状态：0-未备案,1-备案注销,2-备案存续
*/
@TableField(value = "register_status")
@ApiModelProperty(value="备案状态：0-未备案,1-备案注销,2-备案存续")
private Integer registerStatus;
/**
* 备案日期
*/
@TableField(value = "register_date")
@ApiModelProperty(value="备案日期")
private Date registerDate;
/**
* 备案地址
*/
@TableField(value = "register_number_address")
@ApiModelProperty(value="备案地址")
private String registerNumberAddress;
/**
* 是否会员：1-是，0-否
*/
@TableField(value = "is_member")
@ApiModelProperty(value="是否会员：1-是，0-否")
private Byte isMember;
/**
* 入会时间
*/
@TableField(value = "join_date")
@ApiModelProperty(value="入会时间")
private Date joinDate;
/**
* 会员类型：1-普通会员、2-联席会员、3-观察会员、4-特别会员
*/
@TableField(value = "member_type")
@ApiModelProperty(value="会员类型：1-普通会员、2-联席会员、3-观察会员、4-特别会员")
private Integer memberType;
/**
* 管理基金主要类别（与中基协同步）
*/
@TableField(value = "fund_category_ori")
@ApiModelProperty(value="管理基金主要类别（与中基协同步）")
private String fundCategoryOri;
/**
* 业务类型
*/
@TableField(value = "business_type")
@ApiModelProperty(value="业务类型")
private String businessType;
/**
* 企业性质:1 中外合作企业 2中外合资企业 3内资企业 4境外机构 5外商独资企业 6政府机构
*/
@TableField(value = "nature_business_type")
@ApiModelProperty(value="企业性质:1 中外合作企业 2中外合资企业 3内资企业 4境外机构 5外商独资企业 6政府机构")
private Integer natureBusinessType;
/**
* 注册资本实缴比例
*/
@TableField(value = "capital_paid_rate")
@ApiModelProperty(value="注册资本实缴比例")
private BigDecimal capitalPaidRate;
/**
* 公司logo
*/
@TableField(value = "logo")
@ApiModelProperty(value="公司logo")
private String logo;
/**
* 公司是否在前台可见
*/
@TableField(value = "isvisible")
@ApiModelProperty(value="公司是否在前台可见")
private Integer isvisible;
/**
* 实缴资本(万元)(人民币)
*/
@TableField(value = "paid_capital")
@ApiModelProperty(value="实缴资本(万元)(人民币)")
private BigDecimal paidCapital;
/**
* 公司资产规模 1:0-1亿 2:1-10亿 3:10-20亿 4:20-50亿 5:50-100亿 6:100亿以上
*/
@TableField(value = "company_asset_size")
@ApiModelProperty(value="公司资产规模 1:0-1亿 2:1-10亿 3:10-20亿 4:20-50亿 5:50-100亿 6:100亿以上")
private Integer companyAssetSize;
/**
* 法人代表
*/
@TableField(value = "legal_representative")
@ApiModelProperty(value="法人代表")
private String legalRepresentative;
/**
* 法人代表履历
*/
@TableField(value = "representative_experience")
@ApiModelProperty(value="法人代表履历")
private String representativeExperience;
/**
* 是否认证 0:否 1:是
*/
@TableField(value = "is_qualify")
@ApiModelProperty(value="是否认证 0:否 1:是")
private Integer isQualify;
/**
* 法人从业资格获得方式
*/
@TableField(value = "get_qualify_method")
@ApiModelProperty(value="法人从业资格获得方式")
private String getQualifyMethod;
/**
* 员工人数
*/
@TableField(value = "employee_cnts")
@ApiModelProperty(value="员工人数")
private Integer employeeCnts;
/**
* 信信息
*/
@TableField(value = "integrity_info")
@ApiModelProperty(value="信信息")
private String integrityInfo;
/**
* 提示信息
*/
@TableField(value = "special_tips")
@ApiModelProperty(value="提示信息")
private String specialTips;
/**
* 协会网站链接
*/
@TableField(value = "amac_link")
@ApiModelProperty(value="协会网站链接")
private String amacLink;
/**
* 创建时间
*/
@TableField(value = "create_time")
@ApiModelProperty(value="创建时间")
private Date createTime;
/**
* 创建人
*/
@TableField(value = "create_by")
@ApiModelProperty(value="创建人")
private String createBy;
/**
* 修改时间
*/
@TableField(value = "update_time")
@ApiModelProperty(value="修改时间")
private Date updateTime;
/**
* 修改人
*/
@TableField(value = "update_by")
@ApiModelProperty(value="修改人")
private String updateBy;
/**
* 删除标识
*/
@TableField(value = "delete_tag")
@ApiModelProperty(value="删除标识")
private Integer deleteTag;
/**
* 机构ID
*/
@TableField(value = "org_id")
@ApiModelProperty(value="机构ID")
private String orgId;
private static final long serialVersionUID = 1L;
public static final String COL_ID = "id";
public static final String COL_P_COMPANY_ID = "p_company_id";
public static final String COL_COMPANY_NAME = "company_name";
public static final String COL_COMPANY_SHORT_NAME = "company_short_name";
public static final String COL_COMPANY_ENGLISH_NAME = "company_english_name";
public static final String COL_COMPANY_TYPE = "company_type";
public static final String COL_ORGANIZATION_NUMBER = "organization_number";
public static final String COL_ESTABLISH_DATE = "establish_date";
public static final String COL_DOMICILE_ID = "domicile_id";
public static final String COL_COMPANY_ADDRESS = "company_address";
public static final String COL_COMPANY_ADDRESS2 = "company_address2";
public static final String COL_CITY = "city";
public static final String COL_PROVINCE = "province";
public static final String COL_COUNTRY = "country";
public static final String COL_REG_CITY = "reg_city";
public static final String COL_REG_PROVINCE = "reg_province";
public static final String COL_REG_COUNTRY = "reg_country";
public static final String COL_CONTACT_PHONE = "contact_phone";
public static final String COL_POST_CODE = "post_code";
public static final String COL_FAX = "fax";
public static final String COL_EMAIL = "email";
public static final String COL_WEBSITE = "website";
public static final String COL_REGISTERED_CAPITAL = "registered_capital";
public static final String COL_COMPANY_PROFILE = "company_profile";
public static final String COL_OFFSHORE_FUND = "offshore_fund";
public static final String COL_PHILOSOPY = "philosopy";
public static final String COL_COMPANY_STATUS = "company_status";
public static final String COL_BASE_CURRENCY_CRC = "base_currency_crc";
public static final String COL_REGISTER_NUMBER = "register_number";
public static final String COL_REGISTER_STATUS = "register_status";
public static final String COL_REGISTER_DATE = "register_date";
public static final String COL_REGISTER_NUMBER_ADDRESS = "register_number_address";
public static final String COL_IS_MEMBER = "is_member";
public static final String COL_JOIN_DATE = "join_date";
public static final String COL_MEMBER_TYPE = "member_type";
public static final String COL_FUND_CATEGORY_ORI = "fund_category_ori";
public static final String COL_BUSINESS_TYPE = "business_type";
public static final String COL_NATURE_BUSINESS_TYPE = "nature_business_type";
public static final String COL_CAPITAL_PAID_RATE = "capital_paid_rate";
public static final String COL_LOGO = "logo";
public static final String COL_ISVISIBLE = "isvisible";
public static final String COL_PAID_CAPITAL = "paid_capital";
public static final String COL_COMPANY_ASSET_SIZE = "company_asset_size";
public static final String COL_LEGAL_REPRESENTATIVE = "legal_representative";
public static final String COL_REPRESENTATIVE_EXPERIENCE = "representative_experience";
public static final String COL_IS_QUALIFY = "is_qualify";
public static final String COL_GET_QUALIFY_METHOD = "get_qualify_method";
public static final String COL_EMPLOYEE_CNTS = "employee_cnts";
public static final String COL_INTEGRITY_INFO = "integrity_info";
public static final String COL_SPECIAL_TIPS = "special_tips";
public static final String COL_AMAC_LINK = "amac_link";
public static final String COL_CREATE_TIME = "create_time";
public static final String COL_CREATE_BY = "create_by";
public static final String COL_UPDATE_TIME = "update_time";
public static final String COL_UPDATE_BY = "update_by";
public static final String COL_DELETE_TAG = "delete_tag";
public static final String COL_ORG_ID = "org_id";
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/dao/entity/fund/FundInfo.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.entity.fund;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.Builder;
import lombok.Data;
/**
* 基金基本信息
*/
@ApiModel(value="com-tanpu-community-dao-entity-fund-FundInfo")
@Data
@Builder
@TableName(value = "fund_info")
public class FundInfo implements Serializable {
/**
* 基金id
*/
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value="基金id")
private String id;
/**
* 父级产品ID
*/
@TableField(value = "p_fund_id")
@ApiModelProperty(value="父级产品ID")
private String pFundId;
/**
* 基金中文全称
*/
@TableField(value = "fund_name")
@ApiModelProperty(value="基金中文全称")
private String fundName;
/**
* 基金中文简称
*/
@TableField(value = "fund_short_name")
@ApiModelProperty(value="基金中文简称")
private String fundShortName;
/**
* 基金形式：1-公司型，2-合伙型，3-契约型，-1-其他
*/
@TableField(value = "fund_structure")
@ApiModelProperty(value="基金形式：1-公司型，2-合伙型，3-契约型，-1-其他")
private Integer fundStructure;
/**
* 私募基金类型：1-信托计划，2-有限合伙，3-券商资管，4-公募专户，5-单账户，6-证券投资基金，7-海外基金，8-期货资管，9-保险资管、10-创业投资基金、11-股权投资基金、12-银行理财、13-类固收信托、-1其他投资基金
公募基金类型：1-混合型、2-债券型、3-定开债券、4-联接基金、5-货币型、6-债券指数、7-保本型、8-理财型、9-QDII、10-股票指数、11-QDII-指数、12-股票型、13-固定收益、14-分级杠杆、15-ETF-场内、16-QDII-ETF、17-债券创新-场内、18-封闭式
*/
@TableField(value = "fund_type")
@ApiModelProperty(value="私募基金类型：1-信托计划，2-有限合伙，3-券商资管，4-公募专户，5-单账户，6-证券投资基金，7-海外基金，8-期货资管，9-保险资管、10-创业投资基金、11-股权投资基金、12-银行理财、13-类固收信托、-1其他投资基金 ,公募基金类型：1-混合型、2-债券型、3-定开债券、4-联接基金、5-货币型、6-债券指数、7-保本型、8-理财型、9-QDII、10-股票指数、11-QDII-指数、12-股票型、13-固定收益、14-分级杠杆、15-ETF-场内、16-QDII-ETF、17-债券创新-场内、18-封闭式")
private Integer fundType;
/**
* 是否可预约 0:不可预约 1:可预约
*/
@TableField(value = "`type`")
@ApiModelProperty(value="是否可预约 0:不可预约 1:可预约")
private Integer type;
/**
* 募集方式：1-私募，2-公募
*/
@TableField(value = "raise_type")
@ApiModelProperty(value="募集方式：1-私募，2-公募")
private Integer raiseType;
/**
* 券商资管产品特点
*/
@TableField(value = "fund_characteristic")
@ApiModelProperty(value="券商资管产品特点")
private String fundCharacteristic;
/**
* 基础货币,1-人民币，2-港币，3-美元，4-份，-1-其他
*/
@TableField(value = "base_currency")
@ApiModelProperty(value="基础货币,1-人民币，2-港币，3-美元，4-份，-1-其他")
private Integer baseCurrency;
/**
* 成立日期
*/
@TableField(value = "inception_date")
@ApiModelProperty(value="成立日期")
private Date inceptionDate;
/**
* 注册国家,1-中国大陆、2-香港、3-新加坡、4-开曼群岛、5-台湾、6-英属维尔京群岛BVI、-1-其他
*/
@TableField(value = "domicile")
@ApiModelProperty(value="注册国家,1-中国大陆、2-香港、3-新加坡、4-开曼群岛、5-台湾、6-英属维尔京群岛BVI、-1-其他")
private Integer domicile;
/**
* 指数id，以'IN'开头(后加36进制编码格式,不足8位长度左补零） 例：IN00000001
*/
@TableField(value = "primary_benchmark_id")
@ApiModelProperty(value="指数id，以'IN'开头(后加36进制编码格式,不足8位长度左补零） 例：IN00000001")
private String primaryBenchmarkId;
/**
* 封闭期，单位：月，-1：不确定，0：无封闭期
*/
@TableField(value = "lockup_period")
@ApiModelProperty(value="封闭期，单位：月，-1：不确定，0：无封闭期")
private Integer lockupPeriod;
/**
* 开放日
*/
@TableField(value = "open_day")
@ApiModelProperty(value="开放日")
private String openDay;
/**
* 产品存续期，单位：月。-1，不确定，0，无固定期限，999999永续
*/
@TableField(value = "duration")
@ApiModelProperty(value="产品存续期，单位：月。-1，不确定，0，无固定期限，999999永续")
private Integer duration;
/**
* 基金投资范围
*/
@TableField(value = "investment_scope")
@ApiModelProperty(value="基金投资范围")
private String investmentScope;
/**
* 投资限制
*/
@TableField(value = "investment_restriction")
@ApiModelProperty(value="投资限制")
private String investmentRestriction;
/**
* 投资理念
*/
@TableField(value = "fund_investment_philosophy")
@ApiModelProperty(value="投资理念")
private String fundInvestmentPhilosophy;
/**
* 投资策略
*/
@TableField(value = "fund_strategy_description")
@ApiModelProperty(value="投资策略")
private String fundStrategyDescription;
/**
* 投资顾问id
*/
@TableField(value = "advisor_id")
@ApiModelProperty(value="投资顾问id")
private String advisorId;
/**
* 托管银行Id
*/
@TableField(value = "custodian_id")
@ApiModelProperty(value="托管银行Id")
private String custodianId;
/**
* 证券经纪人Id
*/
@TableField(value = "broker_id")
@ApiModelProperty(value="证券经纪人Id")
private String brokerId;
/**
* 期货经纪人id
*/
@TableField(value = "broker_future_id")
@ApiModelProperty(value="期货经纪人id")
private String brokerFutureId;
/**
* 外包机构Id
*/
@TableField(value = "liquidation_agency_id")
@ApiModelProperty(value="外包机构Id")
private String liquidationAgencyId;
/**
* 基金管理公司Id
*/
@TableField(value = "trust_id")
@ApiModelProperty(value="基金管理公司Id")
private String trustId;
/**
* 投资顾问Id
*/
@TableField(value = "investment_consultant_id")
@ApiModelProperty(value="投资顾问Id")
private String investmentConsultantId;
/**
* 行政管理人Id
*/
@TableField(value = "administrator_id")
@ApiModelProperty(value="行政管理人Id")
private String administratorId;
/**
* 法律顾问Id
*/
@TableField(value = "legal_counsel_id")
@ApiModelProperty(value="法律顾问Id")
private String legalCounselId;
/**
* 审计机构
*/
@TableField(value = "auditor_id")
@ApiModelProperty(value="审计机构")
private String auditorId;
/**
* 净值披露频率 1:天 2：周 3：月 4：半月 5：季度
*/
@TableField(value = "nav_frequency")
@ApiModelProperty(value="净值披露频率 1:天 2：周 3：月 4：半月 5：季度")
private Integer navFrequency;
/**
* 产品业绩披露标识：1-AAA，2-AA，3-A，4-A-，5-A+
*/
@TableField(value = "performance_disclosure_mark")
@ApiModelProperty(value="产品业绩披露标识：1-AAA，2-AA，3-A，4-A-，5-A+")
private Integer performanceDisclosureMark;
/**
* 备案编码
*/
@TableField(value = "register_number")
@ApiModelProperty(value="备案编码")
private String registerNumber;
/**
* 备案日期
*/
@TableField(value = "register_date")
@ApiModelProperty(value="备案日期")
private Date registerDate;
/**
* 基金在前台是否可见:1-可见 0-不可见
*/
@TableField(value = "isvisible")
@ApiModelProperty(value="基金在前台是否可见:1-可见 0-不可见")
private Integer isvisible;
/**
* 是否分级：1-分级，0-不分级;
*/
@TableField(value = "istiered")
@ApiModelProperty(value="是否分级：1-分级，0-不分级;")
private Integer istiered;
/**
* 是否参与排名，1-参与排名 0-不参与排名
*/
@TableField(value = "is_ranking")
@ApiModelProperty(value="是否参与排名，1-参与排名 0-不参与排名 ")
private Integer isRanking;
/**
* 是否参与评级，1-参与评级 0-不参与评级
*/
@TableField(value = "is_rating")
@ApiModelProperty(value="是否参与评级，1-参与评级 0-不参与评级 ")
private Integer isRating;
/**
* 基金协会特别提示
*/
@TableField(value = "special_tips")
@ApiModelProperty(value="基金协会特别提示")
private String specialTips;
/**
* 基金协会链接
*/
@TableField(value = "amac_url")
@ApiModelProperty(value="基金协会链接")
private String amacUrl;
/**
* 净值来源说明：1-托管外包、2-信托券商官网、3-私募机构
*/
@TableField(value = "nav_source_type")
@ApiModelProperty(value="净值来源说明：1-托管外包、2-信托券商官网、3-私募机构")
private Integer navSourceType;
/**
* 组合目标
*/
@TableField(value = "combine_target")
@ApiModelProperty(value="组合目标")
private String combineTarget;
/**
* 适合群体
*/
@TableField(value = "fit_group")
@ApiModelProperty(value="适合群体")
private String fitGroup;
/**
* 组合点评
*/
@TableField(value = "combine_comment")
@ApiModelProperty(value="组合点评")
private String combineComment;
/**
* 调仓点评
*/
@TableField(value = "transfer_comment")
@ApiModelProperty(value="调仓点评")
private String transferComment;
/**
* 基金描述
*/
@TableField(value = "desc_info")
@ApiModelProperty(value="基金描述")
private String descInfo;
/**
* 融智策略分类，1-股票策略，2-宏观策略，3-管理期货，4-事件驱动，5-相对价值策略，6-固定收益策略，7-组合基金，8-复合策略，-1-其它策略
*/
@TableField(value = "strategy")
@ApiModelProperty(value="融智策略分类，1-股票策略，2-宏观策略，3-管理期货，4-事件驱动，5-相对价值策略，6-固定收益策略，7-组合基金，8-复合策略，-1-其它策略")
private Integer strategy;
/**
* 融智子策略分类:1010-主观多头 1020-股票多空 1030-量化多头 2010-宏观策略 3010-主观趋势 3020-主观套利 3030-量化趋势 3040-量化套利 3050-管理期货复合 4010-并购重组 4020-定向增发 4030-大宗交易 4040-事件驱动复合 5010-股票市场中性 5020-套利 5030-相对价值复合 6010-纯债策略 6020-强债策略 6030-固收复合 7010-MOM 7020-FOF 8010-主观多策略 8020-量化多策略 -1-其他策略'
*/
@TableField(value = "substrategy")
@ApiModelProperty(value="融智子策略分类:1010-主观多头 1020-股票多空 1030-量化多头 2010-宏观策略 3010-主观趋势 3020-主观套利 3030-量化趋势 3040-量化套利 3050-管理期货复合 4010-并购重组 4020-定向增发 4030-大宗交易 4040-事件驱动复合 5010-股票市场中性 5020-套利 5030-相对价值复合 6010-纯债策略 6020-强债策略 6030-固收复合 7010-MOM 7020-FOF 8010-主观多策略 8020-量化多策略 -1-其他策略'")
private Integer substrategy;
@TableField(value = "has_nav")
@ApiModelProperty(value="")
private Integer hasNav;
/**
* 风险等级
*/
@TableField(value = "risk_level")
@ApiModelProperty(value="风险等级")
private Integer riskLevel;
@TableField(value = "create_by")
@ApiModelProperty(value="")
private String createBy;
@TableField(value = "create_time")
@ApiModelProperty(value="")
private Date createTime;
@TableField(value = "update_by")
@ApiModelProperty(value="")
private String updateBy;
@TableField(value = "update_time")
@ApiModelProperty(value="")
private Date updateTime;
/**
* 数据来源 1:tanpu，2:私募排排
*/
@TableField(value = "data_sources")
@ApiModelProperty(value="数据来源 1:tanpu，2:私募排排")
private Integer dataSources;
/**
* 0:待上架 1：已上架 2：已下架
*/
@TableField(value = "`status`")
@ApiModelProperty(value="0:待上架 1：已上架 2：已下架")
private Integer status;
/**
* 删除标识 0:否 1:是
*/
@TableField(value = "delete_tag")
@ApiModelProperty(value="删除标识 0:否 1:是")
private Integer deleteTag;
/**
* 排序
*/
@TableField(value = "sort")
@ApiModelProperty(value="排序")
private Integer sort;
@TableField(value = "apply_day")
@ApiModelProperty(value="")
private String applyDay;
@TableField(value = "redeem_day")
@ApiModelProperty(value="")
private String redeemDay;
/**
* 机构ID
*/
@TableField(value = "org_id")
@ApiModelProperty(value="机构ID")
private String orgId;
private static final long serialVersionUID = 1L;
public static final String COL_ID = "id";
public static final String COL_P_FUND_ID = "p_fund_id";
public static final String COL_FUND_NAME = "fund_name";
public static final String COL_FUND_SHORT_NAME = "fund_short_name";
public static final String COL_FUND_STRUCTURE = "fund_structure";
public static final String COL_FUND_TYPE = "fund_type";
public static final String COL_TYPE = "type";
public static final String COL_RAISE_TYPE = "raise_type";
public static final String COL_FUND_CHARACTERISTIC = "fund_characteristic";
public static final String COL_BASE_CURRENCY = "base_currency";
public static final String COL_INCEPTION_DATE = "inception_date";
public static final String COL_DOMICILE = "domicile";
public static final String COL_PRIMARY_BENCHMARK_ID = "primary_benchmark_id";
public static final String COL_LOCKUP_PERIOD = "lockup_period";
public static final String COL_OPEN_DAY = "open_day";
public static final String COL_DURATION = "duration";
public static final String COL_INVESTMENT_SCOPE = "investment_scope";
public static final String COL_INVESTMENT_RESTRICTION = "investment_restriction";
public static final String COL_FUND_INVESTMENT_PHILOSOPHY = "fund_investment_philosophy";
public static final String COL_FUND_STRATEGY_DESCRIPTION = "fund_strategy_description";
public static final String COL_ADVISOR_ID = "advisor_id";
public static final String COL_CUSTODIAN_ID = "custodian_id";
public static final String COL_BROKER_ID = "broker_id";
public static final String COL_BROKER_FUTURE_ID = "broker_future_id";
public static final String COL_LIQUIDATION_AGENCY_ID = "liquidation_agency_id";
public static final String COL_TRUST_ID = "trust_id";
public static final String COL_INVESTMENT_CONSULTANT_ID = "investment_consultant_id";
public static final String COL_ADMINISTRATOR_ID = "administrator_id";
public static final String COL_LEGAL_COUNSEL_ID = "legal_counsel_id";
public static final String COL_AUDITOR_ID = "auditor_id";
public static final String COL_NAV_FREQUENCY = "nav_frequency";
public static final String COL_PERFORMANCE_DISCLOSURE_MARK = "performance_disclosure_mark";
public static final String COL_REGISTER_NUMBER = "register_number";
public static final String COL_REGISTER_DATE = "register_date";
public static final String COL_ISVISIBLE = "isvisible";
public static final String COL_ISTIERED = "istiered";
public static final String COL_IS_RANKING = "is_ranking";
public static final String COL_IS_RATING = "is_rating";
public static final String COL_SPECIAL_TIPS = "special_tips";
public static final String COL_AMAC_URL = "amac_url";
public static final String COL_NAV_SOURCE_TYPE = "nav_source_type";
public static final String COL_COMBINE_TARGET = "combine_target";
public static final String COL_FIT_GROUP = "fit_group";
public static final String COL_COMBINE_COMMENT = "combine_comment";
public static final String COL_TRANSFER_COMMENT = "transfer_comment";
public static final String COL_DESC_INFO = "desc_info";
public static final String COL_STRATEGY = "strategy";
public static final String COL_SUBSTRATEGY = "substrategy";
public static final String COL_HAS_NAV = "has_nav";
public static final String COL_RISK_LEVEL = "risk_level";
public static final String COL_CREATE_BY = "create_by";
public static final String COL_CREATE_TIME = "create_time";
public static final String COL_UPDATE_BY = "update_by";
public static final String COL_UPDATE_TIME = "update_time";
public static final String COL_DATA_SOURCES = "data_sources";
public static final String COL_STATUS = "status";
public static final String COL_DELETE_TAG = "delete_tag";
public static final String COL_SORT = "sort";
public static final String COL_APPLY_DAY = "apply_day";
public static final String COL_REDEEM_DAY = "redeem_day";
public static final String COL_ORG_ID = "org_id";
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/dao/entity/jydb/MfAdvisorscalerank.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.entity.jydb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Builder;
import lombok.Data;
@ApiModel(value="com-tanpu-community-dao-entity-jydb-MfAdvisorscalerank")
@Data
@Builder
@TableName(value = "mf_advisorscalerank")
public class MfAdvisorscalerank implements Serializable {
/**
* ID
*/
@TableField(value = "ID")
@ApiModelProperty(value="ID")
private Long id;
/**
* 基金管理人编码
*/
@TableField(value = "InvestAdvisorCode")
@ApiModelProperty(value="基金管理人编码")
private Integer investadvisorcode;
/**
* 截止日期
*/
@TableField(value = "EndDate")
@ApiModelProperty(value="截止日期")
private Date enddate;
/**
* 总管理规模(亿元)
*/
@TableField(value = "TotalFundNV")
@ApiModelProperty(value="总管理规模(亿元)")
private BigDecimal totalfundnv;
/**
* 旗下基金总数(只)
*/
@TableField(value = "TotalFundN")
@ApiModelProperty(value="旗下基金总数(只)")
private Integer totalfundn;
/**
* 股票型管理规模(亿元)
*/
@TableField(value = "EquityFundNV")
@ApiModelProperty(value="股票型管理规模(亿元)")
private BigDecimal equityfundnv;
/**
* 股票型基金管理规模排名
*/
@TableField(value = "EquityNVRank")
@ApiModelProperty(value="股票型基金管理规模排名")
private Integer equitynvrank;
/**
* 股票型基金数量(只)
*/
@TableField(value = "EquityFundN")
@ApiModelProperty(value="股票型基金数量(只)")
private Integer equityfundn;
/**
* 股票型基金管理数量排名
*/
@TableField(value = "EquityNRank")
@ApiModelProperty(value="股票型基金管理数量排名")
private Integer equitynrank;
/**
* 管理股票型基金公司数
*/
@TableField(value = "AdvisorOfEquity")
@ApiModelProperty(value="管理股票型基金公司数")
private Integer advisorofequity;
/**
* 混合型管理规模(亿元)
*/
@TableField(value = "HybridFundNV")
@ApiModelProperty(value="混合型管理规模(亿元)")
private BigDecimal hybridfundnv;
/**
* 混合型基金管理规模排名
*/
@TableField(value = "HybridNVRank")
@ApiModelProperty(value="混合型基金管理规模排名")
private Integer hybridnvrank;
/**
* 混合型基金数量(只)
*/
@TableField(value = "HybridFundN")
@ApiModelProperty(value="混合型基金数量(只)")
private Integer hybridfundn;
/**
* 混合型基金管理数量排名
*/
@TableField(value = "HybridNRank")
@ApiModelProperty(value="混合型基金管理数量排名")
private Integer hybridnrank;
/**
* 管理混合型基金公司数
*/
@TableField(value = "AdvisorOfHybrid")
@ApiModelProperty(value="管理混合型基金公司数")
private Integer advisorofhybrid;
/**
* 债券型管理规模(亿元)
*/
@TableField(value = "BondFundNV")
@ApiModelProperty(value="债券型管理规模(亿元)")
private BigDecimal bondfundnv;
/**
* 债券型基金管理规模排名
*/
@TableField(value = "BondNVRank")
@ApiModelProperty(value="债券型基金管理规模排名")
private Integer bondnvrank;
/**
* 债券型基金数量(只)
*/
@TableField(value = "BondFundN")
@ApiModelProperty(value="债券型基金数量(只)")
private Integer bondfundn;
/**
* 债券型基金管理数量排名
*/
@TableField(value = "BondNRank")
@ApiModelProperty(value="债券型基金管理数量排名")
private Integer bondnrank;
/**
* 管理债券型基金公司数
*/
@TableField(value = "AdvisorOfBond")
@ApiModelProperty(value="管理债券型基金公司数")
private Integer advisorofbond;
/**
* 货币型管理规模(亿元)
*/
@TableField(value = "MonetaryFundNV")
@ApiModelProperty(value="货币型管理规模(亿元)")
private BigDecimal monetaryfundnv;
/**
* 货币型基金管理规模排名
*/
@TableField(value = "MonetaryNVRank")
@ApiModelProperty(value="货币型基金管理规模排名")
private Integer monetarynvrank;
/**
* 货币型基金数量(只)
*/
@TableField(value = "MonetaryFundN")
@ApiModelProperty(value="货币型基金数量(只)")
private Integer monetaryfundn;
/**
* 货币型基金管理数量排名
*/
@TableField(value = "MonetaryNRank")
@ApiModelProperty(value="货币型基金管理数量排名")
private Integer monetarynrank;
/**
* 管理货币型基金公司数
*/
@TableField(value = "AdvisorOfMonetary")
@ApiModelProperty(value="管理货币型基金公司数")
private Integer advisorofmonetary;
/**
* 理财型管理规模(亿元)
*/
@TableField(value = "ShortBondFundNV")
@ApiModelProperty(value="理财型管理规模(亿元)")
private BigDecimal shortbondfundnv;
/**
* 理财型基金管理规模排名
*/
@TableField(value = "ShortBondNVRank")
@ApiModelProperty(value="理财型基金管理规模排名")
private Integer shortbondnvrank;
/**
* 理财型基金数量(只)
*/
@TableField(value = "ShortBondFundN")
@ApiModelProperty(value="理财型基金数量(只)")
private Integer shortbondfundn;
/**
* 理财型基金管理数量排名
*/
@TableField(value = "ShortBondNRank")
@ApiModelProperty(value="理财型基金管理数量排名")
private Integer shortbondnrank;
/**
* 管理理财型基金公司数
*/
@TableField(value = "AdvisorOfShortBond")
@ApiModelProperty(value="管理理财型基金公司数")
private Integer advisorofshortbond;
/**
* QDII管理规模(亿元)
*/
@TableField(value = "QDIINV")
@ApiModelProperty(value="QDII管理规模(亿元)")
private BigDecimal qdiinv;
/**
* QDII基金管理规模排名
*/
@TableField(value = "QDIINVRank")
@ApiModelProperty(value="QDII基金管理规模排名")
private Integer qdiinvrank;
/**
* QDII基金数量(只)
*/
@TableField(value = "QDIIN")
@ApiModelProperty(value="QDII基金数量(只)")
private Integer qdiin;
/**
* QDII基金管理数量排名
*/
@TableField(value = "QDIINRank")
@ApiModelProperty(value="QDII基金管理数量排名")
private Integer qdiinrank;
/**
* 管理QDII基金公司数
*/
@TableField(value = "AdvisorOfQDII")
@ApiModelProperty(value="管理QDII基金公司数")
private Integer advisorofqdii;
/**
* 发布时间
*/
@TableField(value = "InsertTime")
@ApiModelProperty(value="发布时间")
private Date inserttime;
/**
* 更新时间
*/
@TableField(value = "UpdateTime")
@ApiModelProperty(value="更新时间")
private Date updatetime;
/**
* JSID
*/
@TableField(value = "JSID")
@ApiModelProperty(value="JSID")
private Long jsid;
/**
* 总管理规模排名
*/
@TableField(value = "FundNVRank")
@ApiModelProperty(value="总管理规模排名")
private Integer fundnvrank;
/**
* 添加列FundNRank
*/
@TableField(value = "FundNRank")
@ApiModelProperty(value="添加列FundNRank")
private Integer fundnrank;
/**
* 基金公司总数
*/
@TableField(value = "TotalAdvisor")
@ApiModelProperty(value="基金公司总数")
private Integer totaladvisor;
/**
* 非货基与理财债基管理规模(亿元)
*/
@TableField(value = "UnMSBFNV")
@ApiModelProperty(value="非货基与理财债基管理规模(亿元)")
private BigDecimal unmsbfnv;
/**
* 非货基与理财债基管理规模排名
*/
@TableField(value = "UnMSBFNVRank")
@ApiModelProperty(value="非货基与理财债基管理规模排名")
private Integer unmsbfnvrank;
/**
* 非货基与理财债基数量(只)
*/
@TableField(value = "UnMSBFN")
@ApiModelProperty(value="非货基与理财债基数量(只)")
private Integer unmsbfn;
/**
* 非货基与理财债基管理数量排名
*/
@TableField(value = "UnMSBFNRank")
@ApiModelProperty(value="非货基与理财债基管理数量排名")
private Integer unmsbfnrank;
/**
* 管理非货基与理财债基公司数
*/
@TableField(value = "AdvisorOfUnMSBF")
@ApiModelProperty(value="管理非货基与理财债基公司数")
private Integer advisorofunmsbf;
/**
* 主动权益类基金管理规模(亿元)
*/
@TableField(value = "ActiveEFNV")
@ApiModelProperty(value="主动权益类基金管理规模(亿元)")
private BigDecimal activeefnv;
/**
* 主动权益类基金管理规模排名
*/
@TableField(value = "ActiveEFNVRank")
@ApiModelProperty(value="主动权益类基金管理规模排名")
private Integer activeefnvrank;
/**
* 主动权益类基金数量(只)
*/
@TableField(value = "ActiveEFN")
@ApiModelProperty(value="主动权益类基金数量(只)")
private Integer activeefn;
/**
* 主动权益类基金管理数量排名
*/
@TableField(value = "ActiveEFNRank")
@ApiModelProperty(value="主动权益类基金管理数量排名")
private Integer activeefnrank;
/**
* 管理主动权益类基金公司数
*/
@TableField(value = "AdvisorOfActiveEF")
@ApiModelProperty(value="管理主动权益类基金公司数")
private Integer advisorofactiveef;
private static final long serialVersionUID = 1L;
public static final String COL_ID = "ID";
public static final String COL_INVESTADVISORCODE = "InvestAdvisorCode";
public static final String COL_ENDDATE = "EndDate";
public static final String COL_TOTALFUNDNV = "TotalFundNV";
public static final String COL_TOTALFUNDN = "TotalFundN";
public static final String COL_EQUITYFUNDNV = "EquityFundNV";
public static final String COL_EQUITYNVRANK = "EquityNVRank";
public static final String COL_EQUITYFUNDN = "EquityFundN";
public static final String COL_EQUITYNRANK = "EquityNRank";
public static final String COL_ADVISOROFEQUITY = "AdvisorOfEquity";
public static final String COL_HYBRIDFUNDNV = "HybridFundNV";
public static final String COL_HYBRIDNVRANK = "HybridNVRank";
public static final String COL_HYBRIDFUNDN = "HybridFundN";
public static final String COL_HYBRIDNRANK = "HybridNRank";
public static final String COL_ADVISOROFHYBRID = "AdvisorOfHybrid";
public static final String COL_BONDFUNDNV = "BondFundNV";
public static final String COL_BONDNVRANK = "BondNVRank";
public static final String COL_BONDFUNDN = "BondFundN";
public static final String COL_BONDNRANK = "BondNRank";
public static final String COL_ADVISOROFBOND = "AdvisorOfBond";
public static final String COL_MONETARYFUNDNV = "MonetaryFundNV";
public static final String COL_MONETARYNVRANK = "MonetaryNVRank";
public static final String COL_MONETARYFUNDN = "MonetaryFundN";
public static final String COL_MONETARYNRANK = "MonetaryNRank";
public static final String COL_ADVISOROFMONETARY = "AdvisorOfMonetary";
public static final String COL_SHORTBONDFUNDNV = "ShortBondFundNV";
public static final String COL_SHORTBONDNVRANK = "ShortBondNVRank";
public static final String COL_SHORTBONDFUNDN = "ShortBondFundN";
public static final String COL_SHORTBONDNRANK = "ShortBondNRank";
public static final String COL_ADVISOROFSHORTBOND = "AdvisorOfShortBond";
public static final String COL_QDIINV = "QDIINV";
public static final String COL_QDIINVRANK = "QDIINVRank";
public static final String COL_QDIIN = "QDIIN";
public static final String COL_QDIINRANK = "QDIINRank";
public static final String COL_ADVISOROFQDII = "AdvisorOfQDII";
public static final String COL_INSERTTIME = "InsertTime";
public static final String COL_UPDATETIME = "UpdateTime";
public static final String COL_JSID = "JSID";
public static final String COL_FUNDNVRANK = "FundNVRank";
public static final String COL_FUNDNRANK = "FundNRank";
public static final String COL_TOTALADVISOR = "TotalAdvisor";
public static final String COL_UNMSBFNV = "UnMSBFNV";
public static final String COL_UNMSBFNVRANK = "UnMSBFNVRank";
public static final String COL_UNMSBFN = "UnMSBFN";
public static final String COL_UNMSBFNRANK = "UnMSBFNRank";
public static final String COL_ADVISOROFUNMSBF = "AdvisorOfUnMSBF";
public static final String COL_ACTIVEEFNV = "ActiveEFNV";
public static final String COL_ACTIVEEFNVRANK = "ActiveEFNVRank";
public static final String COL_ACTIVEEFN = "ActiveEFN";
public static final String COL_ACTIVEEFNRANK = "ActiveEFNRank";
public static final String COL_ADVISOROFACTIVEEF = "AdvisorOfActiveEF";
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/dao/entity/jydb/MfInvestadvisoroutline.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.entity.jydb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Builder;
import lombok.Data;
@ApiModel(value="com-tanpu-community-dao-entity-jydb-MfInvestadvisoroutline")
@Data
@Builder
@TableName(value = "mf_investadvisoroutline")
public class MfInvestadvisoroutline implements Serializable {
/**
* ID
*/
@TableField(value = "ID")
@ApiModelProperty(value="ID")
private Long id;
/**
* 基金公司代码
*/
@TableField(value = "InvestAdvisorCode")
@ApiModelProperty(value="基金公司代码")
private Integer investadvisorcode;
/**
* 基金管理人名称
*/
@TableField(value = "InvestAdvisorName")
@ApiModelProperty(value="基金管理人名称")
private String investadvisorname;
/**
* 基金管理人简称
*/
@TableField(value = "InvestAdvisorAbbrName")
@ApiModelProperty(value="基金管理人简称")
private String investadvisorabbrname;
/**
* 法人代表
*/
@TableField(value = "LegalRepr")
@ApiModelProperty(value="法人代表")
private String legalrepr;
/**
* 总经理
*/
@TableField(value = "GeneralManager")
@ApiModelProperty(value="总经理")
private String generalmanager;
/**
* 公司成立日期
*/
@TableField(value = "EstablishmentDate")
@ApiModelProperty(value="公司成立日期")
private Date establishmentdate;
/**
* 组织形式
*/
@TableField(value = "OrganizationForm")
@ApiModelProperty(value="组织形式")
private String organizationform;
/**
* 注册资本(元)
*/
@TableField(value = "RegCapital")
@ApiModelProperty(value="注册资本(元)")
private BigDecimal regcapital;
/**
* 公司注册地址
*/
@TableField(value = "RegAddr")
@ApiModelProperty(value="公司注册地址")
private String regaddr;
/**
* 公司办公地址
*/
@TableField(value = "OfficeAddr")
@ApiModelProperty(value="公司办公地址")
private String officeaddr;
/**
* 邮编
*/
@TableField(value = "ZipCode")
@ApiModelProperty(value="邮编")
private String zipcode;
/**
* 邮箱
*/
@TableField(value = "Email")
@ApiModelProperty(value="邮箱")
private String email;
/**
* 公司联系地址
*/
@TableField(value = "ContactAddr")
@ApiModelProperty(value="公司联系地址")
private String contactaddr;
/**
* 电话
*/
@TableField(value = "Tel")
@ApiModelProperty(value="电话")
private String tel;
/**
* 传真
*/
@TableField(value = "Fax")
@ApiModelProperty(value="传真")
private String fax;
/**
* 公司网址
*/
@TableField(value = "WebSite")
@ApiModelProperty(value="公司网址")
private String website;
/**
* 联系人
*/
@TableField(value = "LinkMan")
@ApiModelProperty(value="联系人")
private String linkman;
/**
* 简历
*/
@TableField(value = "Background")
@ApiModelProperty(value="简历")
private String background;
/**
* 所属地区
*/
@TableField(value = "Region")
@ApiModelProperty(value="所属地区")
private Integer region;
/**
* 修改日期
*/
@TableField(value = "XGRQ")
@ApiModelProperty(value="修改日期")
private Date xgrq;
/**
* JSID
*/
@TableField(value = "JSID")
@ApiModelProperty(value="JSID")
private Long jsid;
/**
* 客服热线
*/
@TableField(value = "ServiceLine")
@ApiModelProperty(value="客服热线")
private String serviceline;
/**
* 存续截止日
*/
@TableField(value = "MaturityEndDate")
@ApiModelProperty(value="存续截止日")
private Date maturityenddate;
/**
* 注册登记代码
*/
@TableField(value = "TACode")
@ApiModelProperty(value="注册登记代码")
private String tacode;
/**
* 证监会标识码
*/
@TableField(value = "CSRCCode")
@ApiModelProperty(value="证监会标识码")
private String csrccode;
private static final long serialVersionUID = 1L;
public static final String COL_ID = "ID";
public static final String COL_INVESTADVISORCODE = "InvestAdvisorCode";
public static final String COL_INVESTADVISORNAME = "InvestAdvisorName";
public static final String COL_INVESTADVISORABBRNAME = "InvestAdvisorAbbrName";
public static final String COL_LEGALREPR = "LegalRepr";
public static final String COL_GENERALMANAGER = "GeneralManager";
public static final String COL_ESTABLISHMENTDATE = "EstablishmentDate";
public static final String COL_ORGANIZATIONFORM = "OrganizationForm";
public static final String COL_REGCAPITAL = "RegCapital";
public static final String COL_REGADDR = "RegAddr";
public static final String COL_OFFICEADDR = "OfficeAddr";
public static final String COL_ZIPCODE = "ZipCode";
public static final String COL_EMAIL = "Email";
public static final String COL_CONTACTADDR = "ContactAddr";
public static final String COL_TEL = "Tel";
public static final String COL_FAX = "Fax";
public static final String COL_WEBSITE = "WebSite";
public static final String COL_LINKMAN = "LinkMan";
public static final String COL_BACKGROUND = "Background";
public static final String COL_REGION = "Region";
public static final String COL_XGRQ = "XGRQ";
public static final String COL_JSID = "JSID";
public static final String COL_SERVICELINE = "ServiceLine";
public static final String COL_MATURITYENDDATE = "MaturityEndDate";
public static final String COL_TACODE = "TACode";
public static final String COL_CSRCCODE = "CSRCCode";
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/dao/mapper/fund/CompanyInfoMapper.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.mapper.fund;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tanpu.community.dao.entity.fund.CompanyInfo;
public interface CompanyInfoMapper extends BaseMapper<CompanyInfo> {
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/dao/mapper/fund/FundInfoMapper.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.mapper.fund;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tanpu.community.dao.entity.fund.FundInfo;
public interface FundInfoMapper extends BaseMapper<FundInfo> {
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/dao/mapper/jydb/MfAdvisorscalerankMapper.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.mapper.jydb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tanpu.community.dao.entity.jydb.MfAdvisorscalerank;
public interface MfAdvisorscalerankMapper extends BaseMapper<MfAdvisorscalerank> {
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/dao/mapper/jydb/MfInvestadvisoroutlineMapper.java deleted 100644 → 0
View file @ e4929e95
package com.tanpu.community.dao.mapper.jydb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tanpu.community.dao.entity.jydb.MfInvestadvisoroutline;
public interface MfInvestadvisoroutlineMapper extends BaseMapper<MfInvestadvisoroutline> {
}
\ No newline at end of file
community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java
View file @ d1ba9594
...@@ -4,11 +4,12 @@ import com.tanpu.common.api.CommonResp; ...@@ -4,11 +4,12 @@ import com.tanpu.common.api.CommonResp;
import com.tanpu.community.api.beans.req.page.Page; import com.tanpu.community.api.beans.req.page.Page;
import com.tanpu.community.api.beans.req.page.Pageable; import com.tanpu.community.api.beans.req.page.Pageable;
import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp; import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp; import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo; import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
import com.tanpu.community.config.FeignConfiguration;
import com.tanpu.community.feign.diagnose.FeignBackClientForDiagnose; import com.tanpu.community.feign.diagnose.FeignBackClientForDiagnose;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
...@@ -44,11 +45,11 @@ public interface FeignClientForFatools { ...@@ -44,11 +45,11 @@ public interface FeignClientForFatools {
// 用户信息查询 (供圈子服务调用) // 用户信息查询 (供圈子服务调用)
@ApiOperation(value = "查询用户信息") @ApiOperation(value = "查询用户信息")
@GetMapping(value = "/queryUserInfoNew") @GetMapping(value = "/queryUserInfoNew")
CommonResp<UserInfoNew> queryUsersListNew(@RequestParam("userId") String userId); CommonResp<UserInfoResp> queryUsersListNew(@RequestParam("userId") String userId);
@ApiOperation(value = "批量查询查询基本信息") @ApiOperation(value = "批量查询查询基本信息")
@GetMapping(value = "/queryUserBaseInfoList") @GetMapping(value = "/queryUserBaseInfoList")
List<UserInfoNew> queryUserListNew(@RequestParam("userIds") List<String> userIds); List<UserInfoResp> queryUserListNew(@RequestParam("userIds") List<String> userIds);
@ApiOperation(value = "根据机构用户id 查询旗下机构用户信息") @ApiOperation(value = "根据机构用户id 查询旗下机构用户信息")
@GetMapping(value = "/getUsetInfoByOrgUserId") @GetMapping(value = "/getUsetInfoByOrgUserId")
......
community-service/src/main/java/com/tanpu/community/feign/fatools/FeignbackForFatools.java
View file @ d1ba9594
...@@ -4,9 +4,9 @@ import com.tanpu.common.api.CommonResp; ...@@ -4,9 +4,9 @@ import com.tanpu.common.api.CommonResp;
import com.tanpu.community.api.beans.req.page.Page; import com.tanpu.community.api.beans.req.page.Page;
import com.tanpu.community.api.beans.req.page.Pageable; import com.tanpu.community.api.beans.req.page.Pageable;
import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp; import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp; import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo; import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
...@@ -50,13 +50,13 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool ...@@ -50,13 +50,13 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
} }
@Override @Override
public CommonResp<UserInfoNew> queryUsersListNew(String userId) { public CommonResp<UserInfoResp> queryUsersListNew(String userId) {
log.info("FeignbackForFatools.queryUsersListNew", throwable); log.info("FeignbackForFatools.queryUsersListNew", throwable);
return CommonResp.error(); return CommonResp.error();
} }
@Override @Override
public List<UserInfoNew> queryUserListNew(List<String> userIds) { public List<UserInfoResp> queryUserListNew(List<String> userIds) {
log.info("FeignbackForFatools.queryUserListNew", throwable); log.info("FeignbackForFatools.queryUserListNew", throwable);
return Collections.emptyList(); return Collections.emptyList();
} }
......
community-service/src/main/java/com/tanpu/community/feign/fund/FeignClientForFund.java 0 → 100644
View file @ d1ba9594
package com.tanpu.community.feign.fund;
import com.tanpu.common.api.CommonResp;
import com.tanpu.community.api.beans.req.page.Page;
import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
import com.tanpu.community.config.FeignConfiguration;
import com.tanpu.community.feign.fatools.FeignbackForFatools;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
import java.util.Set;
@FeignClient(value = "service-fund", fallbackFactory = FeignbackForFund.class, url = "http://tp-fund-svc", path = "/fund")
//@FeignClient(value = "service-fund",configuration = FeignConfiguration.class, fallbackFactory = FeignbackForFund.class,url = "http://127.0.0.1:8199/fund", path = "/fund")
public interface FeignClientForFund {
@ApiOperation("基金公司-简单信息")
@GetMapping("/fund/companyInfoSimple")
CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(@ApiParam("基金公司id") @RequestParam("id") String id);
@ApiOperation("私募类型基金公司-持有产品数")
@GetMapping("/fund/companyFundCount")
CommonResp<FundCompanySimpleVO> getCompanyFundCount(@ApiParam("基金公司id") @RequestParam("id") String id);
}
community-service/src/main/java/com/tanpu/community/feign/fund/FeignbackForFund.java 0 → 100644
View file @ d1ba9594
package com.tanpu.community.feign.fund;
import com.tanpu.common.api.CommonResp;
import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component
public class FeignbackForFund implements FallbackFactory<FeignClientForFund> {
@Override
public FeignClientForFund create(Throwable throwable) {
return new FeignClientForFund() {
@Override
public CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(String id) {
log.info("FeignbackForFund.getFundCompanyInfoSimple 调用失败 id:{}", id);
log.error("FeignbackForFund.getFundCompanyInfoSimple 调用失败", throwable);
return CommonResp.error();
}
@Override
public CommonResp<FundCompanySimpleVO> getCompanyFundCount(String id) {
log.info("FeignbackForFund.getCompanyFundCount 调用失败 id:{}", id);
log.error("FeignbackForFund.getCompanyFundCount 调用失败", throwable);
return CommonResp.error();
}
};
}
}
community-service/src/main/java/com/tanpu/community/feign/publicFund/FeignClientForPublicFund.java 0 → 100644
View file @ d1ba9594
package com.tanpu.community.feign.publicFund;
import com.tanpu.common.api.CommonResp;
import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(value = "service-fundpublic", fallbackFactory = FeignbackForPublicFund.class, url = "http://tp-fundpublic-svc", path = "/fundpublic")
//@FeignClient(value = "service-fundpublic",configuration = FeignConfiguration.class, fallbackFactory = FeignbackForPublicFund.class,url = "http://127.0.0.1:8200/fundpublic", path = "/fundpublic")
public interface FeignClientForPublicFund {
@ApiOperation("基金公司-简单信息")
@GetMapping("/publicFund/companyInfoSimple")
CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(@ApiParam("基金公司id") @RequestParam("id") String id);
@ApiOperation("私募类型基金公司-持有产品数")
@GetMapping("/publicFund/companyFundCount")
CommonResp<FundCompanySimpleVO> getCompanyFundCount(@ApiParam("基金公司id") @RequestParam("id") String id);
}
community-service/src/main/java/com/tanpu/community/feign/publicFund/FeignbackForPublicFund.java 0 → 100644
View file @ d1ba9594
package com.tanpu.community.feign.publicFund;
import com.tanpu.common.api.CommonResp;
import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
import com.tanpu.community.feign.fund.FeignClientForFund;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component
public class FeignbackForPublicFund implements FallbackFactory<FeignClientForPublicFund> {
@Override
public FeignClientForPublicFund create(Throwable throwable) {
return new FeignClientForPublicFund() {
@Override
public CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(String id) {
log.info("FeignClientForPublicFund.getFundCompanyInfoSimple 调用失败 id:{}", id);
log.error("FeignClientForPublicFund.getFundCompanyInfoSimple 调用失败", throwable);
return CommonResp.error();
}
@Override
public CommonResp<FundCompanySimpleVO> getCompanyFundCount(String id) {
log.info("FeignClientForPublicFund.getCompanyFundCount 调用失败 id:{}", id);
log.error("FeignClientForPublicFund.getCompanyFundCount 调用失败", throwable);
return CommonResp.error();
}
};
}
}
community-service/src/main/java/com/tanpu/community/manager/CommentManager.java
View file @ d1ba9594
...@@ -6,7 +6,7 @@ import com.tanpu.community.api.beans.qo.CommentQo; ...@@ -6,7 +6,7 @@ import com.tanpu.community.api.beans.qo.CommentQo;
import com.tanpu.community.api.beans.req.comment.CreateCommentReq; import com.tanpu.community.api.beans.req.comment.CreateCommentReq;
import com.tanpu.community.api.beans.req.comment.LikeCommentReq; import com.tanpu.community.api.beans.req.comment.LikeCommentReq;
import com.tanpu.community.api.beans.req.comment.ReportCommentReq; import com.tanpu.community.api.beans.req.comment.ReportCommentReq;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.enums.CollectionTypeEnum; import com.tanpu.community.api.enums.CollectionTypeEnum;
import com.tanpu.community.api.enums.CommentTypeEnum; import com.tanpu.community.api.enums.CommentTypeEnum;
import com.tanpu.community.api.enums.OperationTypeEnum; import com.tanpu.community.api.enums.OperationTypeEnum;
...@@ -74,8 +74,8 @@ public class CommentManager { ...@@ -74,8 +74,8 @@ public class CommentManager {
for (CommentQo commentQo : commentQos) { for (CommentQo commentQo : commentQos) {
//查询用户信息 //查询用户信息
String authorId = commentQo.getAuthorId(); String authorId = commentQo.getAuthorId();
UserInfoNew userInfo = redisCache.getObject(StringUtils.joinWith("_", CACHE_FEIGN_USER_INFO, authorId), UserInfoResp userInfo = redisCache.getObject(StringUtils.joinWith("_", CACHE_FEIGN_USER_INFO, authorId),
60 * 10, () ->this.getUserInfo(authorId) , UserInfoNew.class); 60 * 10, () ->this.getUserInfo(authorId) , UserInfoResp.class);
if (userInfo != null) { if (userInfo != null) {
commentQo.setUserImg(userInfo.getHeadImageUrl()); commentQo.setUserImg(userInfo.getHeadImageUrl());
commentQo.setNickName(userInfo.getNickName()); commentQo.setNickName(userInfo.getNickName());
...@@ -98,8 +98,8 @@ public class CommentManager { ...@@ -98,8 +98,8 @@ public class CommentManager {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
private UserInfoNew getUserInfo(String authorId){ private UserInfoResp getUserInfo(String authorId){
CommonResp<UserInfoNew> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId); CommonResp<UserInfoResp> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId);
if (userInfoNewCommonResp.isNotSuccess()) { if (userInfoNewCommonResp.isNotSuccess()) {
throw new BizException("内部接口调用失败"); throw new BizException("内部接口调用失败");
} }
......
community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java
View file @ d1ba9594
...@@ -10,23 +10,18 @@ import com.tanpu.community.api.beans.req.homepage.QueryFollowReq; ...@@ -10,23 +10,18 @@ import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
import com.tanpu.community.api.beans.req.page.Page; import com.tanpu.community.api.beans.req.page.Page;
import com.tanpu.community.api.beans.req.page.Pageable; import com.tanpu.community.api.beans.req.page.Pageable;
import com.tanpu.community.api.beans.resp.Customer; import com.tanpu.community.api.beans.resp.Customer;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
import com.tanpu.community.api.enums.*; import com.tanpu.community.api.enums.*;
import com.tanpu.community.dao.entity.community.FollowRelEntity; import com.tanpu.community.dao.entity.community.FollowRelEntity;
import com.tanpu.community.dao.entity.fund.CompanyInfo;
import com.tanpu.community.dao.entity.fund.FundInfo;
import com.tanpu.community.dao.entity.jydb.MfAdvisorscalerank;
import com.tanpu.community.dao.entity.jydb.MfInvestadvisoroutline;
import com.tanpu.community.dao.mapper.community.FollowRelMapper; import com.tanpu.community.dao.mapper.community.FollowRelMapper;
import com.tanpu.community.dao.mapper.fund.CompanyInfoMapper;
import com.tanpu.community.dao.mapper.fund.FundInfoMapper;
import com.tanpu.community.dao.mapper.jydb.MfAdvisorscalerankMapper;
import com.tanpu.community.dao.mapper.jydb.MfInvestadvisoroutlineMapper;
import com.tanpu.community.feign.course.FeignClientForCourse; import com.tanpu.community.feign.course.FeignClientForCourse;
import com.tanpu.community.feign.diagnose.FeignClientForDiagnose; import com.tanpu.community.feign.diagnose.FeignClientForDiagnose;
import com.tanpu.community.feign.fatools.FeignClientForFatools; import com.tanpu.community.feign.fatools.FeignClientForFatools;
import com.tanpu.community.feign.fund.FeignClientForFund;
import com.tanpu.community.feign.publicFund.FeignClientForPublicFund;
import com.tanpu.community.service.FollowRelService; import com.tanpu.community.service.FollowRelService;
import com.tanpu.community.util.ConvertUtil; import com.tanpu.community.util.ConvertUtil;
import com.tanpu.community.util.PageUtils; import com.tanpu.community.util.PageUtils;
...@@ -50,23 +45,19 @@ public class HomePageManager { ...@@ -50,23 +45,19 @@ public class HomePageManager {
@Resource @Resource
private FollowRelMapper followRelMapper; private FollowRelMapper followRelMapper;
@Resource @Resource
private MfInvestadvisoroutlineMapper mfInvestadvisoroutlineMapper;
@Resource
private MfAdvisorscalerankMapper mfAdvisorscalerankMapper;
@Resource
private CompanyInfoMapper companyInfoMapper;
@Resource
private FundInfoMapper fundInfoMapper;
@Resource
private FeignClientForDiagnose feignClientForDiagnose; private FeignClientForDiagnose feignClientForDiagnose;
@Resource @Resource
private FeignClientForCourse feignClientForCourse; private FeignClientForCourse feignClientForCourse;
@Resource
private FeignClientForFund feignClientForFund;
@Resource
private FeignClientForPublicFund feignClientForPublicFund;
//查询 个人中心 相关信息 //查询 个人中心 相关信息
public UserInfoNew queryUsersListNew(String userIdMyself, String userId) { public UserInfoResp queryUsersInfo(String userIdMyself, String userId) {
CommonResp<UserInfoNew> queryUsersListNew = feignClientForFatools.queryUsersListNew(StringUtils.isNotBlank(userId) ? userId : userIdMyself); CommonResp<UserInfoResp> queryUsersListNew = feignClientForFatools.queryUsersListNew(StringUtils.isNotBlank(userId) ? userId : userIdMyself);
if (queryUsersListNew.isNotSuccess() || !ObjectUtils.anyNotNull(queryUsersListNew.getData())) throw new BizException("内部接口调用失败"); if (queryUsersListNew.isNotSuccess() || !ObjectUtils.anyNotNull(queryUsersListNew.getData())) throw new BizException("内部接口调用失败");
UserInfoNew userInfoNew = queryUsersListNew.getData(); UserInfoResp userInfoNew = queryUsersListNew.getData();
if (StringUtils.isNotBlank(userId) && !StringUtils.equals(userIdMyself, userId)) { //查询别人的个人主页 if (StringUtils.isNotBlank(userId) && !StringUtils.equals(userIdMyself, userId)) { //查询别人的个人主页
// 关注 按钮的显示逻辑 // 关注 按钮的显示逻辑
...@@ -105,28 +96,28 @@ public class HomePageManager { ...@@ -105,28 +96,28 @@ public class HomePageManager {
// 机构账号 // 机构账号
userInfoNew.setPersonalCenterType(PersonalCenterTypeEnum.ORG.getCode()); userInfoNew.setPersonalCenterType(PersonalCenterTypeEnum.ORG.getCode());
if (FundCompanyTypeEnum.PUBLIC.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 公募 if (FundCompanyTypeEnum.PUBLIC.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 公募
//设置 基金数 // 设置 基金数
MfAdvisorscalerank mfAdvisorscalerank = mfAdvisorscalerankMapper.selectOne(new LambdaQueryWrapper<MfAdvisorscalerank>() CommonResp<FundCompanySimpleVO> companyFundCount = feignClientForPublicFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
.eq(MfAdvisorscalerank::getInvestadvisorcode, userInfoNew.getUserInfoNewOrg().getBelongOrgId()) userInfoNew.setFundNumber(companyFundCount.isSuccess() ? companyFundCount.getData().getFundCount() : 0);
.last("limit 1")); // 设置成立时间 和 备案编号(公募没有备案编号)
userInfoNew.setFundNumber(ObjectUtils.anyNotNull(mfAdvisorscalerank) ? mfAdvisorscalerank.getTotalfundn() : 0); CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignClientForPublicFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
//设置成立时间 和 备案编号(公募没有备案编号) if (fundCompanyInfoSimple.isSuccess()) {
MfInvestadvisoroutline mfInvestadvisoroutline = mfInvestadvisoroutlineMapper.selectOne(new LambdaQueryWrapper<MfInvestadvisoroutline>() FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
.eq(MfInvestadvisoroutline::getInvestadvisorcode, userInfoNew.getUserInfoNewOrg().getBelongOrgId()) userInfoNew.setFounded(data.getEstablishDate());
.last("limit 1")); userInfoNew.setRecordNumber(data.getRegisterNumber());
userInfoNew.setFounded(ObjectUtils.anyNotNull(mfInvestadvisoroutline) ? mfInvestadvisoroutline.getEstablishmentdate().getTime() : null); }
} }
if (FundCompanyTypeEnum.PRIVATE.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 私募 if (FundCompanyTypeEnum.PRIVATE.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 私募
//设置 基金数 // 设置成立时间 和 备案编号
Integer integer = fundInfoMapper.selectCount(new LambdaQueryWrapper<FundInfo>().eq(FundInfo::getTrustId, userInfoNew.getUserInfoNewOrg().getBelongOrgId())); CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignClientForFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
userInfoNew.setFundNumber(integer); if (fundCompanyInfoSimple.isSuccess()) {
FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
//设置成立时间 和 备案编号 userInfoNew.setFounded(data.getEstablishDate());
CompanyInfo companyInfo = companyInfoMapper.selectById(userInfoNew.getUserInfoNewOrg().getBelongOrgId()); userInfoNew.setRecordNumber(data.getRegisterNumber());
if (ObjectUtils.anyNotNull(companyInfo)) {
userInfoNew.setFounded(companyInfo.getEstablishDate().getTime());
userInfoNew.setRecordNumber(companyInfo.getRegisterNumber());
} }
// 设置 基金数
CommonResp<FundCompanySimpleVO> companyFundCount = feignClientForFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
userInfoNew.setFundNumber(companyFundCount.isSuccess() ? companyFundCount.getData().getFundCount() : 0);
} }
//设置团队成员 //设置团队成员
CommonResp<List<UserInfoOrg>> usetInfoByOrgUserId = feignClientForFatools.getUsetInfoByOrgUserId(userId); CommonResp<List<UserInfoOrg>> usetInfoByOrgUserId = feignClientForFatools.getUsetInfoByOrgUserId(userId);
...@@ -162,7 +153,7 @@ public class HomePageManager { ...@@ -162,7 +153,7 @@ public class HomePageManager {
} }
private void getFansNUmAndFollowNum(UserInfoNew userInfoNew) { private void getFansNUmAndFollowNum(UserInfoResp userInfoNew) {
Integer fansNumber = followRelMapper.selectCount(new LambdaQueryWrapper<FollowRelEntity>().eq(FollowRelEntity::getFollowUserId, userInfoNew.getUserId()) Integer fansNumber = followRelMapper.selectCount(new LambdaQueryWrapper<FollowRelEntity>().eq(FollowRelEntity::getFollowUserId, userInfoNew.getUserId())
.eq(FollowRelEntity::getDeleteTag, BizStatus.DeleteTag.tag_init)); .eq(FollowRelEntity::getDeleteTag, BizStatus.DeleteTag.tag_init));
Integer followNumber = followRelMapper.selectCount(new LambdaQueryWrapper<FollowRelEntity>().eq(FollowRelEntity::getFollowerId, userInfoNew.getUserId()) Integer followNumber = followRelMapper.selectCount(new LambdaQueryWrapper<FollowRelEntity>().eq(FollowRelEntity::getFollowerId, userInfoNew.getUserId())
...@@ -185,7 +176,7 @@ public class HomePageManager { ...@@ -185,7 +176,7 @@ public class HomePageManager {
followRelService.queryFansByIdolId(req.getUserId()) : followRelService.queryFansByFollowerId(req.getUserId()); followRelService.queryFansByIdolId(req.getUserId()) : followRelService.queryFansByFollowerId(req.getUserId());
List<FollowQo> followQos = new ArrayList<>(); List<FollowQo> followQos = new ArrayList<>();
if (!CollectionUtils.isEmpty(userIds)) { if (!CollectionUtils.isEmpty(userIds)) {
List<UserInfoNew> userInfoNews = feignClientForFatools.queryUserListNew(userIds); List<UserInfoResp> userInfoNews = feignClientForFatools.queryUserListNew(userIds);
List<FollowQo> collect = userInfoNews.stream().map(ConvertUtil::userInfoNew2FollowQo).collect(Collectors.toList()); List<FollowQo> collect = userInfoNews.stream().map(ConvertUtil::userInfoNew2FollowQo).collect(Collectors.toList());
followQos = judgeFollowed(collect, userId); followQos = judgeFollowed(collect, userId);
} }
......
community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java
View file @ d1ba9594
...@@ -13,7 +13,7 @@ import com.tanpu.community.api.beans.req.theme.*; ...@@ -13,7 +13,7 @@ import com.tanpu.community.api.beans.req.theme.*;
import com.tanpu.community.api.beans.resp.CreateThemeResp; import com.tanpu.community.api.beans.resp.CreateThemeResp;
import com.tanpu.community.api.beans.resp.ThemeFullSearchResp; import com.tanpu.community.api.beans.resp.ThemeFullSearchResp;
import com.tanpu.community.api.beans.resp.ThemeListResp; import com.tanpu.community.api.beans.resp.ThemeListResp;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.enums.*; import com.tanpu.community.api.enums.*;
import com.tanpu.community.cache.RedisCache; import com.tanpu.community.cache.RedisCache;
import com.tanpu.community.dao.entity.community.*; import com.tanpu.community.dao.entity.community.*;
...@@ -480,8 +480,8 @@ public class ThemeManager { ...@@ -480,8 +480,8 @@ public class ThemeManager {
//评论列表 //评论列表
List<CommentEntity> commentEntities = commentService.queryCommentsByUserId(req.getUserId(), req.getLastId(), req.getPageSize()); List<CommentEntity> commentEntities = commentService.queryCommentsByUserId(req.getUserId(), req.getLastId(), req.getPageSize());
//当前用户信息 //当前用户信息
UserInfoNew userInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, req.getUserId()), UserInfoResp userInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, req.getUserId()),
60 * 10, () -> this.getUserInfo(req.getUserId()), UserInfoNew.class); 60 * 10, () -> this.getUserInfo(req.getUserId()), UserInfoResp.class);
Set<String> replyThemeIds = commentEntities.stream().map(CommentEntity::getThemeId).collect(Collectors.toSet()); Set<String> replyThemeIds = commentEntities.stream().map(CommentEntity::getThemeId).collect(Collectors.toSet());
if (CollectionUtils.isEmpty(replyThemeIds)) { if (CollectionUtils.isEmpty(replyThemeIds)) {
return commentThemeList; return commentThemeList;
...@@ -530,8 +530,8 @@ public class ThemeManager { ...@@ -530,8 +530,8 @@ public class ThemeManager {
} }
private UserInfoNew getUserInfo(String authorId) { private UserInfoResp getUserInfo(String authorId) {
CommonResp<UserInfoNew> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId); CommonResp<UserInfoResp> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId);
if (userInfoNewCommonResp.isNotSuccess()) { if (userInfoNewCommonResp.isNotSuccess()) {
throw new BizException("内部接口调用失败"); throw new BizException("内部接口调用失败");
} }
......
community-service/src/main/java/com/tanpu/community/service/BatchFeignCallService.java
View file @ d1ba9594
...@@ -11,7 +11,7 @@ import com.tanpu.community.api.beans.qo.ThemeQo; ...@@ -11,7 +11,7 @@ import com.tanpu.community.api.beans.qo.ThemeQo;
import com.tanpu.community.api.beans.vo.ImagesDTO; import com.tanpu.community.api.beans.vo.ImagesDTO;
import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp; import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp; import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp; import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp;
import com.tanpu.community.api.beans.vo.feign.product.ProductInfoVO; import com.tanpu.community.api.beans.vo.feign.product.ProductInfoVO;
import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp; import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
...@@ -97,7 +97,7 @@ public class BatchFeignCallService { ...@@ -97,7 +97,7 @@ public class BatchFeignCallService {
// 话题标题 // 话题标题
Map<String, String> topicMap = Maps.newHashMap(); Map<String, String> topicMap = Maps.newHashMap();
// 图片信息 // 图片信息
Map<String, UserInfoNew> userMap = Maps.newHashMap(); Map<String, UserInfoResp> userMap = Maps.newHashMap();
// 批量查询资源信息 // 批量查询资源信息
this.getResInfo(shortVideoMap, curriculumMap, courseMap, zhiboMap, fundMap, imgMap, topicMap, userMap, themeQos); this.getResInfo(shortVideoMap, curriculumMap, courseMap, zhiboMap, fundMap, imgMap, topicMap, userMap, themeQos);
//逐个装入 //逐个装入
...@@ -121,7 +121,7 @@ public class BatchFeignCallService { ...@@ -121,7 +121,7 @@ public class BatchFeignCallService {
Map<String, FundInfoBaseResp> fundMap, Map<String, FundInfoBaseResp> fundMap,
Map<String, FileRecordEntity> imgMap, Map<String, FileRecordEntity> imgMap,
Map<String, String> topicMap, Map<String, String> topicMap,
Map<String, UserInfoNew> userMap, Map<String, UserInfoResp> userMap,
List<ThemeQo> themeQos List<ThemeQo> themeQos
) { ) {
// 白名单基金id // 白名单基金id
...@@ -242,10 +242,10 @@ public class BatchFeignCallService { ...@@ -242,10 +242,10 @@ public class BatchFeignCallService {
} }
if (!CollectionUtils.isEmpty(userIds)) { if (!CollectionUtils.isEmpty(userIds)) {
// 查询用户信息 // 查询用户信息
List<UserInfoNew> queryUsersListNew = feignClientForFatools.queryUserListNew(setToList(userIds)); List<UserInfoResp> queryUsersListNew = feignClientForFatools.queryUserListNew(setToList(userIds));
if (!CollectionUtils.isEmpty(userIds)) { if (!CollectionUtils.isEmpty(userIds)) {
userMap.putAll(queryUsersListNew.stream().collect(Collectors userMap.putAll(queryUsersListNew.stream().collect(Collectors
.toMap(UserInfoNew::getUserId, o -> o))); .toMap(UserInfoResp::getUserId, o -> o)));
} }
} }
...@@ -373,7 +373,7 @@ public class BatchFeignCallService { ...@@ -373,7 +373,7 @@ public class BatchFeignCallService {
Map<String, ZhiboListResp> zhiboMap, Map<String, ZhiboListResp> zhiboMap,
Map<String, FundInfoBaseResp> fundMap, Map<String, FundInfoBaseResp> fundMap,
Map<String, FileRecordEntity> imgUrlMap, Map<String, FileRecordEntity> imgUrlMap,
Map<String, UserInfoNew> userMap, Map<String, UserInfoResp> userMap,
Map<String, String> topicMap) { Map<String, String> topicMap) {
for (ThemeQo themeQo : themeQos) { for (ThemeQo themeQo : themeQos) {
if (!StringUtils.isEmpty(themeQo.getTopicId()) && topicMap.containsKey(themeQo.getTopicId())) { if (!StringUtils.isEmpty(themeQo.getTopicId()) && topicMap.containsKey(themeQo.getTopicId())) {
...@@ -382,7 +382,7 @@ public class BatchFeignCallService { ...@@ -382,7 +382,7 @@ public class BatchFeignCallService {
} }
if (!StringUtils.isEmpty(themeQo.getAuthorId()) && userMap.containsKey(themeQo.getAuthorId())) { if (!StringUtils.isEmpty(themeQo.getAuthorId()) && userMap.containsKey(themeQo.getAuthorId())) {
//用户信息 //用户信息
UserInfoNew userInfo = userMap.get(themeQo.getAuthorId()); UserInfoResp userInfo = userMap.get(themeQo.getAuthorId());
//昵称头像简介 //昵称头像简介
themeQo.setNickName(userInfo.getNickName()); themeQo.setNickName(userInfo.getNickName());
themeQo.setUserImg(userInfo.getHeadImageUrl()); themeQo.setUserImg(userInfo.getHeadImageUrl());
......
community-service/src/main/java/com/tanpu/community/service/FeignService.java
View file @ d1ba9594
...@@ -2,7 +2,7 @@ package com.tanpu.community.service; ...@@ -2,7 +2,7 @@ package com.tanpu.community.service;
import com.tanpu.common.api.CommonResp; import com.tanpu.common.api.CommonResp;
import com.tanpu.common.exception.BizException; import com.tanpu.common.exception.BizException;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.feign.fatools.FeignClientForFatools; import com.tanpu.community.feign.fatools.FeignClientForFatools;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -13,8 +13,8 @@ public class FeignService { ...@@ -13,8 +13,8 @@ public class FeignService {
@Autowired @Autowired
private FeignClientForFatools fatools; private FeignClientForFatools fatools;
public UserInfoNew getUserInfoById(String userId) { public UserInfoResp getUserInfoById(String userId) {
CommonResp<UserInfoNew> userInfoNewCommonResp = fatools.queryUsersListNew(userId); CommonResp<UserInfoResp> userInfoNewCommonResp = fatools.queryUsersListNew(userId);
if (userInfoNewCommonResp.isNotSuccess()) { if (userInfoNewCommonResp.isNotSuccess()) {
throw new BizException("内部接口调用失败"); throw new BizException("内部接口调用失败");
} }
......
community-service/src/main/java/com/tanpu/community/service/RankService.java
View file @ d1ba9594
...@@ -2,7 +2,7 @@ package com.tanpu.community.service; ...@@ -2,7 +2,7 @@ package com.tanpu.community.service;
import com.tanpu.community.api.beans.qo.ThemeAnalysDO; import com.tanpu.community.api.beans.qo.ThemeAnalysDO;
import com.tanpu.community.api.beans.qo.TopicRankQo; import com.tanpu.community.api.beans.qo.TopicRankQo;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.enums.CollectionTypeEnum; import com.tanpu.community.api.enums.CollectionTypeEnum;
import com.tanpu.community.api.enums.TopicStatusEnum; import com.tanpu.community.api.enums.TopicStatusEnum;
import com.tanpu.community.api.enums.VisitTypeEnum; import com.tanpu.community.api.enums.VisitTypeEnum;
...@@ -78,8 +78,8 @@ public class RankService { ...@@ -78,8 +78,8 @@ public class RankService {
theme.setViewCount(visitCountMap.getOrDefault(themeId,0)); theme.setViewCount(visitCountMap.getOrDefault(themeId,0));
//查询用户质量 //查询用户质量
String authorId = theme.getAuthorId(); String authorId = theme.getAuthorId();
UserInfoNew authorInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, authorId), UserInfoResp authorInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, authorId),
60 * 10, () -> feignService.getUserInfoById(authorId), UserInfoNew.class); 60 * 10, () -> feignService.getUserInfoById(authorId), UserInfoResp.class);
if (authorInfo == null || authorInfo.getLevelGrade() == null) { if (authorInfo == null || authorInfo.getLevelGrade() == null) {
theme.setUserWeight(0.0); theme.setUserWeight(0.0);
} else { } else {
......
community-service/src/main/java/com/tanpu/community/util/ConvertUtil.java
View file @ d1ba9594
...@@ -8,7 +8,7 @@ import com.tanpu.community.api.beans.req.theme.ThemeContentReq; ...@@ -8,7 +8,7 @@ import com.tanpu.community.api.beans.req.theme.ThemeContentReq;
import com.tanpu.community.api.beans.resp.FileUploadResp; import com.tanpu.community.api.beans.resp.FileUploadResp;
import com.tanpu.community.api.beans.vo.ImagesDTO; import com.tanpu.community.api.beans.vo.ImagesDTO;
import com.tanpu.community.api.beans.vo.KafkaDurationUptMsg; import com.tanpu.community.api.beans.vo.KafkaDurationUptMsg;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
import com.tanpu.community.api.enums.DeleteTagEnum; import com.tanpu.community.api.enums.DeleteTagEnum;
import com.tanpu.community.api.enums.RelTypeEnum; import com.tanpu.community.api.enums.RelTypeEnum;
import com.tanpu.community.api.enums.TopicStatusEnum; import com.tanpu.community.api.enums.TopicStatusEnum;
...@@ -183,7 +183,7 @@ public class ConvertUtil { ...@@ -183,7 +183,7 @@ public class ConvertUtil {
} }
public static FollowQo userInfoNew2FollowQo(UserInfoNew entity) { public static FollowQo userInfoNew2FollowQo(UserInfoResp entity) {
if (entity == null) { if (entity == null) {
return null; return null;
} }
......
community-service/src/main/resources/application-dev.yml
View file @ d1ba9594
...@@ -29,22 +29,6 @@ spring.datasource: ...@@ -29,22 +29,6 @@ spring.datasource:
maxActive: 2 maxActive: 2
minIdle: 2 minIdle: 2
initialSize: 2 initialSize: 2
jydb:
driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://47.101.189.151:31931/jydb?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
username: dev
password: qimeng123
maxActive: 2
minIdle: 2
initialSize: 2
fund:
driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://47.101.189.151:31931/tamp_fund?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
username: dev
password: qimeng123
maxActive: 2
minIdle: 2
initialSize: 2
spring.redis: spring.redis:
host: 118.190.63.109 host: 118.190.63.109
......
community-service/src/main/resources/application-test.yml
View file @ d1ba9594
...@@ -28,22 +28,6 @@ spring.datasource: ...@@ -28,22 +28,6 @@ spring.datasource:
maxActive: 2 maxActive: 2
minIdle: 2 minIdle: 2
initialSize: 2 initialSize: 2
jydb:
driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmk.mysql.rds.aliyuncs.com:3306/tamp_jydb?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: tamp_admin
password: '@imeng123'
maxActive: 2
minIdle: 2
initialSize: 2
fund:
driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmk.mysql.rds.aliyuncs.com:3306/tamp_fund?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: tamp_admin
password: '@imeng123'
maxActive: 2
minIdle: 2
initialSize: 2
spring.redis: spring.redis:
host: 118.190.63.109 host: 118.190.63.109
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment