Browse Source

修正属性大小写异常

master
xyiege 3 years ago
parent
commit
2b743376a5
  1. 30
      src/main/java/cn/chjyj/szwh/bean/OrderGoodsSource.java
  2. 4
      src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
  3. 6
      src/main/java/cn/chjyj/szwh/utils/SzOrderUtils.java

30
src/main/java/cn/chjyj/szwh/bean/OrderGoodsSource.java

@ -31,12 +31,12 @@ public class OrderGoodsSource implements Serializable {
private String sourceFragment;//源片段
private String targetName;//目标名称-->整体目标作品名称
private String targetNameType;//目标名称类型-->目标标识符类型:ISBN/ISLI
private String targetidentify;//目标标识符-->整体目标标识符:目标标识符类型 + 目标标识符(ISBN000000XXXXXX)
private String targetIdentify;//目标标识符-->整体目标标识符:目标标识符类型 + 目标标识符(ISBN000000XXXXXX)
private String targetFragment;//目标片段
private String targetformat;//目标类型:服务关联创建的实体(1:其他文献/2:音频/3:视频/4:图片/5:文化产品)
private String targetFormat;//目标类型:服务关联创建的实体(1:其他文献/2:音频/3:视频/4:图片/5:文化产品)
private String sourceData;//isli元数据(其他文献实体/音频实体/视频实体/): json格式
private String targetData;//isli元数据(其他文献实体/音频实体/视频实体/): json格式
private String metadataxml;//isli元数据(其他文献实体/音频实体/视频实体/): json格式
private String metadataXml;//isli元数据(其他文献实体/音频实体/视频实体/): json格式
private String cancellationReason;//注销说明
private Date cancellationtime;//注销时间
private Date allocationtime;//分配日期
@ -165,12 +165,12 @@ public class OrderGoodsSource implements Serializable {
this.targetNameType = targetNameType;
}
public String getTargetidentify() {
return targetidentify;
public String getTargetIdentify() {
return targetIdentify;
}
public void setTargetidentify(String targetidentify) {
this.targetidentify = targetidentify;
public void setTargetIdentify(String targetIdentify) {
this.targetIdentify = targetIdentify;
}
public String getTargetFragment() {
@ -181,12 +181,12 @@ public class OrderGoodsSource implements Serializable {
this.targetFragment = targetFragment;
}
public String getTargetformat() {
return targetformat;
public String getTargetFormat() {
return targetFormat;
}
public void setTargetformat(String targetformat) {
this.targetformat = targetformat;
public void setTargetFormat(String targetFormat) {
this.targetFormat = targetFormat;
}
public String getSourceData() {
@ -205,12 +205,12 @@ public class OrderGoodsSource implements Serializable {
this.targetData = targetData;
}
public String getMetadataxml() {
return metadataxml;
public String getMetadataXml() {
return metadataXml;
}
public void setMetadataxml(String metadataxml) {
this.metadataxml = metadataxml;
public void setMetadataXml(String metadataXml) {
this.metadataXml = metadataXml;
}
public String getCancellationReason() {

4
src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@ -305,7 +305,7 @@ public class OrderServiceImpl implements OrderService {
info.put("identifier", odsJson.getString("identifier"));
//符合条件的数量
int count = goodsSourceMapper.countGoodSource(dv.getGoods_islicode(), 1, ods.getSourceidentify());
int count = goodsSourceMapper.countGoodSource(dv.getGoods_islicode(), 1, ods.getSourceIdentify());
info.put("count", count);
gatherList.add(info);
} else {
@ -315,7 +315,7 @@ public class OrderServiceImpl implements OrderService {
info.put("registerDate", odsJson.getString("registerDate"));
info.put("identifier", odsJson.getString("identifier"));
//符合条件的数量
int count = goodsSourceMapper.countGoodSource(dv.getGoods_islicode(), 1, ods.getSourceidentify());
int count = goodsSourceMapper.countGoodSource(dv.getGoods_islicode(), 1, ods.getSourceIdentify());
info.put("count", count);
info.put("filesize", SzFileUtils.fileSizeFormat(filesize));
info.put("metadataFileFormat", odsJson.getString("metadataFileFormat"));

6
src/main/java/cn/chjyj/szwh/utils/SzOrderUtils.java

@ -105,11 +105,11 @@ public class SzOrderUtils {
String targetNameType=StringUtils.isNotBlank(goodsSource.getTargetNameType())?goodsSource.getTargetNameType():"";//目标名称类型-->目标标识符类型:ISBN/ISLI
ors.setTargetNameType(targetNameType);
String targetidentify= StringUtils.isNotBlank(goodsSource.getTargetIdentify())?goodsSource.getTargetIdentify():"";//目标标识符-->整体目标标识符:目标标识符类型 + 目标标识符(ISBN000000XXXXXX)
ors.setTargetidentify(targetidentify);
ors.setTargetIdentify(targetidentify);
String targetFragment = StringUtils.isNotBlank(goodsSource.getTargetFragment())?goodsSource.getTargetFragment():"";//目标片段
ors.setTargetFragment(targetFragment);
String targetformat = StringUtils.isNotBlank(goodsSource.getTargetFormat())?goodsSource.getTargetFormat():"";//目标类型:服务关联创建的实体(1:其他文献/2:音频/3:视频/4:图片/5:文化产品)
ors.setTargetformat(targetformat);
ors.setTargetFormat(targetformat);
//重新拼装sourceData
// isli元数据(其他文献实体/音频实体/视频实体/): json格式
if(StringUtils.isNotBlank(goodsSource.getSourceData())){
@ -134,7 +134,7 @@ public class SzOrderUtils {
ors.setTargetData("");
}
String metadataxml = StringUtils.isNotBlank(goodsSource.getMetadataXml())?goodsSource.getMetadataXml():"";//isli元数据(其他文献实体/音频实体/视频实体/): json格式
ors.setMetadataxml(metadataxml);
ors.setMetadataXml(metadataxml);
String cancellationReason = StringUtils.isNotBlank(goodsSource.getCancellationReason())?goodsSource.getCancellationReason():"";//注销说明
ors.setCancellationReason(cancellationReason);
Date cancellationtime = goodsSource.getCancellationtime()!=null?goodsSource.getCancellationtime():null;//注销时间

Loading…
Cancel
Save