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

add 对接人编辑时取得修改的内容

Browse Source
This commit is contained in:
lijiarao
2021-09-23 11:53:47 +08:00
parent ade7e08a80
commit ba329fcf20
4 changed files with 57 additions and 24 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
+2 -9
View File
@@ -378,18 +378,11 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
int length = fileUrl.length; int length = fileUrl.length;
ossFile.setFileName(fileUrl[length - 1]); ossFile.setFileName(fileUrl[length - 1]);
} }
Map<String, String> stringStringMap = AuthenticationUtils.encryptByRsaPriKey(); AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile",null,ossFiles);
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 stableCrossTraining = new StableCrossTraining();
stableCrossTraining.setId(id); stableCrossTraining.setId(id);
stableCrossTraining.setMeetingFiles(fileIds); stableCrossTraining.setMeetingFiles(fileIds);
String jsonString = JSONObject.toJSONString(stableCrossTraining); AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/updateStandardsFile",null,stableCrossTraining);
String post1 = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/updateStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString);
AuthenticationUtils.checkResult(post1);
} }
return Result.OK("上传资料成功!"); return Result.OK("上传资料成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+2 -2
View File
@@ -131,12 +131,12 @@ public class PayMeetingSituation implements Serializable {
private String speechTopic; private String speechTopic;
/**演讲ppt*/ /**演讲ppt*/
@ApiModelProperty(value = "演讲ppt") @ApiModelProperty(value = "演讲ppt文件")
//@NotBlank(message = "演讲ppt不能为空",groups = Guest.class) //@NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
private String speechPpt; private String speechPpt;
/**照片*/ /**照片*/
@ApiModelProperty(value = "照片") @ApiModelProperty(value = "照片文件")
private String photo; private String photo;
/**个人简介*/ /**个人简介*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+10 -2
View File
@@ -368,7 +368,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
PayMeeting payMeeting = meetingService.getById(meetingId); PayMeeting payMeeting = meetingService.getById(meetingId);
String meetingType = payMeeting.getMeetingType().toString(); String meetingType = payMeeting.getMeetingType().toString();
String id = payMeetingSituationVO.getId(); String id = payMeetingSituationVO.getId();
PayMeetingSituation payMeetingSituation = getById(id); PayMeetingSituation payMeetingSituation = this.getById(id);
//把原始数据保存下来，后面用于判断修改了那些字段
PayMeetingSituation oldObject = new PayMeetingSituation();
BeanUtils.copyProperties(payMeetingSituation, oldObject);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String sysUserId = sysUser.getId(); String sysUserId = sysUser.getId();
if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)){ if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)){
@@ -390,7 +394,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation); PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
//如果是对接人修改的 //如果是对接人修改的
if (sysUserId.equals(payMeetingSituation.getDockId())){ if (sysUserId.equals(payMeetingSituation.getDockId())){
String record = ObjRecordUtil.addRecord(payMeetingSituation, payMeetingSituation1); //判断修改了那些字段
String record = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
if (StringUtils.isNotBlank(record)){ if (StringUtils.isNotBlank(record)){
//TODO 给负责人发送消息 //TODO 给负责人发送消息
} }
@@ -580,6 +585,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingSituation::getMeetingId, meetingId); wrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
wrapper.eq(PayMeetingSituation::getCompanyContactId, contactsManagementId); wrapper.eq(PayMeetingSituation::getCompanyContactId, contactsManagementId);
if (StringUtils.isNotBlank(payMeetingSituation.getId())){
wrapper.ne(PayMeetingSituation::getId,payMeetingSituation.getId());
}
if ((count(wrapper) > 0)) { if ((count(wrapper) > 0)) {
throw new JeroBootException("联系人不能多次参加相同会议"); throw new JeroBootException("联系人不能多次参加相同会议");
} }
jero-boot-incoming-payment/src/main/java/com/jero/util/ObjRecordUtil.java
+43 -11
View File
@@ -1,12 +1,21 @@
package com.jero.util; package com.jero.util;
import cn.hutool.core.date.DateUtil;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.SpringContextUtils;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import javax.annotation.Resource;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Date;
import java.util.Objects;
/** /**
* 比对两个对象，输出变更字段 * 比对两个对象，输出变更字段
*
* @author liJiaRao * @author liJiaRao
* @date 2021-09-22 17:05 * @date 2021-09-22 17:05
*/ */
@@ -16,42 +25,65 @@ public class ObjRecordUtil {
* @param newObj 修改后数据对象 * @param newObj 修改后数据对象
* @return * @return
*/ */
public static String addRecord(Object oldObj, Object newObj){ public static String addRecord(Object oldObj, Object newObj) {
try { try {
// 得到类对象 // 得到类对象
Class<?> class1 = oldObj.getClass(); Class<?> class1 = oldObj.getClass();
Class<?> class2 = newObj.getClass(); Class<?> class2 = newObj.getClass();
if(!class1.equals(class2)){ if (!class1.equals(class2)) {
throw new RuntimeException("请传入两个相同的实体类对象"); throw new RuntimeException("请传入两个相同的实体类对象");
} }
// 得到属性集合 // 得到属性集合
Field[] fields1 = class1.getDeclaredFields(); Field[] fields1 = class1.getDeclaredFields();
Field[] fields2 = class2.getDeclaredFields(); Field[] fields2 = class2.getDeclaredFields();
StringBuilder info = new StringBuilder(); StringBuilder info = new StringBuilder();
Long id = null; String id = null;
for (Field field1 : fields1) { for (Field field1 : fields1) {
field1.setAccessible(true); // 设置属性是可以访问的(私有的也可以) field1.setAccessible(true); // 设置属性是可以访问的(私有的也可以)
if(id == null && field1.getName().equals("id")){ if (id == null && field1.getName().equals("id")) {
id = (Long)field1.get(oldObj); id = (String) field1.get(oldObj);
} }
for (Field field2 : fields2) { for (Field field2 : fields2) {
field2.setAccessible(true); // 设置属性是可以访问的(私有的也可以) field2.setAccessible(true); // 设置属性是可以访问的(私有的也可以)
if(field1.equals(field2)){ // 比较属性名是否一样 if (field1.equals(field2)) { // 比较属性名是否一样
if(field2.get(newObj) == null || StringUtils.isEmpty(field2.get(newObj) + "")){ if (field2.get(newObj) == null || StringUtils.isEmpty(field2.get(newObj) + "")) {
break; // 属性名称一样就退出二级循环 break; // 属性名称一样就退出二级循环
} }
if(!field1.get(oldObj).equals(field2.get(newObj))){ // 比较属性值是否一样 if (!Objects.equals(field1.get(oldObj), field2.get(newObj))) { // 比较属性值是否一样
// 得到注解 // 得到注解
ApiModelProperty pn = field1.getAnnotation(ApiModelProperty.class); ApiModelProperty pn = field1.getAnnotation(ApiModelProperty.class);
if(pn != null){ Dict dict = field1.getAnnotation(Dict.class);
info.append(pn.value()).append(":\"").append(field1.get(oldObj)).append("\" 改成 \"").append(field2.get(newObj)).append("\","); if (pn != null) {
Object old = field1.get(oldObj);
Object newo = field2.get(newObj);
if (pn.value().contains("id")) {
break;
} else if (pn.value().contains("文件")) {
info.append(pn.value()).append("修改了,");
} else if (pn.value().contains("时间")) {
DateTimeFormat dateTimeFormat = field1.getAnnotation(DateTimeFormat.class);
String pattern = dateTimeFormat.pattern();
old = DateUtil.format((Date) old, pattern);
newo = DateUtil.format((Date) newo, pattern);
info.append(pn.value()).append(":\"").append(old).append("\" 改成 \"").append(newo).append("\",");
} else if (dict != null) {
String dicCode = dict.dicCode();
ISysBaseAPI sysBaseAPI = SpringContextUtils.getBean(ISysBaseAPI.class);
old = sysBaseAPI.translateDict(dicCode, String.valueOf(old));
newo = sysBaseAPI.translateDict(dicCode, String.valueOf(newo));
info.append(pn.value()).append(":\"").append(old).append("\" 改成 \"").append(newo).append("\",");
} else {
info.append(pn.value()).append(":\"").append(old).append("\" 改成 \"").append(newo).append("\",");
}
} }
} }
break; // 属性名称一样就退出二级循环 break; // 属性名称一样就退出二级循环
} }
} }
} }
if(info.length() != 0){ if (info.length() != 0) {
// 设置日志信息 // 设置日志信息
return info.substring(0, info.length() - 1); return info.substring(0, info.length() - 1);
} }