diff --git a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java index 9e9e824..bf28991 100644 --- a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java @@ -7,9 +7,7 @@ import com.xydl.cac.model.BindingModel; import com.xydl.cac.model.ColumnModel; import com.xydl.cac.model.Response; import com.xydl.cac.repository.*; -import com.xydl.cac.service.DataService; -import com.xydl.cac.service.ModevTypeService; -import com.xydl.cac.service.ParamBindService; +import com.xydl.cac.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -48,6 +46,10 @@ public class ParamBindServiceImpl implements ParamBindService { RptparamindexRepository rptparamindexRepository; @Resource DataService dataService; + @Resource + JgService jgService; + @Resource + ZsbService zsbService; @Override public List getTrunk() throws Exception { @@ -72,12 +74,12 @@ public class ParamBindServiceImpl implements ParamBindService { for (Bdz bdz : bdzList) { bdzMap.put(bdz.getId(), bdz); } - List jgList = jgRepository.findAll(); + List jgList = jgService.listAll(null); HashMap jgMap = new HashMap<>(); for (Jg jg : jgList) { jgMap.put(jg.getId(), jg); } - List zsbList = zsbRepository.findAll(); + List zsbList = zsbService.listAll(null); HashMap zsbMap = new HashMap<>(); for (Zsb zsb : zsbList) { zsbMap.put(zsb.getId(), zsb);