Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-19 c09ce992101f0c9eaae165389a7638566ac566a9

 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);
    }
}