补充

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -1314,7 +1314,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         jsonObject.put("type",1);
         String videoData = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.VIDEO_LOGIN_URL, jsonObject.toString()).getData();
         JSONObject toResult = JSON.parseObject(videoData);
-        JSONObject data = (JSONObject) toResult.get(videoData);
+        if(!"0".equals(toResult.getString("code"))){
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"视频验签失败");
+        }
+        JSONObject data = (JSONObject) toResult.get("data");
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
         userTokenResultDTO.setCustomerId(customerId);
         userTokenResultDTO.setToken((String) data.get("token"));

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMonitoringDeviceController.java

@@ -29,9 +29,7 @@ import com.epmet.service.IcMonitoringDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
+
 
 
 /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMonitoringDeviceServiceImpl.java

@@ -20,17 +20,22 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.SecurityUser;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.dao.IcMonitoringDeviceDao;
 import com.epmet.dto.result.yt.IcMonitoringDeviceDTO;
 import com.epmet.entity.IcMonitoringDeviceEntity;
 import com.epmet.service.IcMonitoringDeviceService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -49,7 +54,11 @@ public class IcMonitoringDeviceServiceImpl extends BaseServiceImpl<IcMonitoringD
     public PageData<IcMonitoringDeviceDTO> page(PageFormDTO formDTO) {
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         QueryWrapper<IcMonitoringDeviceEntity> wrapper = new QueryWrapper<>();
-//        wrapper.eq("AGENCY_ID",SecurityUser.getDeptId());
+        String userID = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
+        wrapper.eq("DEL_FLAG","0");
+        //1.获取当前工作人员缓存信息
+//        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo("1535072605621841922", userID);
+//        wrapper.like(StringUtils.isNotBlank(SecurityUser.getDeptId().toString()), "AGENCY_ID", staffInfo.getAgencyId());
         List<IcMonitoringDeviceEntity> list = baseDao.selectList(wrapper);
         List<IcMonitoringDeviceDTO> icMonitoringDeviceDTOS = ConvertUtils.sourceToTarget(list, IcMonitoringDeviceDTO.class);
         PageInfo<IcMonitoringDeviceDTO> pageInfo = new PageInfo<>(icMonitoringDeviceDTOS);