|
|
@@ -3,6 +3,7 @@ package com.fdkankan.fusion.service.impl;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.date.DatePattern;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import cn.hutool.core.io.FileUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
@@ -34,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.io.File;
|
|
|
import java.io.InputStream;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
@@ -74,6 +76,8 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
|
|
|
|
|
|
@Value("${upload.query-path}")
|
|
|
private String queryPath;
|
|
|
+ @Value("${spring.profiles.active}")
|
|
|
+ private String environment;
|
|
|
@Override
|
|
|
public CaseInquestCriminal saveByParam(CaseInquestCriminal caseInquestCriminal) {
|
|
|
if(caseInquestCriminal.getInquestFileId() == null){
|
|
|
@@ -92,9 +96,14 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
|
|
|
Integer inquestFileId = caseInquestCriminal.getInquestFileId();
|
|
|
CaseFiles caseFiles = caseFilesService.getById(inquestFileId);
|
|
|
XWPFTemplate template = this.getWordByTemplate(caseInquestCriminal);
|
|
|
- String localPath = String.format(FilePath.MNTPATH+FilePath.DOC_OSS_PATH,caseFiles.getFilesId(),caseFiles.getFilesTitle()+".docx");
|
|
|
+ String localPath = String.format(FilePath.MNTPATH+FilePath.DOC_OSS_PATH,environment,caseFiles.getFilesId()+".docx");
|
|
|
+ if(!new File(localPath).getParentFile().exists()){
|
|
|
+ new File(localPath).getParentFile().mkdirs();
|
|
|
+ }
|
|
|
template.writeToFile(localPath );
|
|
|
+ template.close();
|
|
|
ShellUtil.yunUpload(localPath,localPath.replace(FilePath.MNTPATH,""));
|
|
|
+ FileUtil.del(localPath);
|
|
|
caseFiles.setFilesUrl( queryPath +localPath.replace(FilePath.MNTPATH,""));
|
|
|
caseFilesService.updateById(caseFiles);
|
|
|
}catch (Exception e){
|
|
|
@@ -117,7 +126,7 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
|
|
|
String recorderInfo = "%s：姓名 %s 单位 %s 职务 %s\n";
|
|
|
StringBuilder recorderInfoMsg = new StringBuilder();
|
|
|
for (Object object : vo.getRecorderInfo()) {
|
|
|
- JSONObject obj = (JSONObject) object;
|
|
|
+ JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(object));
|
|
|
String format = String.format(recorderInfo,obj.getString("typeLabel"), obj.getString("name"), obj.getString("unit"), obj.getString("job"));
|
|
|
recorderInfoMsg.append(format);
|
|
|
}
|
|
|
@@ -130,7 +139,7 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
|
|
|
String signatureInfo = "本人签名： 单位 %s 职务 %s\n";
|
|
|
StringBuilder signatureInfoMsg = new StringBuilder();
|
|
|
for (Object object : vo.getSignatureInfo()) {
|
|
|
- JSONObject obj = (JSONObject) object;
|
|
|
+ JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(object));
|
|
|
String format = String.format(signatureInfo, obj.getString("unit"), obj.getString("job"));
|
|
|
signatureInfoMsg.append(format);
|
|
|
}
|
|
|
@@ -144,7 +153,7 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
|
|
|
String witnessInfo = "本人签名： 性别 %s 出生日期 %s 住址 %s\n";
|
|
|
StringBuilder witnessInfoMsg = new StringBuilder();
|
|
|
for (Object object : vo.getWitnessInfo()) {
|
|
|
- JSONObject obj = (JSONObject) object;
|
|
|
+ JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(object));
|
|
|
String birthday = DateUtil.format(obj.getDate("birthday"), DatePattern.CHINESE_DATE_FORMAT) == null?"":DateUtil.format(obj.getDate("birthday"), DatePattern.CHINESE_DATE_FORMAT);
|
|
|
String format = String.format(witnessInfo, XwpTemplateUtils.getSexStr(obj.getInteger("sex")), birthday,obj.getString("address"));
|
|
|
witnessInfoMsg.append(format);
|
lyhzzz