|
@@ -164,24 +164,28 @@ public class TemplateMessageServiceImpl extends ServiceImpl<TemplateMessageMappe
|
|
|
message=messageList.get(0);
|
|
|
TemplateMessage templateMessage;
|
|
|
if(templateMsgId==null ||templateMsgId.equals(0)){
|
|
|
- List<String>fields= getSendDataTemp(message.getContent());
|
|
|
+ Map<String,List<String>> map = getSendDataTemp(message.getContent());
|
|
|
+ List<String> listPrefix = map.get("listPrefix");
|
|
|
+ List<String> listField = map.get("listField");
|
|
|
JSONObject jo =new JSONObject();
|
|
|
JSONObject j1;
|
|
|
JSONArray ja =new JSONArray();
|
|
|
JSONObject ja1;
|
|
|
- for(String field:fields){
|
|
|
+ for(int i=0;i<listField.size();i++){
|
|
|
j1=new JSONObject();
|
|
|
- ja1=new JSONObject();
|
|
|
j1.put("value","");
|
|
|
j1.put("color","#000000");
|
|
|
- jo.put(field,j1);
|
|
|
+ j1.put("prefix",listPrefix.get(i));
|
|
|
+ jo.put(listField.get(i),j1);
|
|
|
+ ja1=new JSONObject();
|
|
|
ja1.put("value","");
|
|
|
ja1.put("color","#000000");
|
|
|
- ja1.put("lable",field);
|
|
|
- ja1.put("message",field+"未填写");
|
|
|
+ ja1.put("lable",listField.get(i));
|
|
|
+ ja1.put("message",listField.get(i)+"未填写");
|
|
|
+ ja1.put("prefix",listPrefix.get(i));
|
|
|
ja.add(ja1);
|
|
|
}
|
|
|
- templateMessage=new TemplateMessage(String.join(",",fields),jo.toJSONString(),message.getMsgId(),appId,templateId);
|
|
|
+ templateMessage=new TemplateMessage(String.join(",",listField),jo.toJSONString(),message.getMsgId(),appId,templateId);
|
|
|
templateMessage.setContentValueList(ja);
|
|
|
templateMessage.setExample(message.getExample());
|
|
|
templateMessage.setContent(message.getContent());
|
|
@@ -199,6 +203,7 @@ public class TemplateMessageServiceImpl extends ServiceImpl<TemplateMessageMappe
|
|
|
ja1.put("value",jaValue.get("value")!=null?jaValue.get("value").toString():"");
|
|
|
ja1.put("color",jaValue.get("color")!=null?jaValue.get("color").toString():"#000000");
|
|
|
ja1.put("message",field+"未填写");
|
|
|
+ ja1.put("prefix",jaValue.get("prefix")!=null?jaValue.get("prefix").toString():"");
|
|
|
ja.add(ja1);
|
|
|
}
|
|
|
templateMessage.setContentValueList(ja);
|
|
@@ -298,18 +303,25 @@ public class TemplateMessageServiceImpl extends ServiceImpl<TemplateMessageMappe
|
|
|
return new ResultInfo(ResultInfo.TYPE_RESULT_SUCCESS,200,"参数验证通过");
|
|
|
}
|
|
|
|
|
|
- private static List<String> getSendDataTemp(String content) {
|
|
|
- List<String> list = new ArrayList<>();
|
|
|
+ private static Map<String,List<String>> getSendDataTemp(String content) {
|
|
|
+ List<String> listPrefix = new ArrayList<>();
|
|
|
+ List<String> listField = new ArrayList<>();
|
|
|
int beginWord = content.indexOf("{{");
|
|
|
int endWord = -1;
|
|
|
String word;
|
|
|
+ String prefix;
|
|
|
while (beginWord > -1) {
|
|
|
- endWord = content.indexOf("}}")+2;
|
|
|
+ endWord = content.indexOf("}}") + 2;
|
|
|
word = content.substring(beginWord, endWord);
|
|
|
+ prefix = content.substring(0, beginWord).replace("\r", "").replace("\n", "");
|
|
|
content = content.substring(endWord);
|
|
|
- list.add(word.replace("{{","").replace("}}","").replace(".DATA",""));
|
|
|
+ listField.add(word.replace("{{", "").replace("}}", "").replace(".DATA", ""));
|
|
|
+ listPrefix.add(prefix);
|
|
|
beginWord = content.indexOf("{{");
|
|
|
}
|
|
|
- return list;
|
|
|
+ Map<String, List<String>> map = new HashMap<>();
|
|
|
+ map.put("listField", listField);
|
|
|
+ map.put("listPrefix", listPrefix);
|
|
|
+ return map;
|
|
|
}
|
|
|
}
|