解决包名冲突问题
This commit is contained in:
parent
d153882406
commit
e0992a4e73
@ -9,12 +9,14 @@ import cn.com.tenlion.buildingpictures.util.BaiDuMapUtil;
|
|||||||
import cn.com.tenlion.buildingpictures.util.BarCodeUtils;
|
import cn.com.tenlion.buildingpictures.util.BarCodeUtils;
|
||||||
import cn.com.tenlion.buildingpictures.util.CreateImageBean;
|
import cn.com.tenlion.buildingpictures.util.CreateImageBean;
|
||||||
import cn.com.tenlion.buildingpictures.util.WeiXinBarCodeUtils;
|
import cn.com.tenlion.buildingpictures.util.WeiXinBarCodeUtils;
|
||||||
|
import com.github.pagehelper.util.StringUtil;
|
||||||
import ink.wgink.common.base.DefaultBaseService;
|
import ink.wgink.common.base.DefaultBaseService;
|
||||||
import ink.wgink.module.file.service.IFileService;
|
import ink.wgink.module.file.service.IFileService;
|
||||||
import ink.wgink.pojo.pos.FilePO;
|
import ink.wgink.pojo.pos.FilePO;
|
||||||
import ink.wgink.properties.FileProperties;
|
import ink.wgink.properties.FileProperties;
|
||||||
import ink.wgink.util.QRCodeUtil;
|
import ink.wgink.util.QRCodeUtil;
|
||||||
import org.apache.commons.codec.binary.Base64;
|
import org.apache.commons.codec.binary.Base64;
|
||||||
|
import org.apache.commons.codec.binary.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -309,10 +311,14 @@ public class PicturesTemplateBuildingServiceImpl extends DefaultBaseService impl
|
|||||||
key.setAccessible(true);
|
key.setAccessible(true);
|
||||||
if (index.equals(key.getName())) {
|
if (index.equals(key.getName())) {
|
||||||
if (key.getType() == String.class) {
|
if (key.getType() == String.class) {
|
||||||
|
if(key.get(bean) != null) {
|
||||||
|
if(!StringUtil.isEmpty(key.get(bean).toString())) {
|
||||||
content = key.get(bean).toString();
|
content = key.get(bean).toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
CreateImageBean createImageBean = new CreateImageBean();
|
CreateImageBean createImageBean = new CreateImageBean();
|
||||||
if("1".equals(areaDto.getTemplateAreaServerLink())){
|
if("1".equals(areaDto.getTemplateAreaServerLink())){
|
||||||
createImageBean.setFontBold(Integer.valueOf(areaDto.getTemplateAreaFontBold()));
|
createImageBean.setFontBold(Integer.valueOf(areaDto.getTemplateAreaFontBold()));
|
||||||
|
Loading…
Reference in New Issue
Block a user