Merge branch 'feature/REQ-3045' into dev

This commit is contained in:
yanglin 2024-10-18 18:37:50 +08:00
commit 42fe74a7ca
9 changed files with 52 additions and 0 deletions

View File

@ -1,5 +1,6 @@
package cn.axzo.msg.center.service.pending.response.v3.model;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@ -11,4 +12,9 @@ import lombok.RequiredArgsConstructor;
public class ComponentWorkerGroup {
private final ParsedGroupV3 group;
private final Long workerIdentityId;
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -87,4 +87,9 @@ public class ParsedButtonV3 implements MessageButton {
public String key() {
return code;
}
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.pending.response.v3.model;
import cn.axzo.msg.center.service.domain.DetailConfig;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
@ -35,4 +36,9 @@ public class ParsedGroupInfo {
if (keyValues == null) return;
keyValues.removeIf(ParsedKV::isValueEmpty);
}
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.pending.response.v3.model;
import cn.axzo.msg.center.service.enums.GroupType;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
import lombok.Setter;
@ -45,4 +46,9 @@ public class ParsedGroupV3 {
public List<ParsedKV> determineKeyValues() {
return groupInfo == null ? Collections.emptyList() : groupInfo.getKeyValues();
}
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.pending.response.v3.model;
import cn.axzo.msg.center.service.enums.KVContentType;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
@ -51,4 +52,9 @@ public class ParsedKV {
* contentType=PERSON_ID时的人员信息, 由yoke填充
*/
private PersonInfo personInfo;
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -2,6 +2,7 @@ package cn.axzo.msg.center.service.pending.response.v3.model;
import cn.axzo.msg.center.service.enums.GroupType;
import cn.axzo.msg.center.service.pending.response.MessageButtonProvider;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
@ -99,4 +100,9 @@ public class ParsedModelV3 implements MessageButtonProvider<ParsedButtonV3> {
public List<ParsedButtonV3> buttons() {
return buttons;
}
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -5,6 +5,7 @@ import cn.axzo.msg.center.service.enums.CardUrlOpenStrategy;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.StatusEnum;
import cn.axzo.msg.center.service.enums.YesOrNo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.Getter;
import lombok.Setter;
@ -90,4 +91,8 @@ public class ParsedTemplateV3 {
*/
private YesOrNo displayOnList;
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.pending.response.v3.model;
import cn.axzo.trade.datasecurity.sd.extension.annotation.SDCellPhoneField;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
import lombok.Setter;
@ -30,4 +31,9 @@ public class PersonInfo {
* 加密手机号
*/
private String mobilePhoneCiphertext;
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

View File

@ -2,6 +2,7 @@ package cn.axzo.msg.center.service.pending.response.v3.model;
import cn.axzo.trade.datasecurity.sd.extension.annotation.SDCellPhoneField;
import cn.axzo.trade.datasecurity.sd.extension.annotation.SDIdCardField;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
import lombok.Setter;
@ -60,4 +61,9 @@ public class WorkerInfo {
* 工种
*/
private String professionNames;
@Override
public String toString() {
return JSON.toJSONString(this);
}
}