Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -1,7 +1,15 @@
package com.panzhihua.service_grid.service.impl;

import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import java.util.*;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,22 +38,10 @@
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toCollection;

import javax.annotation.Resource;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -54,7 +50,8 @@
 */
@Slf4j
@Service
public class EventVisitingTasksServiceImpl extends ServiceImpl<EventVisitingTasksMapper, EventVisitingTasksDO> implements EventVisitingTasksService {
public class EventVisitingTasksServiceImpl extends ServiceImpl<EventVisitingTasksMapper, EventVisitingTasksDO>
    implements EventVisitingTasksService {

    @Resource
    private EventVisitingTasksMapper eventVisitingTasksMapper;
@@ -89,6 +86,7 @@

    /**
     * 修改重点人群走访记录
     * 
     * @param eventVisitingTasksEditDTO
     * @return 维护结果
     */
@@ -104,6 +102,7 @@

    /**
     * 分页查找重点人群走访记录
     * 
     * @param pageEventVisitingTasksDTO
     * @return 维护结果
     */
@@ -131,7 +130,8 @@
    /**
     * 查询重点人群走访记录详细信息
     *
     * @param id 重点人群走访记录 id
     * @param id
     *            重点人群走访记录 id
     * @return 查找结果
     */
    public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id){
@@ -139,9 +139,12 @@
        if(eventVisitingTasksDO!=null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
            eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
            eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));
            eventVisitingTasksDetailsVO
                .setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1));
            eventVisitingTasksDetailsVO
                .setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2));
            eventVisitingTasksDetailsVO
                .setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3));
            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();
@@ -161,10 +164,12 @@
    @Override
    public R taskList(EventTasksQuery query) throws Exception{

        IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
        IPage<EventVisitingTasksVO> page =
            eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
        for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){
            if(eventVisitingTasksVO.getNationCode() != null){
                eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
                eventVisitingTasksVO
                    .setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
            }
        }
        return R.ok(page);
@@ -173,10 +178,12 @@
    @Override
    public R appTaskList(EventTasksQuery query) throws Exception{

        IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
        IPage<EventVisitingTasksVO> page =
            eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
        for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){
            if(eventVisitingTasksVO.getNationCode() != null){
                eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
                eventVisitingTasksVO
                    .setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
            }
        }
        return R.ok(page);
@@ -212,9 +219,12 @@

    @Override
    public R visitorList(EventVisitListQuery query) {
        IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
        IPage<EventVisitListVO> page =
            eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(), query.getPageSize()), query);
        page.getRecords().stream().forEach(e->{
            List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id").last("limit 0,1"));
            List<EventVisitingTasksDO> list =
                eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id", e.getId())
                    .orderByDesc("id").last("limit 0,1"));
            if(!CollectionUtils.isEmpty(list)){
                e.setCreateAt(list.get(0).getCreateAt());
                e.setEventStatus(list.get(0).getEventStatus());
@@ -225,7 +235,8 @@

    @Override
    public R list(EventTasksQuery query) {
        IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(),query.getPageSize()),query);
        IPage<AppVisitTasksVO> page =
            eventVisitingTasksMapper.list(new Page(query.getPageNum(), query.getPageSize()), query);
        return R.ok(page);
    }

@@ -236,19 +247,25 @@
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
                eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
                eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
                eventVisitingTasksDetailsVO
                    .setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
                eventVisitingTasksDetailsVO
                    .setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
            }
            JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
            eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
            eventVisitingTasksDetailsVO
                .setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
            if(jsonObject != null && jsonObject.get("check") != null){
                eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
            }

            //查询资源文件
            eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
            eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
            eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));
            eventVisitingTasksDetailsVO
                .setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1));
            eventVisitingTasksDetailsVO
                .setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2));
            eventVisitingTasksDetailsVO
                .setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3));
            eventVisitingTasksDetailsVO.setHappentAddress(eventVisitingTasksDO.getAddress());
            return R.ok(eventVisitingTasksDetailsVO);
        }
@@ -283,7 +300,8 @@

    @Override
    public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception {
        IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
        IPage<EventVisitingTasksVO> page =
            eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
        return page.getRecords();
    }

@@ -298,8 +316,6 @@
        if(count > 0){
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        }



        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
        visitingTasksDO.setGridId(gridId);
@@ -319,7 +335,8 @@
        visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
        visitingTasksDO.setVisiterTele(map.get("phone") == null ?null:map.get("phone").toString());
        StringBuilder sb = new StringBuilder();
        sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor")).append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
        sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor"))
            .append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
        visitingTasksDO.setVisiterAddress(sb.toString());
        visitingTasksDO.setVisiterType(0);
        visitingTasksDO.setActOpara(0);
@@ -332,7 +349,8 @@
        visitingTasksDO.setUrgent(false);
        visitingTasksDO.setUrgentDell(false);
        visitingTasksDO.setCreateBy(userId);
        visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null?null:Integer.valueOf(map.get("out_or_local").toString()));
        visitingTasksDO.setOutOrLocal(
            map.get("out_or_local") == null ? null : Integer.valueOf(map.get("out_or_local").toString()));

        if(map.get("label") != null){
            List<String> option = getOption(map.get("label").toString());
@@ -381,7 +399,8 @@
    public R cancel(IdDTO idDTO) {

        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
        if (eventVisitingTasksDO == null
            || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
            return R.fail("当前状态不可撤销");
        }
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),5);
@@ -399,7 +418,8 @@
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5){
            return R.fail("当前状态不可恢复");
        }
        int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
        int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),
            EventTasksStatusEnum.DZF.getCode());
        if(rt > 0){
            return R.ok();
        }
@@ -410,7 +430,8 @@
    @Override
    public synchronized R start(Long id,Long userId) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
        if (eventVisitingTasksDO == null
            || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
            return R.fail("当前状态不可开始走访");
        }
        Map<String,Object> map = eventVisitingTasksMapper.findUserById(userId);
@@ -433,7 +454,8 @@
    @Override
    public R complete(EventVisitCompleteDTO taskCompleteDTO) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId());
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
        if (eventVisitingTasksDO == null
            || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
            return R.fail("当前状态不可完成走访");
        }

@@ -490,7 +512,6 @@
        return R.fail();
    }


    private void createResource(Long id, Long dellUserId, int classification, int type, EventResourceDTO resourceDTO) {
        EventResourceDO eventResourceDO = new EventResourceDO();
        eventResourceDO.setRefId(id);
@@ -505,11 +526,8 @@
    @Override
    public List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() {
        List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList =new ArrayList<>();
        List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper.selectList(
                new QueryWrapper<EventVisitingTasksDO>()
                        .eq("lc_upload", false)
                        .eq("event_status",2)
        );
        List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper
            .selectList(new QueryWrapper<EventVisitingTasksDO>().eq("lc_upload", false).eq("event_status", 2));
        lcEventVisitingTasksList= CopyUtil.beanCopyList(eventVisitingTasksList,LcEventVisitingTasksListDTO.class);
        lcEventVisitingTasksList.forEach(visitingTasks -> {
            addVisitingTasksFile(visitingTasks);
@@ -521,9 +539,7 @@
        //查询事件关联附件
        List<EventResourceDO> eventResourceDOList =
                eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                        .eq(EventResourceDO::getClassification, 2)
                        .eq(EventResourceDO::getRefId, visitingTasks.getId())
                );
                .eq(EventResourceDO::getClassification, 2).eq(EventResourceDO::getRefId, visitingTasks.getId()));
        List<EventResourceVO> picList = new ArrayList<>();
        List<EventResourceVO> audioList = new ArrayList<>();
        List<EventResourceVO> videoList = new ArrayList<>();