[add] 绿波诱导历史图片参数优化

signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/InduceSendController.java

@@ -2,18 +2,17 @@ package net.wanji.opt.controller.induce;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import freemarker.template.TemplateException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.Constants;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.common.utils.tool.DateUtil;
+import net.wanji.opt.dto.induce.MessageParam;
 import net.wanji.opt.entity.GreenwaveInduces;
 import net.wanji.opt.entity.GreenwaveInducesHist;
 import net.wanji.opt.entity.InduceHist;
 import net.wanji.opt.entity.InduceTemplate;
-import net.wanji.opt.dto.induce.MessageParam;
 import net.wanji.opt.service.induce.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.ws.rs.core.MediaType;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -158,12 +157,15 @@ public class InduceSendController {
 
     @ApiOperation(value = "根据设备编号和发布时间获取诱导发布图片", notes = "根据设备编号和发布时间获取诱导发布图片")
     @GetMapping(value = "/fileCodeHist")
-    public ResponseEntity<byte[]> ftpFileByCodeAndTime(@RequestParam("equipCode") String equipCode, @RequestParam("date") Date date) {
+    public ResponseEntity<byte[]> ftpFileByCodeAndTime(@RequestParam("equipCode") String equipCode, @RequestParam("date") String date) {
         LambdaQueryWrapper<InduceHist> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(InduceHist::getEquipCode, equipCode);
-        queryWrapper.le(InduceHist::getCreateTime, date);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date curDate = new Date();
+        String curDateStr = format.format(curDate);
+        String dateTime = curDateStr.concat(" ").concat(date);
+        queryWrapper.eq(InduceHist::getCreateTime, dateTime);
         queryWrapper.orderByDesc(InduceHist::getCreateTime);
-        queryWrapper.last("limit 1");
         InduceHist pictureFile = this.induceHistService.getOne(queryWrapper,false);
         if (Objects.isNull(pictureFile) || pictureFile.getFilePath() == null) {
             return ResponseEntity.status(HttpStatus.OK)