Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-02-10 a254023810a00706b427241d1e0a7d58e55b9334

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 admin/public/template/member.xlsx

Binary files differ

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

@@ -624,6 +624,7 @@
        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根据时间和时间维度获取园区能耗数据"};//消防看板-根据时间和时间维度获取园区能耗数据
        String[] findDeviceStatistics= new String[]{"/api/v1/device/findDeviceStatistics","分页查询设备的以及下属传感器数据的状态统计"};// åˆ†é¡µæŸ¥è¯¢è®¾å¤‡çš„以及下属传感器数据的状态统计
    }
    /**
     * é™„录A.55消防设备类型

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

@@ -871,6 +871,15 @@
    public static String getFireDevStatusList(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.getFireDevStatusList,body);
    }

    /**
     * åˆ†é¡µæŸ¥è¯¢è®¾å¤‡çš„以及下属传感器数据的状态统计
     * @param body
     * @return
     */
    public static String findDeviceStatistics(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.findDeviceStatistics,body);
    }
    /**
     *消防看板-4报警信息统计
     * @param body

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

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

import lombok.Data;

@Data
public class FindDeviceStatisticsRequest {
    /**
     *
     {
     "regionIndexCode": "root000000"
     }
     */
    private String   regionIndexCode;//    Array    true    åŒºåŸŸIndexCode
}

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

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

import lombok.Data;

import java.util.List;

@Data
public class FindDeviceStatisticsInfoResponse {
    private String deviceName    ;//String    false    è®¾å¤‡åç§°
    private String deviceIndexCode;//    String    false    è®¾å¤‡indexCode
    private Integer totalSensorCount;//    Number    false    ä¼ æ„Ÿå™¨æ€»æ•°
    private Integer alarmSensorCount    ;//Number    false    æŠ¥è­¦ä¼ æ„Ÿå™¨æ€»æ•°
    private Integer shieldSensorCount    ;//Number    false    å±è”½ä¼ æ„Ÿå™¨æ€»æ•°
    private Integer normalSensorCount    ;//Number    false    æ­£å¸¸ä¼ æ„Ÿå™¨æ€»æ•°
    private Integer faultSensorCount;//    Number    false    æ•…障传感器总数
}

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

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

import lombok.Data;

import java.util.List;

@Data
public class FindDeviceStatisticsResponse {
private String  deviceTypeName;//    String    false    è®¾å¤‡ç±»åž‹
private Integer totalDeviceCount    ;//Number    false    è®¾å¤‡æ€»æ•°;
private List<FindDeviceStatisticsInfoResponse> devices;//    Array    false    è®¾å¤‡è¯¦æƒ…
}

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

@@ -1926,6 +1926,24 @@
        return  null;
    }
    /**
     *分页查询设备的以及下属传感器数据的状态统计
     * @return
     */
    public  static  BaseResponse<List<FindDeviceStatisticsResponse> >  findDeviceStatistics(FindDeviceStatisticsRequest param){
        log.info("【分页查询设备的以及下属传感器数据的状态统计】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.findDeviceStatistics(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<List<FindDeviceStatisticsResponse> >>(){};
            BaseResponse<List<FindDeviceStatisticsResponse> >   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"分页查询设备的以及下属传感器数据的状态统计");
            return  result;
        }catch (Exception e){
            log.error("【分页查询设备的以及下属传感器数据的状态统计】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    /**
     *消防看板-4报警信息统计
     * @return
     */

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

@@ -43,7 +43,6 @@
    @ExcelColumn(name="司机姓名",index = 4,width = 6)
    private String driverName;


    @ApiModelProperty(value = "司机手机号")
    @ExcelColumn(name="司机电话",index = 5,width = 8)
    private String drivierPhone;

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

@@ -929,11 +929,11 @@
                    .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
                    .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
                    .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .set(Member::getCode,updateMember.getCode())
//                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
                    .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
                    .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .eq(Member::getId,updateMember.getId()));
            dealTrainTIme(updateMember,1,loginUserInfo);
            cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
@@ -2048,7 +2048,7 @@
            ExcelImporter ie = null;
            List<MemberImport> dataList =null;
            try {
                ie = new ExcelImporter(file,2,0);
                ie = new ExcelImporter(file,1,0);
                dataList = ie.getDataList(MemberImport.class,null);
            }  catch (Exception e) {
                e.printStackTrace();
@@ -2118,6 +2118,10 @@
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息导入失败，请稍后重试！");
        }
    }

    public static void main(String[] args) {
        System.out.println(PhoneUtil.isPhone("18156047603"));
    }
    private Member checkModelParam(MemberImport model, List<Member> newList
            ,int index
            ,LoginUserInfo loginUserInfo
@@ -2185,7 +2189,7 @@
    private Company findCompanyFromList(String companyName, List<Company> companyList) {
        if(companyList !=null){
            for(Company company : companyList){
                if(StringUtils.equals(companyName,company.getName())){
                if(StringUtils.equals(companyName,company.getCompanyNamePath())){
                    return  company;
                }
            }

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

@@ -1264,7 +1264,38 @@
    public  FightingAdminCenterDataVO centerFightingAdminData(){
        FightingAdminCenterDataVO data = new FightingAdminCenterDataVO();
        List<DeviceNumByTypeVO> list = new ArrayList<>();
        FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
        FindDeviceStatisticsRequest param1 = new FindDeviceStatisticsRequest();
        param1.setRegionIndexCode("root000000");
        BaseResponse<List<FindDeviceStatisticsResponse>> response = HKService.findDeviceStatistics(param1);
        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
            for(FindDeviceStatisticsResponse r :response.getData()){
                DeviceNumByTypeVO t = new DeviceNumByTypeVO();
                t.setTypeName(r.getDeviceTypeName());
                t.setTotalDeviceNum(Constants.formatIntegerNum(r.getTotalDeviceCount()));
                if(r.getDevices()!=null){
                    for(FindDeviceStatisticsInfoResponse td : r.getDevices()){
                        //屏蔽数
                        t.setShieldDeviceNum(Constants.formatIntegerNum(t.getShieldDeviceNum() )+ Constants.formatIntegerNum(td.getShieldSensorCount()));
                        //报警数
                        t.setAlarmDeviceNum(Constants.formatIntegerNum(t.getAlarmDeviceNum())+ Constants.formatIntegerNum(td.getAlarmSensorCount()));
                        //正常数
                        t.setOnlineDeviceNum(Constants.formatIntegerNum(t.getOnlineDeviceNum())+Constants.formatIntegerNum(td.getNormalSensorCount()));
                        //故障数
                        t.setErrDeviceNum(Constants.formatIntegerNum(t.getErrDeviceNum())+ Constants.formatIntegerNum(td.getFaultSensorCount()));
                        //总设备数
                        t.setTotalDeviceNum(Constants.formatIntegerNum(t.getTotalDeviceNum())+ Constants.formatIntegerNum(td.getTotalSensorCount()));
                    }
                }
                list.add(t);
                data.setOfflineDeviceNum(Constants.formatIntegerNum( data.getOfflineDeviceNum())+Constants.formatIntegerNum(t.getOfflineDeviceNum()));
                data.setShieldDeviceNum(Constants.formatIntegerNum( data.getAlarmDeviceNum())+Constants.formatIntegerNum(t.getShieldDeviceNum()));
                data.setAlarmDeviceNum(Constants.formatIntegerNum( data.getAlarmDeviceNum())+Constants.formatIntegerNum(t.getAlarmDeviceNum()));
                data.setOnlineDeviceNum(Constants.formatIntegerNum( data.getOnlineDeviceNum())+Constants.formatIntegerNum(t.getOnlineDeviceNum()));
                data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(t.getErrDeviceNum()));
                data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(t.getTotalDeviceNum()));
            }
        }
       /* FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
        param.setIncludeBool(1);
        param.setRegionIds(new String[]{"root000000"});
        BaseResponse<List<FireDevStatusListResponse>> response = HKService.getFireDevStatusList(param);
@@ -1284,7 +1315,7 @@
                data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(r.getFaultFireDevCount()));
                data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(r.getTotalFireDevCount()));
            }
        }
        }*/
        data.setDeviceTypeList(list);
        Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
                .eq(HiddenDanger::getIsdeleted,Constants.ZERO )