Commit 8d7dbe96 authored by huyuchen's avatar huyuchen

fdd 户配置 代码修改

parent 192f96a5
...@@ -23,7 +23,7 @@ import java.util.List; ...@@ -23,7 +23,7 @@ import java.util.List;
public class UpmsDaprUtils { public class UpmsDaprUtils {
@Autowired @Autowired
private DaprUpmsProperties daprUpmsProperties; private static DaprUpmsProperties daprUpmsProperties;
/** /**
* 获取所有区域数据 * 获取所有区域数据
...@@ -31,7 +31,7 @@ public class UpmsDaprUtils { ...@@ -31,7 +31,7 @@ public class UpmsDaprUtils {
* @Date 2022-07-18 * @Date 2022-07-18
* @return * @return
**/ **/
public R<List<SysArea>> getAreaListR() { public static R<List<SysArea>> getAreaListR() {
R<List<SysArea>> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getSysAreaList","", SysArea.class, SecurityConstants.FROM_IN); R<List<SysArea>> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getSysAreaList","", SysArea.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(areaListR)){ if (Common.isEmpty(areaListR)){
return R.failed("获取所有区域数据失败!"); return R.failed("获取所有区域数据失败!");
......
...@@ -33,6 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper; ...@@ -33,6 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TPreDispatchInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.TPreDispatchInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -50,9 +51,9 @@ import java.util.Map; ...@@ -50,9 +51,9 @@ import java.util.Map;
@RequiredArgsConstructor @RequiredArgsConstructor
public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMapper, TPreDispatchInfo> implements TPreDispatchInfoService { public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMapper, TPreDispatchInfo> implements TPreDispatchInfoService {
private final SysBaseSetInfoMapper sysBaseSetInfoMapper; @Autowired
private SysBaseSetInfoMapper sysBaseSetInfoMapper;
private final UpmsDaprUtils upmsDaprUtils;
/** /**
* 预派单记录简单分页查询 * 预派单记录简单分页查询
* *
...@@ -405,7 +406,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -405,7 +406,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if (null != errorMessage) { if (null != errorMessage) {
return R.failed(errorMessage); return R.failed(errorMessage);
} }
R<List<SysArea>> areaListR = upmsDaprUtils.getAreaListR(); R<List<SysArea>> areaListR = UpmsDaprUtils.getAreaListR();
if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) { if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
return R.failed(PreDispatchConstants.GET_AREA_INFO); return R.failed(PreDispatchConstants.GET_AREA_INFO);
} }
......
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