lidongdong
2023-11-21 89ec607ed61fb3fd4b49d6b11106b3b6b44d9031
增加   新双争双评定时任务 模块
1个文件已添加
16个文件已修改
222 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemUnitTaskApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightIntegratingTaskApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemUnitTaskDAO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemUnitTaskService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightIntegratingTaskService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemUnitTaskServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemUnitTaskMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NewFightHandler.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -490,4 +490,39 @@
                                @RequestParam(value = "communityId") String communityId);
    /**
     *  每日定时清空  定时任务
     */
    @GetMapping("/IntegratingTask/everydaYtruncateData")
    public R truncateData();
    /**
     * 新双争双评需求问题清单  任务认领  开始  结束  定时任务
     * @return
     */
    @GetMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
    public R timedNewFightNeedProblemInventoryHandler();
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java
@@ -65,4 +65,11 @@
        return R.ok(inventoryService.expurgateData(id));
    }
    @GetMapping("/timedNewFightNeedProblemInventoryHandler")
    public R timedNewFightNeedProblemInventoryHandler()
    {
        return inventoryService.timedNewFightNeedProblemInventoryHandler();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemUnitTaskApi.java
@@ -48,5 +48,4 @@
        return R.ok(taskService.expurgateData(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightIntegratingTaskApi.java
@@ -74,4 +74,14 @@
    }
    /**
     *  每日定时清空
     */
    @GetMapping("/everydaYtruncateData")
    public R truncateData()
    {
        return taskService.truncateData();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java
@@ -43,4 +43,7 @@
    int getJionNum(@Param("taskId") String taskId,
                   @Param("userId") String userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO;
import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +44,7 @@
    int expurgateData(@Param("id") String id);
    List<NeedProblemInventoryDTO> getTimeList();
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemUnitTaskDAO.java
@@ -8,6 +8,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党员双争双评排序
@@ -30,4 +32,7 @@
    int expurgateData(@Param("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
import com.panzhihua.common.model.vos.R;
import org.apache.ibatis.annotations.Param;
@@ -31,4 +32,8 @@
    int getJionNum(String taskId,String userId);
    int needClaimSignIn(String taskId,String userId,String type);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO;
import com.panzhihua.common.model.vos.R;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -38,4 +39,7 @@
    int expurgateData(String id);
    R timedNewFightNeedProblemInventoryHandler();
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemUnitTaskService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
import com.panzhihua.common.model.vos.R;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightIntegratingTaskService.java
@@ -1,11 +1,8 @@
package com.panzhihua.service_dangjian.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO;
import com.panzhihua.service_dangjian.entity.IntegratingTask;
import org.apache.ibatis.annotations.Param;
import java.util.List;
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiExperienceActivityVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.NeedProblemInventoryDAO;
import com.panzhihua.service_dangjian.dao.NewStriveForDAO;
@@ -66,4 +68,65 @@
    public int expurgateData(String id) {
        return baseMapper.expurgateData(id);
    }
    @Override
    public R timedNewFightNeedProblemInventoryHandler() {
        //        定时任务
        List<NeedProblemInventoryDTO> list = baseMapper.getTimeList();
        for (NeedProblemInventoryDTO item : list) {
            //当前时间
            long newTime = System.currentTimeMillis();
            //活动报名时间
            long applyStartTime = item.getClaimStartTime().getTime();
            //报名结束时间
            long applyEndTime = item.getClaimEndTime().getTime();
            //活动开始时间
            long activityStartTime = item.getNeedStartTime().getTime();
            //活动结束时间
            long activityEndTime = item.getNeedEndTime().getTime();
            switch (item.getStatus()) {
                //待开始
                case "1":
                    if (newTime >= applyStartTime && newTime <= applyEndTime) {
                        NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
                        vo.setId(item.getId());
                        vo.setStatus("1");
                        baseMapper.editData(vo);
                    }
                    if (newTime > applyEndTime && newTime < activityStartTime) {
                        //报名结束
                        NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
                        vo.setId(item.getId());
                        vo.setStatus("2");
                        baseMapper.editData(vo);
                    }
                    break;
                //报名中
                case "2":
                    if (newTime >= activityStartTime && newTime <= activityEndTime) {
                        NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
                        vo.setId(item.getId());
                        vo.setStatus("2");
                        baseMapper.editData(vo);
                    }
                    break;
                //已开始
                case "3":
                    if (newTime <= activityEndTime) {
                        NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
                        vo.setId(item.getId());
                        vo.setStatus("3");
                        baseMapper.editData(vo);
                    }
                    break;
            }
        }
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemUnitTaskServiceImpl.java
@@ -3,13 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
import com.panzhihua.service_dangjian.dao.NeedProblemInventoryDAO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiExperienceActivityVO;
import com.panzhihua.service_dangjian.dao.NeedProblemUnitTaskDAO;
import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
import com.panzhihua.service_dangjian.service.NeedProblemUnitTaskService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -53,4 +54,5 @@
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml
@@ -235,5 +235,9 @@
        </where>
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml
@@ -416,5 +416,22 @@
<!--    </foreach>-->
    <select id="getTimeList" resultType="com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO">
        SELECT
        nfpi.id,
        nfpi.claim_start_time,
        nfpi.claim_end_time,
        nfpi.need_start_time,
        nfpi.need_end_time,
        nfpi.status
        FROM new_fight_need_problem_inventory as nfpi
        where nfpi.status in (1,2)
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemUnitTaskMapper.xml
@@ -155,6 +155,5 @@
        delete from new_fight_need_problem_unit_task where id=#{id}
    </delete>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NewFightHandler.java
New file
@@ -0,0 +1,51 @@
package com.panzhihua.timejob.jobhandler;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
 * 金汇社区任务定时器
 * @author lyq
 */
@Slf4j
@Component
public class NewFightHandler {
    @Resource
    private NewStriveForFeign communityService;
    //定时任务  清空每日
    @XxlJob("timedNewStriveIntegratingTaskHandler")
    public ReturnT<String> timedNewStriveIntegratingTaskHandler(String param) throws Exception
    {
        log.info("定时任务 每天检测一次  清空每日签到  积分任务记录");
        R r = communityService.truncateData();
        log.info("执行结果【{}】", r.toString());
        return ReturnT.SUCCESS;
    }
    //定时任务  新双争双评需求问题清单  任务认领  开始  结束  定时任务
    @XxlJob("timedNewFightNeedProblemInventoryHandler")
    public ReturnT<String> timedNewFightNeedProblemInventoryHandler(String param) throws Exception
    {
        log.info("定时任务 新双争双评需求问题清单  任务认领  开始  结束");
        R r = communityService.timedNewFightNeedProblemInventoryHandler();
        log.info("执行结果【{}】", r.toString());
        return ReturnT.SUCCESS;
    }
}