YYC
2023-06-16 ceb82b46aff1f20e5670a199aa2e0eef87ccd5a8
预警与能耗
已修改5个文件
已添加5个文件
411 ■■■■■ 文件已修改
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/Dto5501.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoWarn.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35WarnCommonParam.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5502.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5802.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/Dto5501.java
@@ -6,6 +6,8 @@
import java.util.Date;
/**
 * å®žæ–½é…ç”µæ•°æ®å°è£…
 *
 * @Author:YAN
 */
@Data
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ld.igds.phone35.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
 * @Author:YAN
 */
@Data
public class DtoEnergy {
    private String depotId;
    private String depotName;
    private double epSum;
    private double eqSum;
    private double esSum;
    @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 es;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoWarn.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.ld.igds.phone35.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
 * è­¦å‘Šè®°å½•封装
 *
 * @Author:YAN
 */
@Data
public class DtoWarn {
    private String id;
    private String name;
    private String type;
    private String bizType;
    private String level;
    private String status;
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date time;
    private String info;
    private String depotId;
    private String depotName;
    private String remark;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
@@ -1,9 +1,9 @@
package com.ld.igds.phone35.mapper;
import com.ld.igds.phone35.dto.Dto5501;
import com.ld.igds.phone35.dto.DtoPhoneGas;
import com.ld.igds.phone35.dto.DtoPhonePest;
import com.ld.igds.phone35.dto.*;
import com.ld.igds.phone35.param.Phone35DepotCommonParam;
import com.ld.igds.phone35.param.Phone35WarnCommonParam;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -39,4 +39,35 @@
     * @return
     */
    List<Dto5501> getRealEnergyByDept(@Param("companyId") String companyId, @Param("deptId") String deptId);
    /**
     * èŽ·å–è­¦å‘Šåˆ—è¡¨
     *
     * @param param
     * @return
     */
    List<DtoWarn> getWarnByDept(@Param("param") Phone35DepotCommonParam param);
    /**
     * è­¦å‘Šå¤„理
     *
     * @param param
     */
    void updateWarn(@Param("param") Phone35WarnCommonParam param);
    /**
     * èŽ·å–è¿œç¨‹æŠ„è¡¨åˆ—è¡¨
     *
     * @param param
     * @return
     */
    List<DtoEnergy> getMeter(@Param("param") Phone35DepotCommonParam param);
    /**
     * èƒ½è€—管理-仓库能耗查询
     *
     * @param param
     * @return
     */
    List<DtoEnergy> getEnergy(@Param("param") Phone35DepotCommonParam param);
}
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35WarnCommonParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ld.igds.phone35.param;
import lombok.Data;
import java.util.Date;
/**
 * @Author:YAN
 */
@Data
public class Phone35WarnCommonParam extends Phone35CommonParam {
    private String id;
    private String status;
    private String remark;
    private Date completeTime;
    private String completeUser;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5502.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
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.DtoEnergy;
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.Phone35Util;
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.*;
/**
 * è¿œç¨‹æŠ„表
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5502 implements Phone35Service {
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Autowired
    private Phone35Util phone35Util;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5502;
    }
    @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));
        param.setCompanyId(phone35AuthUser.getCompanyId());
        List<DtoEnergy> list = phone35Mapper.getMeter(param);
        Map<String, DtoEnergy> meterMap = new HashMap<>();
        for (DtoEnergy data : list) {
            if (null == meterMap.get(data.getDepotId())) {
                String depotName = phone35Util.getDepotName(phone35AuthUser.getCompanyId(), data.getDepotId());
                data.setDepotName(depotName);
                meterMap.put(data.getDepotId(), data);
            }
        }
        ArrayList<DtoEnergy> meterList = new ArrayList<>(meterMap.values());
        return PhoneRespUtil.success(meterList, req);
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone.util.PhoneUtil;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.DtoEnergy;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5503 implements Phone35Service {
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Autowired
    private PhoneUtil phone35Util;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5503;
    }
    @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 (null == param.getStartTime()) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        param.setEndTime(DateUtil.getNextZero(param.getEndTime()));
        param.setCompanyId(phone35AuthUser.getCompanyId());
        List<DtoEnergy> energyList = phone35Mapper.getEnergy(param);
        Map<String, DtoEnergy> energyMap = new HashMap<>();
        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);
//            }
        }
        List<DtoEnergy> list = new ArrayList<>();
        return null;
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java
@@ -1,16 +1,38 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.constant.WarnType;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.DtoWarn;
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.ContextUtil;
import com.ld.igds.util.DateUtil;
import com.ld.igds.warn.WarnUtils;
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 Phone35ServiceImpl5801 implements Phone35Service {
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5801;
@@ -18,6 +40,28 @@
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        return null;
        //转化对象
        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));
        param.setCompanyId(phone35AuthUser.getCompanyId());
        List<DtoWarn> list = phone35Mapper.getWarnByDept(param);
        for (DtoWarn warn : list) {
            warn.setType(WarnType.getMsg(warn.getType()));
            warn.setBizType(BizType.getMsg(warn.getBizType()));
        }
        return PhoneRespUtil.success(list, req);
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5802.java
@@ -1,16 +1,33 @@
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.Phone35DepotCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.param.Phone35WarnCommonParam;
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.Date;
/**
 * è­¦å‘Šå¤„理
 *
 * @Author:YAN
 */
@Service
public class Phone35ServiceImpl5802 implements Phone35Service {
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5802;
@@ -18,6 +35,25 @@
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        return null;
        //转化对象
        Phone35WarnCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35WarnCommonParam.class);
        if (null == param) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getStatus())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getRemark())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        param.setCompleteTime(new Date());
        phone35Mapper.updateWarn(param);
        return PhoneRespUtil.success(null, req);
    }
}
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -63,4 +63,75 @@
        <if test="deptId != null and deptId != ''">AND d.DEPT_ID_ = #{deptId}</if>
        ORDER BY d.ID_
    </select>
    <!--警告记录-->
    <select id="getWarnByDept" resultType="com.ld.igds.phone35.dto.DtoWarn"
            parameterType="com.ld.igds.phone35.param.Phone35DepotCommonParam">
        SELECT w.ID_ as id,
        w.NAME_ as name,
        w.TYPE_ as type,
        w.BIZ_TYPE_ as bizType,
        w.LEVEL_ as level,
        w.STATUS_ as status,
        w.TIME_ as `time`,
        w.INFO_ as info,
        w.DEPOT_ID_ as depotId,
        w.REMARK_ as remark
        FROM D_M_WARN_INFO w
        WHERE w.COMPANY_ID_ = #{param.companyId}
        <if test="param.deptId != null and param.deptId != ''">AND w.DEPT_ID_ = #{param.deptId}</if>
        <if test="param.startTime != null and param.endTime != null">AND w.TIME_ between #{param.startTime} and
            #{param.endTime}
        </if>
    </select>
    <!--警告处理-->
    <update id="updateWarn">
        UPDATE D_M_WARN_INFO
        <set>
            <if test="param.status != null and param.status != ''">STATUS_ = #{param.status},</if>
            <if test="param.remark != null and param.remark != ''">REMARK_ = #{param.remark},</if>
            <if test="param.completeUser != null and param.completeUser != ''">COMPLETE_USER_ = #{param.completeUser},
            </if>
        </set>
        WHERE ID_ = #{param.id}
    </update>
    <!--远程抄表-->
    <select id="getMeter" resultType="com.ld.igds.phone35.dto.DtoEnergy">
        SELECT EP_INC_ AS epSum,
        EQ_INC_ AS eqSum,
        ES_INC_ AS esSum,
        DEPOT_ID_ AS depotId,
        UPDATE_TIME_ AS updateTime
        FROM D_ENERGY
        <where>
            <if test="param.companyId != null">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.startTime != null and param.endTime != null">AND UPDATE_TIME_ between #{param.startTime}
                and
                #{param.endTime}
            </if>
        </where>
        ORDER BY UPDATE_TIME_ desc
    </select>
    <!-- ä»“库能耗查询-->
    <select id="getEnergy" resultType="com.ld.igds.phone35.dto.DtoEnergy">
        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
        FROM D_ENERGY
        <where>
            <if test="param.companyId != null">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}
            </if>
            <if test="param.endTime != null">AND
                UPDATE_TIME_ <![CDATA[ < ]]>#{param.endTime,jdbcType=TIMESTAMP}
            </if>
        </where>
        ORDER BY UPDATE_TIME_ desc
    </select>
</mapper>