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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java

@@ -17,11 +17,13 @@
package org.springblade.modules.eCallEventTwo.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -35,12 +37,12 @@
import org.springblade.modules.eCallEventTwo.service.IECallEventTwoService;
import org.springblade.modules.eCallEventTwo.vo.ECallEventTwoVO;
import org.springblade.modules.eCallEventTwo.wrapper.ECallEventTwoWrapper;
import org.springblade.modules.task.entity.ECallEventEntity;
import org.springblade.modules.task.service.IECallEventService;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

@@ -145,12 +147,12 @@
      EcOrderParamDTO ecOrderParamDTO = new EcOrderParamDTO();
      // 获取当前日期时间
      // LocalDateTime now = LocalDateTime.now();
      // // 获取前一天的开始时间
      // 获取前一天的开始时间
      // LocalDateTime yesterdayStart = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MIN);
      // // 获取前一天的结束时间
      // 获取前一天的结束时间
      // LocalDateTime yesterdayEnd = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MAX);
      // ecOrderParamDTO.setEndTime(yesterdayEnd);
      // ecOrderParamDTO.setStartTime(yesterdayStart);
      // ecOrderParamDTO.setEndTime(yesterdayEnd.format(DateUtil.DATETIME_FORMATTER));
      // ecOrderParamDTO.setStartTime(yesterdayStart.format(DateUtil.DATETIME_FORMATTER));
      boolean b = ecOrderService.SynchronizeData(ecOrderParamDTO);
      return R.status(b);
   }
@@ -179,5 +181,32 @@
      return R.data(count);
   }

   @GetMapping("/synchronousData")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "E呼基本信息入录同步到新E呼即办")
   public void synchronousData() {
      IECallEventService bean = SpringUtils.getBean(IECallEventService.class);
      List<ECallEventEntity> list = bean.list(Wrappers.<ECallEventEntity>lambdaQuery().eq(ECallEventEntity::getIsDeleted, 0));
      for (ECallEventEntity eCallEventEntity : list) {
         long count = eCallEventTwoService.count(Wrappers.<ECallEventTwoEntity>lambdaQuery()
            .eq(ECallEventTwoEntity::getOrderId, eCallEventEntity.getId()));
         if (count > 0) {
            continue;
         }
         ECallEventTwoEntity eCallEventTwoEntity = new ECallEventTwoEntity();
         eCallEventTwoEntity.setLocation(eCallEventEntity.getLocation());
         eCallEventTwoEntity.setSceneGeoLat(new BigDecimal(eCallEventEntity.getLat()));
         eCallEventTwoEntity.setSceneGeoLng(new BigDecimal(eCallEventEntity.getLng()));
         eCallEventTwoEntity.setIssueContent(eCallEventEntity.getRemark());
         eCallEventTwoEntity.setIssueTitle(eCallEventEntity.getName());
         eCallEventTwoEntity.setApplicantPhone(eCallEventEntity.getPhone());
         eCallEventTwoEntity.setApplicantName(eCallEventEntity.getRealName());
         eCallEventTwoEntity.setCreateTime(eCallEventEntity.getCreateTime());
         eCallEventTwoEntity.setStatus("3");
         eCallEventTwoEntity.setIssueOrigin("0");
         eCallEventTwoEntity.setOrderId(eCallEventEntity.getId());
         eCallEventTwoService.save(eCallEventTwoEntity);
      }
   }

}