|
|
@ -20,6 +20,8 @@ import cokr.xit.base.file.web.FileInfoFactory;
|
|
|
|
import cokr.xit.base.user.ManagedUser;
|
|
|
|
import cokr.xit.base.user.ManagedUser;
|
|
|
|
import cokr.xit.base.user.dao.UserMapper;
|
|
|
|
import cokr.xit.base.user.dao.UserMapper;
|
|
|
|
import cokr.xit.fims.crdn.Crdn;
|
|
|
|
import cokr.xit.fims.crdn.Crdn;
|
|
|
|
|
|
|
|
import cokr.xit.fims.crdn.Team;
|
|
|
|
|
|
|
|
import cokr.xit.fims.crdn.dao.CrdnTeamMapper;
|
|
|
|
import cokr.xit.fims.crdn.dao.GlobalStngMapper;
|
|
|
|
import cokr.xit.fims.crdn.dao.GlobalStngMapper;
|
|
|
|
import cokr.xit.fims.crdn.parsing.SingleFileParser;
|
|
|
|
import cokr.xit.fims.crdn.parsing.SingleFileParser;
|
|
|
|
import cokr.xit.fims.crdn.service.CrdnService;
|
|
|
|
import cokr.xit.fims.crdn.service.CrdnService;
|
|
|
@ -48,7 +50,8 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
|
|
|
|
private GlobalStngMapper globalStngMapper;
|
|
|
|
private GlobalStngMapper globalStngMapper;
|
|
|
|
@Resource(name="userMapper")
|
|
|
|
@Resource(name="userMapper")
|
|
|
|
protected UserMapper userMapper;
|
|
|
|
protected UserMapper userMapper;
|
|
|
|
|
|
|
|
@Resource(name = "crdnTeamMapper")
|
|
|
|
|
|
|
|
private CrdnTeamMapper crdnTeamMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public int createCrdns(List<String> interfaceSequences) {
|
|
|
|
public int createCrdns(List<String> interfaceSequences) {
|
|
|
@ -143,7 +146,22 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
|
|
|
|
crdn.setMoscX(metaFileInfo.string("MOSC_X"));
|
|
|
|
crdn.setMoscX(metaFileInfo.string("MOSC_X"));
|
|
|
|
crdn.setMoscY(metaFileInfo.string("MOSC_Y"));
|
|
|
|
crdn.setMoscY(metaFileInfo.string("MOSC_Y"));
|
|
|
|
|
|
|
|
|
|
|
|
//metaFileInfo.string("EQPMNT_CD");
|
|
|
|
if(crdn.getTaskSeCd().equals("PVS") || crdn.getTaskSeCd().equals("BPV")) {
|
|
|
|
|
|
|
|
if(!crdn.getCrdnSeCd().equals("") && !metaFileInfo.string("EQPMNT_CD").equals("")) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Team team = new Team();
|
|
|
|
|
|
|
|
team.setSggCd(crdn.getSggCd());
|
|
|
|
|
|
|
|
team.setTaskSeCd(taskSeCd);
|
|
|
|
|
|
|
|
team.setTeamNm(metaFileInfo.string("EQPMNT_CD"));
|
|
|
|
|
|
|
|
DataObject teamInfo = crdnTeamMapper.selectTeamInfoByName(team);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(teamInfo != null && crdn.getCrdnSeCd().equals(teamInfo.string("CRDN_SE_CD"))) {
|
|
|
|
|
|
|
|
crdn.setTeamId(teamInfo.string("TEAM_ID"));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//metaFileInfo.string("PLATE_WIDTH");
|
|
|
|
//metaFileInfo.string("PLATE_WIDTH");
|
|
|
|
//metaFileInfo.string("PLATE_HEIGHT");
|
|
|
|
//metaFileInfo.string("PLATE_HEIGHT");
|
|
|
|
|
|
|
|
|
|
|
|