fix(gd): 修复线索事件查询中的SQL语法错误

linwei

yesterday 08ddfad4530a014094c06fe68b8c2d9a0753403a

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java

@@ -16,7 +16,10 @@
 */
package org.sxkj.fw.device.service.impl;

import org.springframework.beans.factory.annotation.Autowired;
import org.sxkj.fw.device.dto.FwDeviceTrackDTO;
import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.vo.FwDeviceTrackVO;
import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
import org.sxkj.fw.device.mapper.FwDeviceTrackMapper;
@@ -25,6 +28,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;

import java.util.List;

/**
@@ -36,19 +40,32 @@
@Service
public class FwDeviceTrackServiceImpl extends BaseServiceImpl<FwDeviceTrackMapper, FwDeviceTrackEntity> implements IFwDeviceTrackService {

   @Autowired
   private IFwDeviceService fwDeviceService;

   @Override
   public IPage<FwDeviceTrackVO> selectFwDeviceTrackPage(IPage<FwDeviceTrackVO> page, FwDeviceTrackVO fwDeviceTrack) {
   public IPage<FwDeviceTrackEntity> selectFwDeviceTrackPage(IPage<FwDeviceTrackEntity> page, FwDeviceTrackDTO fwDeviceTrack) {
      // 分页查询直接透传到 Mapper
      return page.setRecords(baseMapper.selectFwDeviceTrackPage(page, fwDeviceTrack));
   }


   @Override
   public List<FwDeviceTrackExcel> exportFwDeviceTrack(Wrapper<FwDeviceTrackEntity> queryWrapper) {
      // 导出不做额外转换，保持与导出字段一致
      List<FwDeviceTrackExcel> fwDeviceTrackList = baseMapper.exportFwDeviceTrack(queryWrapper);
      //fwDeviceTrackList.forEach(fwDeviceTrack -> {
      // fwDeviceTrackList.forEach(fwDeviceTrack -> {
      //   fwDeviceTrack.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwDeviceTrack.getType()));
      //});
      return fwDeviceTrackList;
   }

   @Override
   public boolean saveOrUpdateFwDeviceTrack(FwDeviceTrackEntity fwDeviceTrackEntity) {
      boolean b = saveOrUpdate(fwDeviceTrackEntity);
      if (b) {
         return fwDeviceService.updateTrackStatusByDeviceId(fwDeviceTrackEntity.getDeviceId(), 1, fwDeviceTrackEntity.getOutTarget(),fwDeviceTrackEntity.getOutTargetCode());
      }
      return false;
   }
}