|
|
@ -5,6 +5,7 @@ import java.io.IOException;
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
import java.lang.reflect.Method;
|
|
|
|
import java.lang.reflect.Method;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
|
|
import java.util.Base64;
|
|
|
|
import java.util.Comparator;
|
|
|
|
import java.util.Comparator;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
@ -19,7 +20,6 @@ import org.apache.commons.io.FileExistsException;
|
|
|
|
import org.apache.commons.io.FileUtils;
|
|
|
|
import org.apache.commons.io.FileUtils;
|
|
|
|
import org.apache.ibatis.session.RowBounds;
|
|
|
|
import org.apache.ibatis.session.RowBounds;
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
import org.springframework.security.crypto.codec.Base64;
|
|
|
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
@ -456,7 +456,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
if(petiFileNm.contains(".png")) {
|
|
|
|
if(petiFileNm.contains(".png")) {
|
|
|
|
method = clz.getMethod("getApndfilcont" + idx, null);
|
|
|
|
method = clz.getMethod("getApndfilcont" + idx, null);
|
|
|
|
String petiFileStr = (String)method.invoke(apndFileDTO, null);
|
|
|
|
String petiFileStr = (String)method.invoke(apndFileDTO, null);
|
|
|
|
mfList.add(CommUtils.createMutipartFileFromBytes(petiFileNm, makePath, Base64.decode(petiFileStr.getBytes()), true));
|
|
|
|
mfList.add(CommUtils.createMutipartFileFromBytes(petiFileNm, makePath, Base64.getDecoder().decode(petiFileStr.getBytes()), true));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -506,7 +506,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
method = clz.getMethod("getApndfilcont" + fileIdx, null);
|
|
|
|
method = clz.getMethod("getApndfilcont" + fileIdx, null);
|
|
|
|
String petiFileStr = (String)method.invoke(apndFileDTO, null);
|
|
|
|
String petiFileStr = (String)method.invoke(apndFileDTO, null);
|
|
|
|
|
|
|
|
|
|
|
|
mfList.add(CommUtils.createMutipartFileFromBytes(petiFileNm, makePath, Base64.decode(petiFileStr.getBytes()), true));
|
|
|
|
mfList.add(CommUtils.createMutipartFileFromBytes(petiFileNm, makePath, Base64.getDecoder().decode(petiFileStr.getBytes()), true));
|
|
|
|
|
|
|
|
|
|
|
|
//method.invoke(apndFileDTO, StringUtils.cleanPath(makePath + mf.getOriginalFilename()));
|
|
|
|
//method.invoke(apndFileDTO, StringUtils.cleanPath(makePath + mf.getOriginalFilename()));
|
|
|
|
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
|
|
|
|
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
|
|
|
|