fix: 查询参数增加通道

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java

@@ -63,6 +63,7 @@ public class TerminalExtController extends BaseController {
     @ApiOperation("查询附带图片统计")
     public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithPhoto(Integer dyId, Integer lineId, Integer towerId,
                                                                                     @NotNull(message = "start不能为空!") Long start, @NotNull(message = "end不能为空!") Long end,
+                                                                                    Integer channelId,
                                                                                     Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
@@ -70,7 +71,7 @@ public class TerminalExtController extends BaseController {
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
-                PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), start, end);
+                PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end);
                 terminal.setPhotoInfo(photoInfo);
             }
         }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -795,11 +795,14 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     }
 
     @Override
-    public PhotoDayModel getDayModel(Integer termid, Long start, Long end) {
+    public PhotoDayModel getDayModel(Integer termid, Integer channelId, Long start, Long end) {
         TerminalPhotoExample example = new TerminalPhotoExample();
         TerminalPhotoExample.Criteria criteria = example.createCriteria();
         criteria.andTermIdEqualTo(termid);
         criteria.andPhotoTimeBetween(start, end);
+        if (channelId != null){
+            criteria.andChannelIdEqualTo(channelId);
+        }
         example.setOrderByClause("photo_time desc");
         List<TerminalPhoto> list = terminalPhotoDao.selectByExample(example);
 

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java

@@ -109,5 +109,5 @@ public interface TerminalPhotoService {
 
     ServiceBody<String> uploadPhoto(MultipartFile file, Integer termid, String cmdid, Integer channel, BigInteger phototime) throws IOException;
 
-    PhotoDayModel getDayModel(Integer termid, Long start, Long end);
+    PhotoDayModel getDayModel(Integer termid, Integer channelId, Long start, Long end);
 }