最新版本541200007

doum

昨天 4ea16b20eb3749765d64f7a65f317f87abe04d89

最新版本541200007

 admin/src/components/business/OperaWarningRuleWindow.vue

@@ -35,8 +35,15 @@
              noOptionsText="没有可选项"
              noResultsText="没有匹配的结果" />
        </el-form-item>
        <el-form-item label=""   style="display: inline-block;margin-left: 10px; " >
          <el-select v-model="item.deviceId" filterable placeholder="请选择监控点"   @change="changeCamera(item)" >
        <el-form-item label=""   style="display: inline-block;margin-left: 10px;width: 120px; " >
          <el-select  v-model="item.deviceType" filterable placeholder="请选择设备类型" clearable  @change="changeDeviceType(item)" >
            <el-option label="监控点" :value="0" ></el-option>
            <el-option label="消防设备" :value="1" ></el-option>
            <el-option label="消防传感器" :value="2" ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label=""  v-if="item.deviceType>=0 || item.deviceType <=2" style="display: inline-block;margin-left: 10px; " >
          <el-select v-model="item.deviceId" filterable placeholder="请选择监控点" clearable   @change="changeCamera(item)" >
            <el-option v-for="item1 in item.carmeraList"   :label="item1.name" :value="item1.indexCode" ></el-option>
          </el-select>
        </el-form-item>
@@ -154,6 +161,29 @@
        children: node.childList
      }
    },
    changeDeviceType (item) {
      if (item.regionId) {
        var reg = this.getSelectedObject(item.regionId)
        if (reg) {
          item.carmeraList = []
          if (item.deviceType === 1) {
            item.carmeraList = reg.deviceList
          } else if (item.deviceType === 2) {
            item.carmeraList = reg.sensorList
          }else if (item.deviceType === 0){
            item.carmeraList = reg.carmeraList
          }
        }
      }else{
        item.carmeraList = []
      }
      this.$nextTick(() => {
        if (!item.deviceType || this.notInCarmeraList(item.carmeraList, item.deviceId)) {
          item.deviceId = null
          item.deviceName = null
        }
      })
    },
    changeCamera (curitem) {
      var list = curitem.carmeraList
      if (list && list.length) {
@@ -175,7 +205,13 @@
        if (reg) {
          this.form.detailList[opt].regionCode = reg.indexCode
          this.form.detailList[opt].regionName = reg.name
          if (item.deviceType === 1) {
            this.form.detailList[opt].carmeraList = reg.deviceList
          } else if (item.deviceType === 2) {
            this.form.detailList[opt].carmeraList = reg.sensorList
          }else{
          this.form.detailList[opt].carmeraList = reg.carmeraList
          }
        }
      }
      this.$nextTick(() => {
@@ -285,6 +321,11 @@
              var region = this.getSelectedObject(item.regionId)
              if (region) {
                item.carmeraList = region.carmeraList || []
                if(item.deviceType === 1){
                  item.carmeraList = region.deviceList || []
                }else if(item.deviceType === 2){
                  item.carmeraList = region.sensorList || []
                }
              }
            }
          })

 admin/src/components/common/CommonHeader.vue

@@ -351,7 +351,7 @@
      flex-direction: column;
      align-items: center;
      justify-content: flex-start;
      height: 40px;
      height: 49px;
      cursor: pointer;

      .linellae {

 admin/whyc_admin/avatar/man.png

Binary files differ

 admin/whyc_admin/avatar/woman.png

Binary files differ

 admin/whyc_admin/favicon.ico

Binary files differ

 admin/whyc_admin/index.html

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/css/app.b2b1fcc4.css

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/css/chunk-vendors.04c7bff3.css

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/fonts/element-icons.535877f5.woff

Binary files differ

 admin/whyc_admin/static/fonts/element-icons.732389de.ttf

Binary files differ

 admin/whyc_admin/static/img/404-tip.4d90651f.png

Binary files differ

 admin/whyc_admin/static/img/404.5c17595f.png

Binary files differ

 admin/whyc_admin/static/img/bg@2x.db5d20c2.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe@2x.632406ea.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_chexiao@2x.966d7ff8.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_pass@2x.356d8eee.png

Binary files differ

 admin/whyc_admin/static/img/default_homeimg.f3e4e5d0.png

Binary files differ

 admin/whyc_admin/static/img/default_nodata.5d1df1bb.png

Binary files differ

 admin/whyc_admin/static/img/department.0c08872e.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/dictionary.ad728d75.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/home_func1.2273dcea.png

Binary files differ

 admin/whyc_admin/static/img/home_func5.d27eba52.png

Binary files differ

 admin/whyc_admin/static/img/listener.fcf79708.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log-login.5b08fa8b.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log-opera.f8d4f877.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log.f8f7b2f8.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/login_img@2x.cb2860d8.png

Binary files differ

 admin/whyc_admin/static/img/man.6eaa0e37.png

Binary files differ

 admin/whyc_admin/static/img/permission.14c1bcf1.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/position.8a867f13.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/pwd.f73be658.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/role.2a1931ed.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/shield.54851228.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/top_ic_bolang@2x.b1c83ed4.png

Binary files differ

 admin/whyc_admin/static/js/app.bb038f52.js

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/app.bb038f52.js.map

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js.map

ÎļþÒÑɾ³ý

 admin/whyc_admin/template/cars.xlsx

Binary files differ

 admin/whyc_admin/template/jkCustomerTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/jkLineTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/jkOrdersTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/member.xlsx

Binary files differ

 admin/whyc_admin/template/oil.xlsx

Binary files differ

 admin/whyc_admin/template/traintime.xlsx

Binary files differ

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -572,6 +572,11 @@
        public static final String BIGSCREEN_UUID ="BIGSCREEN_UUID";
        public static final String IMPORTING_GAS ="IMPORTING_GAS";
        public static final String ERP_TOKEN ="ERP_TOKEN";
        public static final String HK_REGIONS ="HK_REGIONS";
        public static final String HK_CAMERAS ="HK_CAMERAS";
        public static final String HK_REGIONS_TREE ="HK_REGIONS_TREE";
        public static final String HK_FIRE_DEVICE="HK_FIRE_DEVICE";
        public static final String HK_SENSOR="HK_SENSOR";
        public static final long EXPIRE_TIME = 7200;

        public static final String INTERNAL_TOKEN ="INTERNAL_TOKEN";

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

@@ -327,7 +327,7 @@
        }catch (Exception e){

        }
        /*if(result.size()==0){
        if(result.size()==0){
            //------TODO---------测试模拟数据----start-----
            for (int i = 0; i < 5; i++) {
                PageRegionInfoResponse t = new PageRegionInfoResponse();
@@ -349,6 +349,9 @@
                    t1.setIndexCode(i+"_"+j+"_ChildCode");
                    t1.setParentIndexCode(t.getIndexCode());
                    t1.setCarmeraList(new ArrayList<>());
                    t1.setDeviceList(new ArrayList<>());
                    t1.setSensorList(new ArrayList<>());

                    CarmeraListVO c1= new CarmeraListVO();
                    c1.setName(i+"监控点111"+j);
                    c1.setIndexCode(i+"jkd111"+j);
@@ -357,12 +360,35 @@
                    c1.setName(i+"监控点112"+j);
                    c1.setIndexCode(i+"jkd112"+j);
                    t1.getCarmeraList().add(c1);


                    c1= new CarmeraListVO();
                    c1.setName(i+"传感器111"+j);
                    c1.setIndexCode(i+"cgq111"+j);
                    t1.getSensorList().add(c1);
                    c1= new CarmeraListVO();
                    c1.setName(i+"传感器111112"+j);
                    c1.setIndexCode(i+"cgq112"+j);
                    t1.getSensorList().add(c1);



                    c1= new CarmeraListVO();
                    c1.setName(i+"消防设备111"+j);
                    c1.setIndexCode(i+"xf111"+j);
                    t1.getDeviceList().add(c1);
                    c1= new CarmeraListVO();
                    c1.setName(i+"消防设备111112"+j);
                    c1.setIndexCode(i+"xf112"+j);
                    t1.getDeviceList().add(c1);

                    t.getChildList().add(t1);
                }

                result.add(t);
            }
            //------TODO---------测试模拟数据----end-----
        }*/
        }
        return ApiResponse.success(result);
    }


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

@@ -15,7 +15,6 @@
public class HKUtil {

    private static final Logger logger = LoggerFactory.getLogger(HKUtil.class);

    /**
     * è¯·æ ¹æ®è‡ªå·±çš„appKey和appSecret更换static静态块中的三个参数. [1 host]
     * å¦‚果你选择的是和现场环境对接,host要修改为现场环境的ip,https端口默认为443，http端口默认为80.例如10.33.25.22:443

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

@@ -23,6 +23,10 @@
    private Integer withCameras;
    @ApiModelProperty(value = "设备状态：不在线，1-在线")
    private Integer status;
    @ApiModelProperty(value = "是否强制刷新 0否 1是")
    private int refresh;
    @ApiModelProperty(value = "设备状态描述")
    private String statusName;
    @ApiModelProperty(value = "设备所在位置")
    private String regionName;
}

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

@@ -45,8 +45,10 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -95,6 +97,9 @@
    private PlatformDeviceMapper platformDeviceMapper;
    @Autowired
    private CategoryMapper categoryMapper;

    @Autowired
    private RedisTemplate<String,Object> stringRedisTemplate;
    @Value("${debug_model}")
    private Boolean isDebug;
    /**
@@ -216,6 +221,32 @@
     */
    @Override
    public List<PageRegionInfoResponse> getRegionTree(CarmeraListVO req){
        List<PageRegionInfoResponse> allList =null;
        if(req.getRefresh() == 0){
            //默认取缓存数据
            allList =   (List<PageRegionInfoResponse>) stringRedisTemplate.opsForValue().get(Constants.RedisKeys.HK_REGIONS_TREE);
        }
        if(allList!=null && allList.size()>0){
            return allList;
        }
        allList =  getAllRegionList();
        if(allList==null && allList.size()==0){
            return  allList;
        }
        if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
            initReginCameralList(allList,req );//获取全部监控点数据
        }else  if(Constants.equalsInteger(req.getWithCameras(),Constants.TWO)){
            initReginCameralList(allList,req );//获取全部监控点数据
            initReginFireDeviveList(allList, req);//获取全部监控点数据
            initReginSensorList(allList,req);//获取全部监控点数据
        }
        List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
        //加入缓存
        stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_REGIONS_TREE,data);
        return  data;
    }

    private List<PageRegionInfoResponse> getAllRegionList() {
        List<PageRegionInfoResponse> allList = new ArrayList<>();
        boolean hasNext = true;
        int curTotal = 0;
@@ -242,17 +273,11 @@
            }
            curPage++;
        }
        if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
            initReginCameralList(allList,req.getName());//获取全部监控点数据
        }else  if(Constants.equalsInteger(req.getWithCameras(),Constants.TWO)){
            initReginCameralList(allList,req.getName());//获取全部监控点数据
            initReginFireDeviveList(allList,req.getName());//获取全部监控点数据
            initReginSensorList(allList,req.getName());//获取全部监控点数据
        return allList;
        }
        List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
        return  data;
    }
    private void initReginFireDeviveList(List<PageRegionInfoResponse> allList,String name) {

    private void initReginFireDeviveList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
        String name =req.getName();
        List<CarmeraListVO> carmeraListVOList = fireDeviceList();
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
@@ -268,7 +293,8 @@
            }
        }
    }
    private void initReginSensorList(List<PageRegionInfoResponse> allList,String name) {
    private void initReginSensorList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
        String name =req.getName();
        List<CarmeraListVO> carmeraListVOList = sensorList();
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
@@ -284,7 +310,29 @@
            }
        }
    }
    private void initReginCameralList(List<PageRegionInfoResponse> allList,String name) {
    @PostConstruct
    public void cacheRegionAndDeviceData(){
        log.error("===============缓存海康平台区域设备信息======开始============");
        try {
            CarmeraListVO param  =new CarmeraListVO();
            param.setWithCameras(2);
            List<PageRegionInfoResponse>  resultTree = getRegionTree(param);
            List<PageRegionInfoResponse>  result = getAllRegionList();
            List<CarmeraListVO> carmeraListVOList = initAllReginCameralList(result);
            List<CarmeraListVO> sensorList = sensorList();
            List<CarmeraListVO> fireDeviceList = fireDeviceList();
            stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_REGIONS_TREE,resultTree);
            stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_REGIONS,result);//平铺区域列表
            stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_CAMERAS,carmeraListVOList);//所有监控点数据
            stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_FIRE_DEVICE,fireDeviceList);//所有消防设备数据
            stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_SENSOR,sensorList);//所有传感器
            log.error("===============缓存海康平台区域设备信息======成功============");
        }catch (Exception e){
            log.error("===============缓存海康平台区域设备信息失败==================");
        }
    }
    private void initReginCameralList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
        String name = req.getName();
        CarmeraListVO re = new CarmeraListVO();
        re.setName(name);
        List<CarmeraListVO> carmeraListVOList = cameraList(re);
@@ -296,11 +344,26 @@
                        if(p.getCarmeraList()==null){
                            p.setCarmeraList(new ArrayList<>());
                        }
                        c.setRegionName(p.getName());
                        p.getCarmeraList().add(c);
                    }
                }
            }
        }
    }
    private  List<CarmeraListVO> initAllReginCameralList(List<PageRegionInfoResponse> allList ) {
        CarmeraListVO re = new CarmeraListVO();
        List<CarmeraListVO> carmeraListVOList = cameraList(re);
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())){
                        c.setRegionName(p.getName());
                    }
                }
            }
        }
        return  carmeraListVOList;
    }
    /**
     * èŽ·å–区域树形结构数据
@@ -335,7 +398,7 @@
            curPage++;
        }
        if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
            initReginCameralList(allList,req.getName());//获取全部监控点数据
            initReginCameralList(allList,req);//获取全部监控点数据
        }
        return  allList;
    }
@@ -417,6 +480,7 @@
                t.setReginCode(p.getRegionIndexCode());
                t.setName(p.getCn());
                t.setStatus(p.getUnitStatus());
                t.setRegionName(p.getRegionName());
                 //0：未注册 1：正常 2: ä¿®å¤ä¸­ 3：异常状态
                if(t.getStatus()!=null && t.getStatus() == 0){
                    t.setStatusName("未注册");
@@ -469,6 +533,7 @@
                t.setReginCode(p.getRegionIndexCode());
                t.setName(p.getCn());
                t.setStatus(p.getUnitStatus());
                t.setRegionName(p.getRegionName());
                 //0：未注册 1：正常 2: ä¿®å¤ä¸­ 3：异常状态
                if(t.getStatus()!=null && t.getStatus() == 0){
                    t.setStatusName("未注册");

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

@@ -22,7 +22,7 @@




    void cacheRegionAndDeviceData();
    /**
     * èŽ·å–区域树形结构数据
     * @return