添加人群包时 增加[关注日期]范围 选择框

src/main/java/com/yaoyaozw/customer/controller/CrowdPackageController.java

@@ -4,8 +4,8 @@ import com.github.pagehelper.PageInfo;
 import com.yaoyaozw.customer.annotations.OperateLog;
 import com.yaoyaozw.customer.common.BaseResult;
 import com.yaoyaozw.customer.common.GenericsResult;
-import com.yaoyaozw.customer.dto.crowd.CrowdPackageQueryDTO;
 import com.yaoyaozw.customer.dto.crowd.CrowdPackageConditionDTO;
+import com.yaoyaozw.customer.dto.crowd.CrowdPackageQueryDTO;
 import com.yaoyaozw.customer.service.CrowdPackageService;
 import com.yaoyaozw.customer.vo.crowd.*;
 import io.swagger.annotations.Api;
@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -37,8 +36,10 @@ public class CrowdPackageController {
                                                                      @RequestParam(required = false) Double activeTimeMin,
                                                                      @RequestParam(required = false) Double activeTimeMax,
                                                                      @RequestParam(required = false) Integer followTimeMin,
-                                                                     @RequestParam(required = false) Integer followTimeMax) {
-        return crowdPackageService.insertCrowdPackage(id, name, activeTimeMin, activeTimeMax, followTimeMin, followTimeMax);
+                                                                     @RequestParam(required = false) Integer followTimeMax,
+                                                                     @RequestParam(required = false) String followDateStart,
+                                                                     @RequestParam(required = false) String followDateEnd) {
+        return crowdPackageService.insertCrowdPackage(id, name, activeTimeMin, activeTimeMax, followTimeMin, followTimeMax, followDateStart, followDateEnd);
     }
 
     @ApiOperation("向人群包内新增条件")
@@ -53,6 +54,7 @@ public class CrowdPackageController {
     public GenericsResult<PageInfo<CrowdPackageListVO>> pageList(@RequestBody CrowdPackageQueryDTO queryDto) {
         return crowdPackageService.pageList(queryDto);
     }
+
     @ApiOperation("查询所有人群包")
     @PostMapping("/allPackage")
     public GenericsResult<List<CrowdPackageListVO>> getAllPackage(@RequestBody CrowdPackageQueryDTO queryDto) {
@@ -100,5 +102,4 @@ public class CrowdPackageController {
     }
 
 
-
 }

src/main/java/com/yaoyaozw/customer/entity/CrowdPackage.java

@@ -60,6 +60,18 @@ public class CrowdPackage implements Serializable {
     private Integer followTimeMax;
 
     /**
+     * 关注时间-开始
+     */
+    @TableField("follow_date_start")
+    private Date followDateStart;
+
+    /**
+     * 关注时间-结束
+     */
+    @TableField("follow_date_end")
+    private Date followDateEnd;
+
+    /**
      * 人群包用户人数
      */
     @TableField("crowd_num")
@@ -97,11 +109,14 @@ public class CrowdPackage implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public CrowdPackage(Long id, String packageName, Double activeTimeMin, Double activeTimeMax, Integer followTimeMin, Integer followTimeMax) {
+    public CrowdPackage(Long id, String packageName, Double activeTimeMin, Double activeTimeMax, Integer followTimeMin, Integer followTimeMax, Date followDateStart, Date followDateEnd) {
         this.id = id;
         this.packageName = packageName;
         this.followTimeMin = followTimeMin == null || followTimeMin == 0 ? null : followTimeMin;
         this.followTimeMax = followTimeMax == null || followTimeMax == 0 ? null : followTimeMax;
+        this.followDateStart = followDateStart;
+        this.followDateEnd = followDateEnd;
+
 
         if (ObjectUtil.isNotNull(activeTimeMin)) {
             Double v = activeTimeMin * CrowdPackageCommonConstant.HOUR_TO_MILLION_RATE;

src/main/java/com/yaoyaozw/customer/service/CrowdPackageService.java

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.yaoyaozw.customer.common.BaseResult;
 import com.yaoyaozw.customer.common.GenericsResult;
-import com.yaoyaozw.customer.dto.crowd.CrowdPackageQueryDTO;
 import com.yaoyaozw.customer.dto.crowd.CrowdPackageConditionDTO;
+import com.yaoyaozw.customer.dto.crowd.CrowdPackageQueryDTO;
 import com.yaoyaozw.customer.entity.CrowdPackage;
 import com.yaoyaozw.customer.vo.crowd.*;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -28,7 +27,7 @@ public interface CrowdPackageService extends IService<CrowdPackage> {
      * @param followTimeMax 关注天数右边界
      * @return {@link BaseResult}
      */
-    GenericsResult<CrowdPackageCommonIdVO> insertCrowdPackage(Long id, String name, Double activeTimeMin, Double activeTimeMax, Integer followTimeMin, Integer followTimeMax);
+    GenericsResult<CrowdPackageCommonIdVO> insertCrowdPackage(Long id, String name, Double activeTimeMin, Double activeTimeMax, Integer followTimeMin, Integer followTimeMax, String followDateStart, String followDateEnd);
 
 
     /**

src/main/java/com/yaoyaozw/customer/service/impl/CrowdPackageServiceImpl.java

@@ -14,8 +14,8 @@ import com.yaoyaozw.customer.components.CustomerServiceCommonAsyncComponent;
 import com.yaoyaozw.customer.components.TokenManager;
 import com.yaoyaozw.customer.constants.CrowdPackageCommonConstant;
 import com.yaoyaozw.customer.constants.CustomerCommonConstant;
-import com.yaoyaozw.customer.dto.crowd.CrowdPackageQueryDTO;
 import com.yaoyaozw.customer.dto.crowd.CrowdPackageConditionDTO;
+import com.yaoyaozw.customer.dto.crowd.CrowdPackageQueryDTO;
 import com.yaoyaozw.customer.entity.CrowdPackage;
 import com.yaoyaozw.customer.entity.CrowdPackageCondition;
 import com.yaoyaozw.customer.entity.CrowdPackageConditionMatch;
@@ -26,8 +26,8 @@ import com.yaoyaozw.customer.mapper.RegisterUserEntityMapper;
 import com.yaoyaozw.customer.service.CrowdPackageConditionMatchService;
 import com.yaoyaozw.customer.service.CrowdPackageConditionService;
 import com.yaoyaozw.customer.service.CrowdPackageService;
-import com.yaoyaozw.customer.vo.kanban.CommonOptionResponseVO;
 import com.yaoyaozw.customer.vo.crowd.*;
+import com.yaoyaozw.customer.vo.kanban.CommonOptionResponseVO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +36,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -66,12 +68,32 @@ public class CrowdPackageServiceImpl extends ServiceImpl<MaterialCrowdPackageMap
 
 
     @Override
-    public GenericsResult<CrowdPackageCommonIdVO> insertCrowdPackage(Long id, String name, Double activeTimeMin, Double activeTimeMax, Integer followTimeMin, Integer followTimeMax) {
+    public GenericsResult<CrowdPackageCommonIdVO> insertCrowdPackage(Long id, String name, Double activeTimeMin, Double activeTimeMax, Integer followTimeMin, Integer followTimeMax, String startFollowDate, String endFollowDate) {
+        // 关注日期 转换
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date followDateStart = null;
+        Date followDateEnd = null;
+        if (!"".equals(startFollowDate) && ObjectUtil.isNotNull(startFollowDate)) {
+            try {
+                followDateStart = simpleDateFormat.parse(startFollowDate);
+            } catch (ParseException e) {
+               log.error("日期转换错误, 错误日期为" + startFollowDate);
+            }
+        }
+        if (!"".equals(endFollowDate) && ObjectUtil.isNotNull(endFollowDate)) {
+            try {
+                followDateEnd = simpleDateFormat.parse(endFollowDate);
+            } catch (ParseException e) {
+                log.error("日期转换错误, 错误日期为" + endFollowDate);
+            }
+        }
         // 根据是否传了主键判断是创建还是更新
         boolean isCreate = ObjectUtil.isNull(id);
         // 获取操作人
         Long userId = tokenManager.getUserIdFromToken();
-        CrowdPackage crowdPackage = new CrowdPackage(id, name, activeTimeMin, activeTimeMax, followTimeMin, followTimeMax);
+        LOCAL_LOG.info("关注日期-开始{}", followDateStart);
+        LOCAL_LOG.info("关注日期-结束{}", followDateEnd);
+        CrowdPackage crowdPackage = new CrowdPackage(id, name, activeTimeMin, activeTimeMax, followTimeMin, followTimeMax, followDateStart, followDateEnd);
         crowdPackage.handleInfo(new Date(), userId, isCreate);
         if (ObjectUtil.isNotNull(name)) {
             // 判断是否有重名
@@ -82,11 +104,14 @@ public class CrowdPackageServiceImpl extends ServiceImpl<MaterialCrowdPackageMap
                 return new GenericsResult<>(false, "人群包名已存在!");
             }
         }
+        LOCAL_LOG.info("crowdPackage={}", crowdPackage);
         // 执行保存
         boolean result = super.saveOrUpdate(crowdPackage);
         if (crowdPackage.getId() != null) {
             // 手写sql更新关注时间（因为mp update方法不更新null值）
             this.baseMapper.updatePackageFollowTime(crowdPackage);
+            // 手写sql更新关注日期 （因为mp update方法不更新null值）
+            this.baseMapper.updatePackageFollowDate(crowdPackage);
         }
 
         // 添加人群包人群的更新
@@ -303,7 +328,7 @@ public class CrowdPackageServiceImpl extends ServiceImpl<MaterialCrowdPackageMap
      * @param match        匹配
      * @param conditionDto 条件dto
      */
-    private void constructOperator(CrowdPackageConditionMatch match, CrowdPackageConditionDTO conditionDto){
+    private void constructOperator(CrowdPackageConditionMatch match, CrowdPackageConditionDTO conditionDto) {
         LOCAL_LOG.info("构造运算表达式");
         CrowdPackageCondition conditionInfo = conditionService.getById(conditionDto.getConditionId());
         if (ObjectUtil.isNull(conditionInfo)) {

src/main/java/com/yaoyaozw/customer/vo/crowd/CrowdPackageDetailVO.java

@@ -11,6 +11,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 /**
@@ -45,6 +46,12 @@ public class CrowdPackageDetailVO implements Serializable {
      */
     private Integer followTimeMax;
 
+    @ApiModelProperty("关注时间-开始")
+    private String followDateStart;
+
+    @ApiModelProperty("关注时间-结束")
+    private String followDateEnd;
+
     @ApiModelProperty("已配置的人群包条件")
     private List<CrowdPackageConditionMatchVO> conditionList;
 
@@ -53,6 +60,20 @@ public class CrowdPackageDetailVO implements Serializable {
         this.packageName = byId.getPackageName();
         this.followTimeMin = byId.getFollowTimeMin();
         this.followTimeMax = byId.getFollowTimeMax();
+        // 定义日期格式化工具
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        // 转换 followDateStart
+        if (byId.getFollowDateStart() != null) {
+            this.followDateStart = dateFormat.format(byId.getFollowDateStart());
+        } else {
+            this.followDateStart = null;
+        }
+        // 转换 followDateEnd
+        if (byId.getFollowDateEnd() != null) {
+            this.followDateEnd = dateFormat.format(byId.getFollowDateEnd());
+        } else {
+            this.followDateEnd = null;
+        }
 
         if (ObjectUtil.isNotNull(byId.getActiveTimeMin())) {
             this.activeTimeMin = byId.getActiveTimeMin().doubleValue() / CrowdPackageCommonConstant.HOUR_TO_MILLION_RATE;