YYC
2023-06-19 2db1a7b1019297a3ba9f098f44488d1ee07addc7
电子巡更
已修改6个文件
已添加7个文件
342 ■■■■■ 文件已修改
igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoVideo.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5501.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java
@@ -11,17 +11,17 @@
public class Phone35Constant {
    public static final String BEAN_ID = "phone.phoneConstant";
    /**
     *粮情仓库列表
     * ç²®æƒ…仓库列表
     */
    public static final String PHONE_DEPOT_GRAIN="grain";
    public static final String PHONE_DEPOT_PEST="pest";
    public static final String PHONE_DEPOT_GAS="gas";
    public static final String PHONE_DEPOT_GRAIN = "grain";
    public static final String PHONE_DEPOT_PEST = "pest";
    public static final String PHONE_DEPOT_GAS = "gas";
    /**
     * å€¼ä»“提交
     */
    public static final String PHONE_INOUT_START="start";
    public static final String PHONE_INOUT_END="end";
    public static final String PHONE_INOUT_START = "start";
    public static final String PHONE_INOUT_END = "end";
    /**
     * ç™»å½•
     */
@@ -88,10 +88,18 @@
    public static final String API_PHONE_5502 = "5502";
    public static final String API_PHONE_5503 = "5503";
    /* ======= è§†é¢‘监控 ====== */
    /* ======= ç”µå­å·¡æ›´ ====== */
    public static final String API_PHONE_5601 = "5601";
    public static final String API_PHONE_5602 = "5602";
    public static final String API_PHONE_5603 = "5603";
    /* ======= è§†é¢‘监控 ====== */
    public static final String API_PHONE_5604 = "5604";
    public static final String API_PHONE_5605 = "5605";
    public static final String API_PHONE_5606 = "5606";
    /* ======= å·¥å•管理 ====== */
@@ -100,7 +108,7 @@
    public static final String API_PHONE_5703 = "5703";
    public static final String API_PHONE_5704 = "5704";
    /* ======= ç”µå­å·¡æ›´ ====== */
    /* ======= é¢„警管理 ====== */
    public static final String API_PHONE_5801 = "5801";
    public static final String API_PHONE_5802 = "5802";
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
@@ -19,8 +19,8 @@
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    private double ep;
    private double eq;
    private double startEs;
    private double endEs;
    private double es;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ld.igds.phone35.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
 * @Author:YAN
 */
@Data
public class DtoPatrol {
    private String id;
    private String userName;
    private String longitude;
    private String latitude;
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    private String base64Img;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoVideo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.ld.igds.phone35.dto;
import lombok.Data;
/**
 * ç›‘控视频响应封装
 *
 * @Author:YAN
 */
@Data
public class DtoVideo {
    private String id;
    private String name;
    private String type;
    private String status;
    private String playType;
    private String playAddr;
    private String playIframe;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
@@ -2,6 +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 org.apache.ibatis.annotations.Param;
@@ -70,4 +71,20 @@
     * @return
     */
    List<DtoEnergy> getEnergy(@Param("param") Phone35DepotCommonParam param);
    /**
     * ç”µå­å·¡é€»åˆ—表
     *
     * @param param
     * @return
     */
    List<DtoPatrol> getPatrol(@Param("param") Phone35DepotCommonParam param);
    /**
     * ç›‘控设备列表
     *
     * @param param
     * @return
     */
    List<DtoVideo> getCamera(@Param("param") Phone35CommonParam param);
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5501.java
@@ -19,6 +19,8 @@
import java.util.List;
/**
 * å®žæ—¶é…ç”µ
 *
 * @Author:YAN
 */
@Service
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
@@ -23,6 +23,8 @@
import java.util.Map;
/**
 * ä»“库能耗查询
 *
 * @Author:YAN
 */
@Service
@@ -52,19 +54,29 @@
        if (null == param.getStartTime()) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        param.setEndTime(DateUtil.getNextZero(param.getEndTime()));
        if (null != param.getEndTime()) {
            param.setEndTime(DateUtil.getNextZero(param.getEndTime()));
        }
        param.setCompanyId(phone35AuthUser.getCompanyId());
        List<DtoEnergy> energyList = phone35Mapper.getEnergy(param);
        Map<String, DtoEnergy> energyMap = new HashMap<>();
        DtoEnergy dtoEnergy;
        for (DtoEnergy data : energyList) {
            //todo
//            if (null == energyMap.get(data.getDepotId())) {
//                String depotName = phone35Util.getDepotName(phone35AuthUser.getCompanyId(), data.getDepotId());
//                data.setDepotName(depotName);
//                energyMap.put(data.getDepotId(), data);
//            }
            if (null == energyMap.get(data.getDepotId())) {
                String depotName = phone35Util.getDepotName(phone35AuthUser.getCompanyId(), data.getDepotId());
                data.setDepotName(depotName);
                data.setEndEs(data.getEs());
                data.setStartEs(data.getEs());
                energyMap.put(data.getDepotId(), data);
            } else {
                dtoEnergy = energyMap.get(data.getDepotId());
                dtoEnergy.setStartEs(data.getEs());
                dtoEnergy.setEpSum(data.getEpSum() + dtoEnergy.getEpSum());
                dtoEnergy.setEqSum(data.getEqSum() + dtoEnergy.getEqSum());
                dtoEnergy.setEsSum(data.getEsSum() + dtoEnergy.getEsSum());
            }
        }
        List<DtoEnergy> list = new ArrayList<>();
        return null;
        List<DtoEnergy> list = new ArrayList<>(energyMap.values());
        return PhoneRespUtil.success(list, req);
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
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.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.Phone35DepotCommonParam;
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.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
 * ç”µå­å·¡æ›´è®°å½•
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5601 implements Phone35Service {
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5601;
    }
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //转化对象
        Phone35DepotCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35DepotCommonParam.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.getDateTime())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        Date date = DateUtils.parseDate(param.getDateTime(), "yyyy-MM-dd");
        param.setStartTime(date);
        param.setEndTime(DateUtil.getNextZero(date));
        List<DtoPatrol> list = phone35Mapper.getPatrol(param);
        return PhoneRespUtil.success(list, req);
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
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 Phone35ServiceImpl5602 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5602;
    }
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        return null;
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
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 Phone35ServiceImpl5603 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5603;
    }
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        return null;
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
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.DtoVideo;
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.Phone35CommonParam;
import com.ld.igds.phone35.param.Phone35DepotCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import com.ld.igds.phone35.util.PhoneRespUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * ç›‘控设备列表 D_SEC_CAMERA
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5604 implements Phone35Service {
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5604;
    }
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //转化对象
        Phone35CommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35CommonParam.class);
        if (null == param) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getDeptId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        param.setCompanyId(phone35AuthUser.getCompanyId());
        List<DtoVideo> list = phone35Mapper.getCamera(param);
        return PhoneRespUtil.success(list, req);
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
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;
/**
 * ç›‘控播放
 *
 * @Author:YAN
 */
public class Phone35ServiceImpl5605 implements Phone35Service {
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5605;
    }
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        return null;
    }
}
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -116,8 +116,6 @@
        SELECT EP_INC_ AS epSum,
        EQ_INC_ AS eqSum,
        ES_INC_ AS esSum,
        EP_ AS ep,
        EQ_ AS eq,
        ES_ AS es,
        DEPOT_ID_ AS depotId,
        UPDATE_TIME_ AS updateTime
@@ -134,4 +132,32 @@
        </where>
        ORDER BY UPDATE_TIME_ desc
    </select>
    <!-- ç”µå­å·¡æ›´è®°å½•-->
    <select id="getPatrol" resultType="com.ld.igds.phone35.dto.DtoPatrol">
        SELECT ID_ AS id,
        USER_NAME_ AS userName,
        LONGITUDE_ As longitude,
        LATITUDE_ AS latitude,
        IMG_NAME_ AS base64Img,
        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.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>
    <!--    ç›‘控设备列表-->
    <select id="getCamera" resultType="com.ld.igds.phone35.dto.DtoVideo">
        SELECT ID_        AS id,
               TYPE_      AS type,
               PLAY_TYPE_ AS playType,
               NAME_      AS name
        FROM D_SEC_CAMERA
        WHERE COMPANY_ID_ = #{param.companyId}
          AND DEPT_ID_ = #{param.deptId}
    </select>
</mapper>