LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
baozhipeng
2021-09-16 15:21:58 +08:00
parent d3b993fafe 59793dcc21
commit 44faf0e21d
23 changed files with 344 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+25 -1
View File
@@ -6,7 +6,10 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.Result;
@@ -34,6 +37,7 @@ import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.volid.group.UpdateGroup;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining;
import com.jero.util.QrcodeUtil;
import io.swagger.annotations.ApiImplicitParam;
import lombok.extern.slf4j.Slf4j;
@@ -324,6 +328,26 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
wrapper.eq(PayMeeting::getId,id);
wrapper.set(PayMeeting::getMeetingData,fileIds);
payMeetingService.update(wrapper);
List<String> idList = Arrays.asList(fileIds.split(","));
List<OSSFile> ossFiles = iossFileService.listByIds(idList);
for (OSSFile ossFile : ossFiles) {
String url = ossFile.getUrl();
String[] fileUrl = url.split("/");
int length = fileUrl.length;
ossFile.setFileName(fileUrl[length - 1]);
}
Map<String, String> stringStringMap = AuthenticationUtils.encryptByRsaPriKey();
String publicKey = stringStringMap.get("publicKey");
String token = stringStringMap.get("token");
String jsonString1 = JSONObject.toJSONString(ossFiles);
String post = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/addStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString1);
AuthenticationUtils.checkResult(post);
StableCrossTraining stableCrossTraining = new StableCrossTraining();
stableCrossTraining.setId(id);
stableCrossTraining.setMeetingFiles(fileIds);
String jsonString = JSONObject.toJSONString(stableCrossTraining);
String post1 = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/updateStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString);
AuthenticationUtils.checkResult(post1);
return Result.OK("上传资料成功!");
}
@@ -368,7 +392,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
String token = request.getParameter("token");
authenticationUtils.check(token,publicKey);
for (OSSFile ossFile : ossFileList) {
iossFileService.save(ossFile);
iossFileService.saveOrUpdate(ossFile);
}
return Result.OK("新增会议文件成功!");
}