Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-19 c09ce992101f0c9eaae165389a7638566ac566a9

Merge remote-tracking branch 'origin/master'

 igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java

@@ -99,7 +99,12 @@

    public static final String API_PHONE_5604 = "5604";
    public static final String API_PHONE_5605 = "5605";

    /* ======= é—¨ç¦ç®¡ç† ====== */

    public static final String API_PHONE_5606 = "5606";
    public static final String API_PHONE_5607 = "5607";
    public static final String API_PHONE_5608 = "5608";

    /* ======= å·¥å•ç®¡ç† ====== */

@@ -107,6 +112,7 @@
    public static final String API_PHONE_5702 = "5702";
    public static final String API_PHONE_5703 = "5703";
    public static final String API_PHONE_5704 = "5704";
    public static final String API_PHONE_5705 = "5705";

    /* ======= é¢„警管理 ====== */


 igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java

@@ -6,6 +6,8 @@
import java.util.Date;

/**
 * ç”µå­å·¡é€»
 *
 * @Author:YAN
 */
@Data
@@ -17,7 +19,8 @@
    private String latitude;
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    

    private String base64Img;
    private String imgName;

}

 igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java

@@ -2,9 +2,7 @@


import com.ld.igds.phone35.dto.*;
import com.ld.igds.phone35.param.Phone35CommonParam;
import com.ld.igds.phone35.param.Phone35DepotCommonParam;
import com.ld.igds.phone35.param.Phone35WarnCommonParam;
import com.ld.igds.phone35.param.*;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -78,7 +76,14 @@
     * @param param
     * @return
     */
    List<DtoPatrol> getPatrol(@Param("param") Phone35DepotCommonParam param);
    List<DtoPatrol> getPatrol(@Param("param") Phone35PatrolCommonParam param);

    /**
     * ç”µå­æ‰“卡
     *
     * @param param
     */
    void addPatrolRecord(@Param("param") Phone35PatrolCommonParam param);

    /**
     * ç›‘控设备列表
@@ -86,5 +91,5 @@
     * @param param
     * @return
     */
    List<DtoVideo> getCamera(@Param("param") Phone35CommonParam param);
    List<DtoVideo> getCamera(@Param("param") Phone35VideoCommonParam param);
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35PatrolCommonParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ld.igds.phone35.param;

import lombok.Data;

import java.util.Date;

/**
 * ç”µå­å·¡é€»
 *
 * @Author:YAN
 */
@Data
public class Phone35PatrolCommonParam extends Phone35CommonParam {

    private String id;
    private String longitude;
    private String latitude;
    private String imgName;
    private Date createTime;
    private String userName;


    private String dateTime;
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35VideoCommonParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.ld.igds.phone35.param;

import lombok.Data;

/**
 * @Author:YAN
 */
@Data
public class Phone35VideoCommonParam extends Phone35CommonParam {
    private String id;
    private String playType;
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5401.java

@@ -6,12 +6,14 @@
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * è®¾å¤‡æŽ§åˆ¶-设备列表接口实现
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5401 implements Phone35Service {
    @Override
    public String getInterfaceId() {

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5402.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * æ“ä½œè®¾å¤‡
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5402 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5402;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo æ“ä½œè®¾å¤‡
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5403.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * ç©ºè°ƒæŽ§åˆ¶
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5403 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5403;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo ç©ºè°ƒæŽ§åˆ¶
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java

@@ -8,6 +8,7 @@
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.mapper.Phone35Mapper;
import com.ld.igds.phone35.param.Phone35DepotCommonParam;
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;
@@ -38,7 +39,7 @@
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //转化对象
        Phone35DepotCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35DepotCommonParam.class);
        Phone35PatrolCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35PatrolCommonParam.class);
        if (null == param) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java

@@ -1,12 +1,21 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
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.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
 * ç”µå­å·¡æ›´æ‰“卡
@@ -15,6 +24,9 @@
 */
@Service
public class Phone35ServiceImpl5602 implements Phone35Service {
    @Autowired
    private Phone35Mapper phone35Mapper;

    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5602;
@@ -22,6 +34,32 @@

    @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.getDeptId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getLongitude())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getLatitude())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getUserName())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }

        param.setCreateTime(new Date());
        param.setId(ContextUtil.getUUID());
        param.setCompanyId(phone35AuthUser.getCompanyId());
        phone35Mapper.addPatrolRecord(param);
        return PhoneRespUtil.success(null, req);
    }
}

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

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java

@@ -10,6 +10,7 @@
import com.ld.igds.phone35.param.Phone35CommonParam;
import com.ld.igds.phone35.param.Phone35DepotCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.param.Phone35VideoCommonParam;
import com.ld.igds.phone35.service.Phone35Service;
import com.ld.igds.phone35.util.PhoneRespUtil;
import org.apache.commons.lang3.StringUtils;
@@ -37,7 +38,7 @@
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {

        //转化对象
        Phone35CommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35CommonParam.class);
        Phone35VideoCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35VideoCommonParam.class);
        if (null == param) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java

@@ -1,18 +1,31 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.camera.CameraUtil;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.param.Phone35VideoCommonParam;
import com.ld.igds.phone35.service.Phone35Service;
import com.ld.igds.phone35.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.manager.SecManager;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * ç›‘控播放
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5605 implements Phone35Service {
    @Autowired
    private SecManager securityManager;

    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5605;
@@ -20,6 +33,31 @@

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        return null;
        //转化对象
        Phone35VideoCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35VideoCommonParam.class);
        if (null == param) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "系统未配置当前摄像头播放方式，不执行预览");
        }

        SecCameraDto cameraParam = new SecCameraDto();
        cameraParam.setId(param.getId());
        cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
        cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
        SecCameraDto camera = securityManager.getPlayAddr(cameraParam);

        if (camera == null) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "未查询到相关设备！");
        }


        return PhoneRespUtil.success(camera, req);
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5606.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * é—¨ç¦è®¾å¤‡åˆ—表
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5606 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5606;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo é—¨ç¦è®¾å¤‡åˆ—表
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5607.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * é—¨ç¦è®¾å¤‡æ“ä½œ
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5607 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5607;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo é—¨ç¦è®¾å¤‡æ“ä½œ
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5608.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * é—¨ç¦è®°å½•
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5608 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5608;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo -门禁记录
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5701.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * å·¥å•ç”³è¯·
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5701 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5701;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo å·¥å•ç”³è¯·
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * å·¥å•è®°å½•
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5702 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5702;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo å·¥å•è®°å½•
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * å·¥å•å®¡æ ¸åˆ—表
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5703 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5703;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo å·¥å•å®¡æ ¸åˆ—表
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5704.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * å·¥å•å®¡æ ¸
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5704 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5704;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo å·¥å•å®¡æ ¸
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5705.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ld.igds.phone35.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import org.springframework.stereotype.Service;

/**
 * å·¥å•ç±»åž‹
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5705 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5705;
    }

    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //todo å·¥å•ç±»åž‹ æš‚定接口为5705，如有需要改为6101
        return null;
    }
}

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java

@@ -25,6 +25,8 @@
import java.util.List;

/**
 * é¢„警列表
 *
 * @Author:YAN
 */
@Service

 igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml

@@ -103,7 +103,7 @@
        UPDATE_TIME_ AS updateTime
        FROM D_ENERGY
        <where>
            <if test="param.companyId != null">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.startTime != null and param.endTime != null">AND UPDATE_TIME_ between #{param.startTime}
                and
                #{param.endTime}
@@ -121,7 +121,7 @@
        UPDATE_TIME_ AS updateTime
        FROM D_ENERGY
        <where>
            <if test="param.companyId != null">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.depotId != null and param.depotId != ''">AND DEPOT_ID_ = #{param.depotId}</if>
            <if test="param.startTime != null">AND
                UPDATE_TIME_ <![CDATA[ > ]]>#{param.startTime,jdbcType=TIMESTAMP}
@@ -138,17 +138,38 @@
        USER_NAME_ AS userName,
        LONGITUDE_ As longitude,
        LATITUDE_ AS latitude,
        IMG_NAME_ AS base64Img,
        IMG_NAME_ AS imgName,
        CREATE_TIME_ AS createTime
        FROM D_SEC_PATROL_RECORD
        <where>
            <if test="param.companyId != null and companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.id != null and param.id != ''">AND ID_ = #{param.id}</if>
            <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.deptId != null and param.deptId != ''">AND DEPT_ID_ = #{param.deptId}</if>
            <if test="param.startTime != null and param.endTime != null">AND CREATE_TIME_ between #{param.startTime}
                and #{param.endTime}
            </if>
        </where>
    </select>

    <insert id="addPatrolRecord">
        INSERT INTO D_SEC_PATROL_RECORD
        (ID_,
         COMPANY_ID_,
         DEPT_ID_,
         USER_NAME_,
         CREATE_TIME_,
         LONGITUDE_,
         LATITUDE_,
         IMG_NAME_)
        VALUES (#{param.id},
                #{param.companyId},
                #{param.deptId},
                #{param.userName},
                #{param.createTime},
                #{param.longitude},
                #{param.latitude},
                #{param.imgName})
    </insert>
    <!--    ç›‘控设备列表-->
    <select id="getCamera" resultType="com.ld.igds.phone35.dto.DtoVideo">


 igds-web/pom.xml

@@ -119,6 +119,12 @@
            <version>${igds.version}</version>
        </dependency>

        <!-- APP -可选-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-api-phone</artifactId>
            <version>${igds.version}</version>
        </dependency>
        <!-- å…¶ä»–通用品牌协议 -->
        <dependency>
            <groupId>com.ld.igds</groupId>
@@ -214,54 +220,54 @@
            </plugin>

            <!-- YUI Compressor Maven压缩插件 å¼€å‘包不实用-->
<!--            <plugin>-->
<!--                <groupId>net.alchim31.maven</groupId>-->
<!--                <artifactId>yuicompressor-maven-plugin</artifactId>-->
<!--                <version>1.5.1</version>-->
<!--                <executions>-->
<!--                    <execution>-->
<!--                        <goals>-->
<!--                            <goal>compress</goal>-->
<!--                        </goals>-->
<!--                    </execution>-->
<!--                </executions>-->
<!--                <configuration>-->
<!--                    <encoding>UTF-8</encoding>-->
<!--                    &lt;!&ndash;不显示js可能的错误 &ndash;&gt;-->
<!--                    <jswarn>false</jswarn>-->
<!--                    &lt;!&ndash;是否混淆 &ndash;&gt;-->
<!--                    <nomunge>true</nomunge>-->
<!--                    &lt;!&ndash;若存在已压缩的文件，会先对比源文件是否有改动 æœ‰æ”¹åŠ¨ä¾¿åŽ‹ç¼©ï¼Œæ— æ”¹åŠ¨å°±ä¸åŽ‹ç¼© &ndash;&gt;-->
<!--                    <force>false</force>-->
<!--                    &lt;!&ndash;在指定的列号后插入新行 &ndash;&gt;-->
<!--                    <linebreakpos>-1</linebreakpos>-->
<!--                    &lt;!&ndash;压缩之前先执行聚合文件操作 &ndash;&gt;-->
<!--                    <preProcessAggregates>true</preProcessAggregates>-->
<!--                    &lt;!&ndash;压缩后保存文件后缀 æ— åŽç¼€ &ndash;&gt;-->
<!--                    <nosuffix>true</nosuffix>-->
<!--                    &lt;!&ndash;源目录，即需压缩的根目录 &ndash;&gt;-->
<!--                    <sourceDirectory>src/main/resources</sourceDirectory>-->
<!--                    &lt;!&ndash;输出目录，即压缩后的目录 &ndash;&gt;-->
<!--                    <outputDirectory>target/classes</outputDirectory>-->
<!--                    <force>true</force>-->
<!--                    &lt;!&ndash;压缩js和css文件 &ndash;&gt;-->
<!--                    <includes>-->
<!--                        <include>**/*.js</include>-->
<!--                        <include>**/*.css</include>-->
<!--                    </includes>-->
<!--                    &lt;!&ndash; ä»¥ä¸‹ç›®å½•å’Œæ–‡ä»¶ä¸ä¼šè¢«åŽ‹ç¼© &ndash;&gt;-->
<!--                    <excludes>-->
<!--                        <exclude>**/*.min.js</exclude>-->
<!--                        <exclude>**/*.min.css</exclude>-->
<!--                        <exclude>**/d7/**</exclude>-->
<!--                        <exclude>**/dorado-home/**</exclude>-->
<!--                        <exclude>**/bdf2/**</exclude>-->
<!--                        <exclude>**/css/**</exclude>-->
<!--                        <exclude>**/js/**</exclude>-->
<!--                        <exclude>**/plugins/**</exclude>-->
<!--                    </excludes>-->
<!--                </configuration>-->
<!--            </plugin>-->
            <!--            <plugin>-->
            <!--                <groupId>net.alchim31.maven</groupId>-->
            <!--                <artifactId>yuicompressor-maven-plugin</artifactId>-->
            <!--                <version>1.5.1</version>-->
            <!--                <executions>-->
            <!--                    <execution>-->
            <!--                        <goals>-->
            <!--                            <goal>compress</goal>-->
            <!--                        </goals>-->
            <!--                    </execution>-->
            <!--                </executions>-->
            <!--                <configuration>-->
            <!--                    <encoding>UTF-8</encoding>-->
            <!--                    &lt;!&ndash;不显示js可能的错误 &ndash;&gt;-->
            <!--                    <jswarn>false</jswarn>-->
            <!--                    &lt;!&ndash;是否混淆 &ndash;&gt;-->
            <!--                    <nomunge>true</nomunge>-->
            <!--                    &lt;!&ndash;若存在已压缩的文件，会先对比源文件是否有改动 æœ‰æ”¹åŠ¨ä¾¿åŽ‹ç¼©ï¼Œæ— æ”¹åŠ¨å°±ä¸åŽ‹ç¼© &ndash;&gt;-->
            <!--                    <force>false</force>-->
            <!--                    &lt;!&ndash;在指定的列号后插入新行 &ndash;&gt;-->
            <!--                    <linebreakpos>-1</linebreakpos>-->
            <!--                    &lt;!&ndash;压缩之前先执行聚合文件操作 &ndash;&gt;-->
            <!--                    <preProcessAggregates>true</preProcessAggregates>-->
            <!--                    &lt;!&ndash;压缩后保存文件后缀 æ— åŽç¼€ &ndash;&gt;-->
            <!--                    <nosuffix>true</nosuffix>-->
            <!--                    &lt;!&ndash;源目录，即需压缩的根目录 &ndash;&gt;-->
            <!--                    <sourceDirectory>src/main/resources</sourceDirectory>-->
            <!--                    &lt;!&ndash;输出目录，即压缩后的目录 &ndash;&gt;-->
            <!--                    <outputDirectory>target/classes</outputDirectory>-->
            <!--                    <force>true</force>-->
            <!--                    &lt;!&ndash;压缩js和css文件 &ndash;&gt;-->
            <!--                    <includes>-->
            <!--                        <include>**/*.js</include>-->
            <!--                        <include>**/*.css</include>-->
            <!--                    </includes>-->
            <!--                    &lt;!&ndash; ä»¥ä¸‹ç›®å½•å’Œæ–‡ä»¶ä¸ä¼šè¢«åŽ‹ç¼© &ndash;&gt;-->
            <!--                    <excludes>-->
            <!--                        <exclude>**/*.min.js</exclude>-->
            <!--                        <exclude>**/*.min.css</exclude>-->
            <!--                        <exclude>**/d7/**</exclude>-->
            <!--                        <exclude>**/dorado-home/**</exclude>-->
            <!--                        <exclude>**/bdf2/**</exclude>-->
            <!--                        <exclude>**/css/**</exclude>-->
            <!--                        <exclude>**/js/**</exclude>-->
            <!--                        <exclude>**/plugins/**</exclude>-->
            <!--                    </excludes>-->
            <!--                </configuration>-->
            <!--            </plugin>-->

        </plugins>