add : 吉安支持查询待验收的接口

linwei

6 days ago 4abab2cad20762720989747d9b0c4f250d9a6b6e

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java

@@ -19,8 +19,11 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.gd.workorder.entity.GdClueEventEntity;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.excel.GdClueEventExcel;
@@ -29,7 +32,10 @@
import org.sxkj.gd.workorder.param.GdClueEventRejectParam;
import org.sxkj.gd.workorder.service.IGdClueEventService;
import org.sxkj.gd.workorder.service.IGdTaskResultService;
import org.sxkj.gd.workorder.vo.GdClueEventCountVO;
import org.sxkj.gd.workorder.vo.GdClueEventListVO;
import org.sxkj.gd.workorder.vo.GdClueEventVO;
import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -43,6 +49,7 @@
 * @author lw
 * @since 2026-01-14
 */
@Slf4j
@Service
@AllArgsConstructor
public class GdClueEventServiceImpl extends BaseServiceImpl<GdClueEventMapper, GdClueEventEntity> implements IGdClueEventService {
@@ -52,6 +59,51 @@
   @Override
   public IPage<GdClueEventVO> selectGdClueEventPage(IPage<GdClueEventVO> page, GdClueEventVO gdClueEvent) {
      return page.setRecords(baseMapper.selectGdClueEventPage(page, gdClueEvent));
   }

   @Override
   public IPage<GdClueEventVO> selectGdClueEventList(IPage<GdClueEventVO> page, Wrapper<GdClueEventEntity> queryWrapper) {
      return page.setRecords(baseMapper.selectGdClueEventList(page, queryWrapper));
   }

   @Override
   public List<GdClueEventListVO> listGdClueEventByDept(Integer onlyMine, String keyword) {
      Long deptId = Long.valueOf(AuthUtil.getDeptId());
      Long userId = AuthUtil.getUserId();
      Integer mine = onlyMine == null ? 0 : onlyMine;
      return baseMapper.selectGdClueEventSimpleList(deptId, userId, mine, keyword);
   }

   @Override
   public GdClueEventVO getGdClueEventDetail(Long id) {
      if (id == null) {
         throw new RuntimeException("事件ID不能为空");
      }
      Long deptId = Long.valueOf(AuthUtil.getDeptId());
      GdClueEventVO detail = baseMapper.selectGdClueEventDetailById(id, deptId);
      if (detail == null) {
         throw new RuntimeException("事件不存在");
      }
      String address = GdGeoAddressUtil.getFormattedAddress(detail.getLongitude(), detail.getLatitude());
      log.info("地址：{}", address);
      if (StringUtil.isNotBlank(address)) {
         detail.setEventLocation(address);
      }
      return detail;
   }

   @Override
   public GdClueEventCountVO getGdClueEventCount(String keyword) {
      Long deptId = Long.valueOf(AuthUtil.getDeptId());
      Long userId = AuthUtil.getUserId();
      GdClueEventCountVO countVO = baseMapper.selectGdClueEventCount(deptId, userId, keyword);
      if (countVO == null) {
         GdClueEventCountVO empty = new GdClueEventCountVO();
         empty.setTotalCount(0L);
         empty.setMyCount(0L);
         return empty;
      }
      return countVO;
   }

   @Override
@@ -72,6 +124,9 @@
      clueEvent.setLongitude(distributeParam.getLongitude());
      clueEvent.setLatitude(distributeParam.getLatitude());
      clueEvent.setEventStatus(1);
      String times = OrderNumUtils.initOrderNum(WordOrderConstant.EVENT_NUM_KEY);
      String eventNum = WordOrderConstant.EVENT_NUM_PREFIX + times;
      clueEvent.setEventNum(eventNum);
      if (StringUtil.isBlank(distributeParam.getAreaCode())) {
         clueEvent.setAreaCode(taskResult.getAreaCode());
      } else {
@@ -80,13 +135,14 @@
      clueEvent.setCreateUser(AuthUtil.getUserId());
      clueEvent.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
      clueEvent.setCreateTime(new Date());
      clueEvent.setEventName(distributeParam.getEventName());
      if (!save(clueEvent)) {
         throw new RuntimeException("事件分发失败");
      }
      taskResult.setDistributeStatus(1);
      taskResult.setUpdateUser(AuthUtil.getUserId());
      taskResult.setUpdateTime(new Date());
      if (!gdTaskResultService.updateById(taskResult)) {
      if (!gdTaskResultService.updateTaskResultById(taskResult)) {
         throw new RuntimeException("成果状态更新失败");
      }
      return true;
@@ -94,28 +150,34 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean rejectClueEvent(GdClueEventRejectParam rejectParam) {
   public boolean handleClueEvent(GdClueEventRejectParam rejectParam) {
      GdClueEventEntity clueEvent = getById(rejectParam.getEventId());
      if (clueEvent == null || (clueEvent.getIsDeleted() != null && clueEvent.getIsDeleted() != 0)) {
         throw new RuntimeException("事件不存在");
      }
      if (clueEvent.getEventStatus() == null || clueEvent.getEventStatus() != 1) {
         throw new RuntimeException("事件当前状态无法驳回");
         throw new RuntimeException("事件当前状态无法处理");
      }
      clueEvent.setEventStatus(2);
      Integer operateStatus = rejectParam.getEventStatus();
      if (operateStatus == null || (operateStatus != 0 && operateStatus != 1)) {
         throw new RuntimeException("事件状态不正确");
      }
      int targetStatus = operateStatus == 0 ? 2 : 3;
      clueEvent.setEventStatus(targetStatus);
      clueEvent.setUpdateUser(AuthUtil.getUserId());
      clueEvent.setUpdateTime(new Date());
      if (!updateById(clueEvent)) {
         throw new RuntimeException("事件驳回失败");
         throw new RuntimeException("事件处理失败");
      }
      GdTaskResultEntity taskResult = gdTaskResultService.getById(clueEvent.getResultId());
      if (taskResult == null || (taskResult.getIsDeleted() != null && taskResult.getIsDeleted() != 0)) {
         throw new RuntimeException("成果不存在");
      }
      taskResult.setDistributeStatus(2);
      // 使用XML方式更新成果信息（更新所有字段）
      taskResult.setDistributeStatus(targetStatus);
      taskResult.setUpdateUser(AuthUtil.getUserId());
      taskResult.setUpdateTime(new Date());
      if (!gdTaskResultService.updateById(taskResult)) {
      if (!gdTaskResultService.updateTaskResultById(taskResult)) {
         throw new RuntimeException("成果状态更新失败");
      }
      return true;
@@ -130,4 +192,29 @@
      return gdClueEventList;
   }

   /**
    * 对外接口新增或修改事件
    * <p>
    * 步骤：
    * 1. 生成事件编号（使用SJ前缀）
    * 2. 设置事件编号到实体
    * 3. 保存或更新事件信息
    * </p>
    *
    * @param gdClueEvent 事件实体
    * @return 是否操作成功
    */
   @Override
   public boolean saveOrUpdateExternal(GdClueEventEntity gdClueEvent) {
      // 1. 生成事件编号
      String times = OrderNumUtils.initOrderNum(WordOrderConstant.EVENT_NUM_KEY);
      String eventNum = WordOrderConstant.SJ_EVENT_NUM_PREFIX + times;
      // 2. 设置事件编号
      gdClueEvent.setEventNum(eventNum);
      gdClueEvent.setCreateTime(new Date());
      gdClueEvent.setEventStatus(1);
      // 3. 保存或更新
      return saveOrUpdate(gdClueEvent);
   }

}