代码初始化

k94314517

2024-12-18 36e1ec74d47e84cd1b31d7d4bc2319fd14ab1ea8

代码初始化

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -1539,6 +1539,7 @@
                )
                .eq("c.DELETED",0)
                .eq("c.status",0)
                .eq("m.WORK_STATUS",0)
                .orderByAsc("c.id")
        );
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()

 server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java

@@ -33,6 +33,7 @@
            " c.wechat_name as wechatName , c.mobile , c.sex , c.birthday  , c.avatar   ,  d.COMPANY_NAME_PATH as departmentName  " +
            " from system_user c   " +
            " INNER JOIN company d on c.COMPANY_ID = d.id  " +
            " LEFT JOIN member m on c.member_id = m.id   " +
            " ${ew.customSqlSegment} ")
    IPage<UserResponse> getUserPage(IPage<UserResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper);


 server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java

@@ -59,5 +59,10 @@
    @ApiModelProperty(value = "是否查询固定人员组织主键" ,hidden = true)
    private String companySpecialId;

    @ApiModelProperty(value = "在职状态 0在职 1离职" )
    private Integer workStatus;




}

 server/system_service/src/main/resources/mappers/SystemUserMapper.xml

@@ -66,6 +66,9 @@
      <if test="dto.status != null ">
        AND  usr.`status` = #{dto.status}
      </if>
      <if test="dto.workStatus != null ">
        AND  m.WORK_STATUS = #{dto.workStatus}
      </if>
      <if test="dto.memberType != null ">
        AND  m.`type` = #{dto.memberType}
      </if>

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java

@@ -182,4 +182,21 @@
        return ApiResponse.success(  HKService.temperatureHumidityDataStatistic(request));
    }

    @ApiOperation("【海康】根据时间和时间维度获取园区能耗数据")
    @PostMapping("/energyTotal")
    @LoginNoRequired
    public ApiResponse<BaseResponse<EnergyTotalDataResponse>> energyTotalData(@RequestBody EnergyTotalDataRequest request, HttpServletResponse response) {
        return ApiResponse.success(  HKService.energyTotal(request));
    }


    @ApiOperation("【海康】获取区域用量排名-能耗看板")
    @PostMapping("/regionDataRanking")
    @LoginNoRequired
    public ApiResponse<BaseResponse<List<RegionDataRankingDataResponse>>> regionDataRankingData(@RequestBody RegionDataRankingDataRequest request, HttpServletResponse response) {
        return ApiResponse.success(  HKService.regionDataRanking(request));
    }



}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java

@@ -2,7 +2,11 @@

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.RegionDataRankingTypeRequest;
import com.doumee.core.haikang.model.param.respose.RegionDataRankingDataResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
@@ -10,11 +14,9 @@
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
@@ -36,12 +38,21 @@
    @ApiOperation("中心数据")
    @GetMapping("/centerData")
    public ApiResponse<EnergyBoardVO> centerData() {

        EnergyBoardVO data =boardService.centerEnergyData();

        return ApiResponse.success(data);
    }



    @LoginNoRequired
    @ApiOperation("中心用电能耗数据")
    @GetMapping("/regionDataRanking")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "查询类型：1=今日；2=本月；3=昨日", required = true),
    })
    public ApiResponse<List<RegionDataRankingDataResponse>> regionDataRanking(@RequestParam Integer type) {
        return ApiResponse.success(boardService.getRegionDataRanking(type));
    }


    @LoginNoRequired
@@ -57,7 +68,6 @@
    @ApiOperation("实时负荷曲线")
    @GetMapping("/loadCurve")
    public ApiResponse<List<EnergyDataVO>> loadCurve() {

        List<EnergyDataVO> loadCurveList =boardService.loadEnergyCurve();
        return ApiResponse.success(loadCurveList);
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java

@@ -621,6 +621,8 @@
        String[] minitorDataSearch= new String[]{"/api/fpms/v2/minitor/data/search","分页查询设备监测历史数据"};//分页查询设备监测历史数据
        String[] userOpenidSave= new String[]{"/api/v1/oa/userOpenId/saveV2","保存用户及openId绑定信息微信公众号"};//保存用户及openId绑定信息微信公众号
        String[] temperatureHumidityDataStatistic= new String[]{"/api/v2/public/monitor/sensor/list","消防看板-4温湿度统计"};//消防看板-温湿度
        String[] regionDataRanking= new String[]{"/api/ecm/v1/energy/regionDataRanking","消防看板-4获取区域用量排名-能耗看板"};//消防看板-获取区域用量排名 - èƒ½è€—看板
        String[] energyTotal= new String[]{"/api/ecm/v1/energy/energyTotal","消防看板-4根据时间和时间维度获取园区能耗数据"};//消防看板-根据时间和时间维度获取园区能耗数据
    }
    /**
     * é™„录A.55消防设备类型

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -322,6 +322,23 @@
        return startDoPostStringArtemisAdmin(HKConstants.InterfacePath.temperatureHumidityDataStatistic,body);
    }

    /**
     *消防看板-4获取区域用量排名-能耗看板
     * @param body
     * @return
     */
    public static String regionDataRanking(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.regionDataRanking,body);
    }

    /**
     *消防看板-4根据时间和时间维度获取园区能耗数据
     * @param body
     * @return
     */
    public static String energyTotal(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.energyTotal,body);
    }

    /**
     *    èŽ·å–门禁点列表

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EnergyTotalDataRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.doumee.core.haikang.model.param.request;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class EnergyTotalDataRequest {

    @ApiModelProperty(value = "时间维度day/month/year")
    private String  periodType;

    @ApiModelProperty(value = "查询日期")
    private String  date;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingDataRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.core.haikang.model.param.request;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class RegionDataRankingDataRequest {

    @ApiModelProperty(value = "时间维度day/month/year")
    private String  periodType;

    @ApiModelProperty(value = "查询日期")
    private String  date;

    @ApiModelProperty(value = "仪表类型(1:电表;2:水表;3:气表;4:热表)")
    private Integer  meterType;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingTypeRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.doumee.core.haikang.model.param.request;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class RegionDataRankingTypeRequest {

    @ApiModelProperty(value = "查询类型：1=今日；2=本月；3=昨日")
    private Integer queryType;


}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EnergyTotalDataResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.doumee.core.haikang.model.param.respose;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class EnergyTotalDataResponse {

 @ApiModelProperty(value = "用电总量")
 private String   electricity;

 @ApiModelProperty(value = "用水总量")
 private String  water;

 @ApiModelProperty(value = "用气总量")
 private String  gas;

 @ApiModelProperty(value = "用热总量")
 private String  heat;

 @ApiModelProperty(value = "自定义总量")
 private String  extend    ;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionDataRankingDataResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.core.haikang.model.param.respose;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class RegionDataRankingDataResponse {

 @ApiModelProperty(value = "区域")
 private String   name;

 @ApiModelProperty(value = "电量")
 private String  value;

 @ApiModelProperty(value = "百分比")
 private String  percent;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -958,6 +958,45 @@
        return  null;
    }

    /**
     *消防看板-4获取区域用量排名-能耗看板
     * @return
     */
    public  static  BaseResponse<List<RegionDataRankingDataResponse>>  regionDataRanking(RegionDataRankingDataRequest param){
        log.info("【海康消防看板-4获取区域用量排名-能耗看板】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.regionDataRanking(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<List<RegionDataRankingDataResponse> >>(){};
            BaseResponse<List<RegionDataRankingDataResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康消防看板-4获取区域用量排名-能耗看板");
            return  result;
        }catch (Exception e){
            log.error("【海康消防看板-4获取区域用量排名-能耗看板】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }


    /**
     *消防看板-4获取区域用量排名-能耗看板
     * @return
     */
    public  static  BaseResponse<EnergyTotalDataResponse>  energyTotal(EnergyTotalDataRequest param){
        log.info("【海康消防看板-4根据时间和时间维度获取园区能耗数据】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.energyTotal(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<EnergyTotalDataResponse >>(){};
            BaseResponse<EnergyTotalDataResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康消防看板-4根据时间和时间维度获取园区能耗数据");
            return  result;
        }catch (Exception e){
            log.error("【海康消防看板-4根据时间和时间维度获取园区能耗数据】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }


    /**
     *分页查询消防设备部件状态

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java

@@ -59,7 +59,7 @@
    private Integer areaId;

    @ApiModelProperty(value = "状态 0待处理 1已处理 2不处理", example = "1")
    @ExcelColumn(name="处理结果" ,valueMapping ="0=0待处理;1=已处理;2=不处理;",index = 5)
    @ExcelColumn(name="处理结果" ,valueMapping ="0=0待处理;1=已处理;2=不处理;",index = 5,width = 6)
    private Integer status;

    @ApiModelProperty(value = "申请处理人编码(关联member)", example = "1")
@@ -91,12 +91,12 @@
    private Integer checkUserId;

    @ApiModelProperty(value = "区域名称")
    @ExcelColumn(name="隐患区域",index = 1)
    @ExcelColumn(name="隐患区域",index = 1,width = 10)
    private String areaName;

    @ApiModelProperty(value = "申请人姓名", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="提报人姓名",index =3)
    @ExcelColumn(name="提报人姓名",index =3,width = 6)
    private String memberName;
    @ApiModelProperty(value = "申请人所属组织名称", example = "1")
    @TableField(exist = false)
@@ -104,7 +104,7 @@
    private String companyName;
    @ApiModelProperty(value = "责任部门名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="责任部门名称",index = 0)
    @ExcelColumn(name="责任部门名称",index = 0,width = 10)
    private String dutyCompanyName;
    @ApiModelProperty(value = "申请人手机号", example = "1")
    @TableField(exist = false)
@@ -124,7 +124,7 @@
    private String checkorPhone;
    @ApiModelProperty(value = "隐患类型名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="隐患类型",index = 2)
    @ExcelColumn(name="隐患类型",index = 2,width = 10)
    private String categoryName;

    @ApiModelProperty(value = "查询开始时间（基于提报时间）", example = "2024-05-20 11:48:50")
@@ -145,12 +145,12 @@

    @ApiModelProperty(value = "提报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="提报时间",index = 6,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="提报时间",index = 6,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18)
    private Date submitTime;

    @ApiModelProperty(value = "处理时间（整改/退回使用）")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="处理时间",index = 7 ,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="处理时间",index = 7 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18)
    private Date dealTime;

    @ApiModelProperty(value = "附件信息")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java

@@ -65,8 +65,8 @@
    @ExcelColumn(name="入库类型",index = 7,width = 12,valueMapping = "0=整托盘;1=件烟;")
    private Integer inType;

    @ApiModelProperty(value = "总运输量", example = "1")
    @ExcelColumn(name="总运输量",index = 2,width = 12)
    @ApiModelProperty(value = "总作业量(万支)", example = "1")
    @ExcelColumn(name="总作业量(万支)",index = 2,width = 12)
    private BigDecimal totalNum;

    @ApiModelProperty(value = "前车牌号")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java

@@ -22,22 +22,22 @@
public class PlatformWaterGasForExcelVO {

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="最近操作时间",index = 5,dateFormat="yyyy-MM-dd HH:mm",width = -1)
    @ExcelColumn(name="最近操作时间",index = 5,dateFormat="yyyy-MM-dd HH:mm",width = 20)
    private Date editDate;

    @ApiModelProperty(value = "时间（年月）")
    @ExcelColumn(name="使用月份",index = 2,dateFormat="yyyy-MM")
    @ExcelColumn(name="使用月份",index = 2,dateFormat="yyyy-MM",width = 10)
    private Date timeInfo;

    @ApiModelProperty(value = "类型 0用水 1用气 2用油", example = "1")
    @ExcelColumn(name="类型",valueMapping = "0=用水;1=用气;2=用油;",index = 0)
    @ExcelColumn(name="类型",valueMapping = "0=用水;1=用气;2=用油;",index = 0,width = 10)
    private Integer type;

    @ApiModelProperty(value = "数量 (用电顿，用电度； æ²¹è€—L）", example = "1")
    @ExcelColumn(name="数量",index = 3)
    @ExcelColumn(name="数量",index = 3,width = 10)
    private BigDecimal num;

    @ApiModelProperty(value = "说明")
    @ExcelColumn(name="说明",index = 4)
    @ExcelColumn(name="说明",index = 4,width = 20)
    private String content;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyModelDataVO.java

@@ -1,9 +1,11 @@
package com.doumee.dao.web.response.platformReport;

import com.doumee.core.haikang.model.param.respose.RegionDataRankingDataResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * Created by IntelliJ IDEA.
@@ -28,4 +30,7 @@
    @ApiModelProperty(value = "同比值" ,hidden = true)
    private BigDecimal sameNum;

    @ApiModelProperty(value = "各个区域用电信息")
    private List<RegionDataRankingDataResponse> regionDataRankingDataList;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -424,8 +424,6 @@
        return hiddenDangerMapper.selectCount(wrapper);
    }



    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void dealHiddenDanger(HiddenDanger hiddenDanger){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -14,6 +14,7 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKCarOpenService;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -39,7 +40,9 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -1420,7 +1423,6 @@
        }
        if(data == null){
            data = new RegionEnergyListResponse();
            data.setSecondRegionDataList(new ArrayList<>());
            data.setRootValue("0");
            data.setSamePercent("0");
            data.setRingPercent("0");
@@ -1926,4 +1928,32 @@
        return  data;
    }

    /**
     * æŸ¥è¯¢èƒ½è€—用电信息  1=今日；2=本月；3=昨日
     * @return
     */
    @Override
    public List<RegionDataRankingDataResponse> getRegionDataRanking(Integer type){
        RegionDataRankingDataRequest request = new RegionDataRankingDataRequest();
        request.setMeterType(1);
        if(Constants.equalsInteger(type,Constants.ONE)){
            request.setDate(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd"));
            request.setPeriodType("day");
        }else if(Constants.equalsInteger(type,Constants.TWO)){
            request.setDate(DateUtil.getFomartDate(new Date(),"yyyy-MM"));
            request.setPeriodType("month");
        }else{
            request.setDate(DateUtil.getBeforDay(new Date(),1));
            request.setPeriodType("day");
        }
        BaseResponse<List<RegionDataRankingDataResponse>> response = HKService.regionDataRanking(request);
        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
            return response.getData();
        }else{
            return null;
        }
    }



}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java

@@ -136,15 +136,20 @@
                TMSContants.TopStatusLevel tem = TMSContants.TopStatusLevel.ddsc;
                if(i == 0){
                    tem=TMSContants.TopStatusLevel.yrk;
                } if(i == 1){
                }
                if(i == 1){
                    tem=TMSContants.TopStatusLevel.ydh;
                } if(i == 2){
                }
                if(i == 2){
                    tem=TMSContants.TopStatusLevel.clysz;
                } if(i == 4){
                }
                if(i == 4){
                    tem=TMSContants.TopStatusLevel.ckckz;
                } if(i == 3){
                }
                if(i == 3){
                    tem=TMSContants.TopStatusLevel.ydpzz;
                } if(i == 5){
                }
                if(i == 5){
                    tem=TMSContants.TopStatusLevel.ddsc;
                }
                t.setName(tem.getName());

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java

@@ -1,10 +1,8 @@
package com.doumee.service.business.third;

import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.param.respose.PageFireChannelInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
import com.doumee.core.haikang.model.param.request.RegionDataRankingTypeRequest;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
import com.doumee.dao.web.response.platformReport.*;
@@ -92,4 +90,6 @@
    List<GeneralVO> todayTotalInList();

    List<CarsAlarmResultListResponse> carsEventList();

    List<RegionDataRankingDataResponse> getRegionDataRanking(Integer type);
}