Commit 1e31d3d0 authored by 赵啸非's avatar 赵啸非

修改获取站点信息通过redis获取

parent 0f210396
...@@ -6,6 +6,7 @@ import com.mortals.framework.common.Rest; ...@@ -6,6 +6,7 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.service.ICacheService; import com.mortals.framework.service.ICacheService;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.site.SitePdu; import com.mortals.xhx.common.pdu.site.SitePdu;
import com.mortals.xhx.feign.site.ISiteFeign; import com.mortals.xhx.feign.site.ISiteFeign;
import com.mortals.xhx.module.pj.model.PjEvaluateEntity; import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
...@@ -127,6 +128,23 @@ public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueue ...@@ -127,6 +128,23 @@ public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueue
log.info("站点信息不存在,siteId={}", entity.getSiteId()); log.info("站点信息不存在,siteId={}", entity.getSiteId());
} }
}*/ }*/
} else {
if (!ObjectUtils.isEmpty(entity.getSiteCode())) {
SitePdu pdu = new SitePdu();
pdu.setSiteCode(entity.getSiteCode());
Rest<RespData<List<SitePdu>>> sitePduRest = siteFeign.list(pdu);
if (YesNoEnum.YES.getValue() == sitePduRest.getCode()) {
List<SitePdu> list = sitePduRest.getData().getData();
if (!ObjectUtils.isEmpty(list)) {
entity.setSiteCode(list.get(0).getSiteCode());
entity.setSiteName(list.get(0).getSiteName());
} else {
log.info("站点信息不存在,siteId={}", entity.getSiteId());
}
}
}
} }
} }
......
...@@ -6,6 +6,7 @@ import com.mortals.framework.common.Rest; ...@@ -6,6 +6,7 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.service.ICacheService; import com.mortals.framework.service.ICacheService;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.site.SitePdu; import com.mortals.xhx.common.pdu.site.SitePdu;
import com.mortals.xhx.feign.site.ISiteFeign; import com.mortals.xhx.feign.site.ISiteFeign;
import com.mortals.xhx.module.ph.model.PhQueueEntity; import com.mortals.xhx.module.ph.model.PhQueueEntity;
...@@ -129,6 +130,23 @@ public class PjEvaluateController extends BaseCRUDJsonBodyMappingController<PjEv ...@@ -129,6 +130,23 @@ public class PjEvaluateController extends BaseCRUDJsonBodyMappingController<PjEv
log.info("站点信息不存在,siteId={}", entity.getSiteId()); log.info("站点信息不存在,siteId={}", entity.getSiteId());
} }
}*/ }*/
} else {
if (!ObjectUtils.isEmpty(entity.getSiteCode())) {
SitePdu pdu = new SitePdu();
pdu.setSiteCode(entity.getSiteCode());
Rest<RespData<List<SitePdu>>> sitePduRest = siteFeign.list(pdu);
if (YesNoEnum.YES.getValue() == sitePduRest.getCode()) {
List<SitePdu> list = sitePduRest.getData().getData();
if (!ObjectUtils.isEmpty(list)) {
entity.setSiteCode(list.get(0).getSiteCode());
entity.setSiteName(list.get(0).getSiteName());
} else {
log.info("站点信息不存在,siteId={}", entity.getSiteId());
}
}
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment