重新生成曲线图

src/main/java/com/zfxftech/telmarket/common/constant/AdminConstant.java

@@ -134,7 +134,9 @@ public interface AdminConstant {
         PREMIUM("Premium",1, "私人定制")
         , FOLLOW_UP("FollowUp",2, "跟投账户")
         , ASSET_TYPE("AssetType",3, "资管")
-        , SMART_TYPE("SmartType",4, "智能跟投");
+        , SMART_TYPE("SmartType",4, "智能跟投")
+        , SURVEY_TYPE("SurveyType",5, "项目调研")
+        , HIGH_TYPE("HighType",6, "高端定制");
 
         private final String code;
 

src/main/java/com/zfxftech/telmarket/common/constant/RedisKeyMessageConstant.java

@@ -40,4 +40,6 @@ public class RedisKeyMessageConstant {
     public static final String REDIS_SEND_CM_KEY="CM:redisId:code:key";
     public static final String SendCustomerReportForms="ZG:CR:KEY:SCMF";
     public static final String SendPersonalCustomerReportForms="ZG:CR:KEY:PERSONAL";
+    public static final String RedisUpdateGraphKey="BLG:graph:type:KEY";
+
 }

src/main/java/com/zfxftech/telmarket/common/pojo/dao/UpdateWriteOffChangeLog.java

+package com.zfxftech.telmarket.common.pojo.dao;
+
+import lombok.Data;
+
+@Data
+public class UpdateWriteOffChangeLog {
+
+
+    /**
+     * 产品类型 Premium--私人定制 AssetType--资管 SmartType--智能跟投
+     */
+    private String type;
+    /**
+     *示范盘id
+     */
+    private String marketId;
+
+}

src/main/java/com/zfxftech/telmarket/common/pojo/dao/survey/SurveyMarketProfitLog.java

+package com.zfxftech.telmarket.common.pojo.dao.survey;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description TODO
+ * @Author Dell
+ * @Date 2021/11/27 15:20
+ *
+ */
+@Data
+@TableName(value = "survey_market_profit_log")
+public class SurveyMarketProfitLog {
+    /**
+     * 唯一标记
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 示范盘Id
+     */
+    private Long marketId;
+    /**
+     * 本金
+     */
+    private BigDecimal principal;
+    /**
+     * 总收益
+     */
+    private BigDecimal profit;
+    /**
+     * 较上一日增量收益
+     */
+    private BigDecimal incrementProfit;
+    /**
+     * 收益率
+     */
+    private BigDecimal profitRate;
+    /**
+     * 日期
+     */
+    private Date date;
+    /**
+     * 删除标记
+     */
+    @TableLogic
+    @TableField(value = "is_deleted")
+    private String isDeleted;
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+
+}

src/main/java/com/zfxftech/telmarket/mapper/business/survey/SurveyMarketProfitLogMapper.java

+package com.zfxftech.telmarket.mapper.business.survey;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zfxftech.telmarket.common.pojo.dao.survey.SurveyMarketProfitLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SurveyMarketProfitLogMapper extends BaseMapper<SurveyMarketProfitLog> {
+
+}

src/main/java/com/zfxftech/telmarket/service/business/high/HighMarketProfitLogService.java

+package com.zfxftech.telmarket.service.business.high;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zfxftech.telmarket.common.pojo.dao.high.HighMarketProfitLog;
+
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author Dell
+ * @Date 2021/11/19 9:44
+ */
+public interface HighMarketProfitLogService extends IService<HighMarketProfitLog> {
+
+
+}

src/main/java/com/zfxftech/telmarket/service/business/survey/SurveyAccountProductRelationService.java

@@ -8,4 +8,5 @@ import com.zfxftech.telmarket.common.pojo.dao.survey.SurveyAccountProductRelatio
 public interface SurveyAccountProductRelationService extends IService<SurveyAccountProductRelation> {
 
 
+    SurveyAccountProductRelation queryAccountProductRelationByMarketInfo(Long maketId, String code);
 }

src/main/java/com/zfxftech/telmarket/service/business/survey/SurveyMarketProfitLogService.java

+package com.zfxftech.telmarket.service.business.survey;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zfxftech.telmarket.common.pojo.dao.survey.SurveyMarketProfitLog;
+
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author Dell
+ * @Date 2021/11/19 9:44
+ */
+public interface SurveyMarketProfitLogService extends IService<SurveyMarketProfitLog> {
+
+}

src/main/java/com/zfxftech/telmarket/service/impl/business/high/HighMarketProfitLogServiceImpl.java

+package com.zfxftech.telmarket.service.impl.business.high;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zfxftech.telmarket.common.pojo.dao.high.HighMarketProfitLog;
+import com.zfxftech.telmarket.mapper.business.high.HighMarketProfitLogMapper;
+import com.zfxftech.telmarket.service.business.high.HighMarketProfitLogService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description TODO
+ * @Author Dell
+ * @Date 2021/11/19 9:47
+ */
+@Service
+@Log4j2
+public class HighMarketProfitLogServiceImpl extends ServiceImpl<HighMarketProfitLogMapper, HighMarketProfitLog> implements HighMarketProfitLogService {
+
+
+}
+

src/main/java/com/zfxftech/telmarket/service/impl/business/survey/SurveyAccountProductRelationServiceImpl.java

 package com.zfxftech.telmarket.service.impl.business.survey;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zfxftech.telmarket.common.pojo.dao.survey.SurveyAccountProductRelation;
 import com.zfxftech.telmarket.mapper.business.survey.SurveyAccountProductRelationMapper;
 import com.zfxftech.telmarket.service.business.survey.SurveyAccountProductRelationService;
 import org.springframework.stereotype.Service;
 
+import static com.zfxftech.telmarket.common.constant.AdminConstant.MarketTypeEnum.REAL;
+import static com.zfxftech.telmarket.common.constant.AdminConstant.MarketTypeEnum.SIMULATED;
+
 @Service
 public class SurveyAccountProductRelationServiceImpl  extends ServiceImpl<SurveyAccountProductRelationMapper, SurveyAccountProductRelation> implements SurveyAccountProductRelationService {
 
+
+
+
+
+    @Override
+    public SurveyAccountProductRelation queryAccountProductRelationByMarketInfo(Long marketId, String type) {
+        QueryWrapper<SurveyAccountProductRelation> queryWrapper = new QueryWrapper();
+        if (REAL.getCode().equals(type)) {
+            queryWrapper.eq("real_market_id", marketId);
+        }
+        if (SIMULATED.getCode().equals(type)) {
+            queryWrapper.eq("simulated_market_id", marketId);
+        }
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/zfxftech/telmarket/service/impl/business/survey/SurveyMarketProfitLogServiceImpl.java

+package com.zfxftech.telmarket.service.impl.business.survey;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zfxftech.telmarket.common.pojo.dao.survey.SurveyMarketProfitLog;
+import com.zfxftech.telmarket.mapper.business.survey.SurveyMarketProfitLogMapper;
+import com.zfxftech.telmarket.service.business.survey.SurveyMarketProfitLogService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description TODO
+ * @Author Dell
+ * @Date 2021/11/19 9:47
+ */
+@Service
+@Log4j2
+public class SurveyMarketProfitLogServiceImpl extends ServiceImpl<SurveyMarketProfitLogMapper, SurveyMarketProfitLog> implements SurveyMarketProfitLogService {
+
+
+
+}
+