代码优化

linwe

2024-07-17 36fe71cc6f93197aec868fd57e39e7dc63aef367

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

@@ -16,25 +16,35 @@
 */
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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
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;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.eCallEventTwo.dto.EcOrderDTO;
import org.springblade.modules.eCallEventTwo.dto.EcOrderParamDTO;
import org.springblade.modules.eCallEventTwo.entity.ECallEventTwoEntity;
import org.springblade.modules.eCallEventTwo.service.EcOrderService;
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.eCallEventTwo.service.IECallEventTwoService;
import org.springblade.core.boot.ctrl.BladeController;
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.math.BigDecimal;
import java.util.List;
import java.util.Map;

/**
 * 工单 控制器
@@ -49,6 +59,8 @@
public class ECallEventTwoController extends BladeController {

   private final IECallEventTwoService eCallEventTwoService;

   private final EcOrderService ecOrderService;

   /**
    * 工单 详情
@@ -88,8 +100,9 @@
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入eCallEventTwo")
   public R save(@Valid @RequestBody ECallEventTwoEntity eCallEventTwo) {
      return R.status(eCallEventTwoService.save(eCallEventTwo));
   public R save(@Valid @RequestBody ECallEventTwoVO eCallEventTwo) {
      eCallEventTwo.setCreateUserId(AuthUtil.getUserId());
      return R.status(eCallEventTwoService.saveTwo(eCallEventTwo));
   }

   /**
@@ -108,8 +121,8 @@
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入eCallEventTwo")
   public R submit(@Valid @RequestBody ECallEventTwoEntity eCallEventTwo) {
      return R.status(eCallEventTwoService.saveOrUpdate(eCallEventTwo));
   public R submit(@Valid @RequestBody ECallEventTwoVO eCallEventTwo) {
      return R.status(eCallEventTwoService.saveTwo(eCallEventTwo));
   }

   /**
@@ -123,4 +136,72 @@
   }


   /**
    * 工单 同步
    */
   @GetMapping("/synchronizeData")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "工单 同步")
   public R synchronizeData() {
      // 创建居住证发送短信定时任务
      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.format(DateUtil.DATETIME_FORMATTER));
      // ecOrderParamDTO.setStartTime(yesterdayStart.format(DateUtil.DATETIME_FORMATTER));
      boolean b = ecOrderService.SynchronizeData(ecOrderParamDTO);
      return R.status(b);
   }


   /**
    * 工单 同步
    */
   @GetMapping("/getCount")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "工单统计")
   public R getCount( EcOrderParamDTO ecOrderParamDTO, Query query) {
      IPage<EcOrderDTO> pages = ecOrderService.getCount(Condition.getPage(query),ecOrderParamDTO);
      return  R.data(pages);
   }


   /**
    * 工单 同步
    */
   @GetMapping("/getUnitAssessmentIndicators")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "单位考核指标")
   public R getUnitAssessmentIndicators( ) {
      List<Map<String, String>> count = ecOrderService.getUnitAssessmentIndicators();
      return R.data(count);
   }

   @GetMapping("/synchronousData")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "信息同步")
   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) {
         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);
      }
   }

}