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