From c09ce992101f0c9eaae165389a7638566ac566a9 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 19 六月 2023 22:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
index 9099705..5b4dd55 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
@@ -1,12 +1,23 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.constant.RespCodeEnum;
+import com.ld.igds.file.CoreFileService;
import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.DtoPatrol;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.mapper.Phone35Mapper;
+import com.ld.igds.phone35.param.Phone35PatrolCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import com.ld.igds.util.FfmpegUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 宸℃洿鐓х墖鏌ョ湅
@@ -15,6 +26,12 @@
*/
@Service
public class Phone35ServiceImpl5603 implements Phone35Service {
+
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+ @Autowired
+ private CoreFileService fileService;
+
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5603;
@@ -22,6 +39,23 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
- return null;
+ //杞寲瀵硅薄
+ Phone35PatrolCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35PatrolCommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getId())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ param.setCompanyId(phone35AuthUser.getCompanyId());
+ List<DtoPatrol> list = phone35Mapper.getPatrol(param);
+ DtoPatrol patrol = list.get(0);
+ if (StringUtils.isNotEmpty(patrol.getImgName())) {
+ String bathPath = fileService.getInoutFilePath(patrol.getCreateTime());
+ String imgData = FfmpegUtil.getImgStr(bathPath + patrol.getImgName());
+ patrol.setBase64Img(imgData);
+ }
+ return PhoneRespUtil.success(patrol, req);
}
}
--
Gitblit v1.9.3