feat: There is no way the ES BUSS
This commit is contained in:
@@ -69,81 +69,57 @@ public class SendBussMQService {
|
||||
|
||||
public void insertOrUpdateBussInfo(Map<String,Object> bussMap) throws Exception {
|
||||
String addOrUpdate = bussMap.get("addOrUpdate").toString();
|
||||
String sarBuss = bussMap.get("sarBuss").toString();
|
||||
JSONObject jsonobject = JSONObject.fromObject(sarBuss);
|
||||
SarBussionessStand infoEO = (SarBussionessStand) JSONObject.toBean(jsonobject,SarBussionessStand.class);
|
||||
String FZRQFSRQ = null;
|
||||
if ("updateFromAct".equals(addOrUpdate)){
|
||||
addOrUpdate = "update";
|
||||
FZRQFSRQ = "1";
|
||||
}
|
||||
String sarBuss = bussMap.get("sarBuss").toString();
|
||||
JSONObject jsonobject = JSONObject.fromObject(sarBuss);
|
||||
SarBussionessStand infoEO = (SarBussionessStand) JSONObject.toBean(jsonobject, SarBussionessStand.class);
|
||||
String jsonobject1 = infoEO.getSarStandAttrEOStr();
|
||||
Map<String,Object> map1 = new HashMap<>();
|
||||
if (StringUtils.isEmpty(jsonobject1)){
|
||||
map1.put("null","null");
|
||||
}else {
|
||||
map1 = JSONObject.fromObject(jsonobject1);
|
||||
}
|
||||
|
||||
String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
|
||||
Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
|
||||
Map<String,Object> infoMap = infoEO.getAttrInfoCaseMap();
|
||||
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
//修改索引信息表
|
||||
// 往索引表中插入数据
|
||||
String baseSearchContent = "";
|
||||
String getCodeName = "";
|
||||
Map<String,Object> saveMap = new HashMap<>();
|
||||
String a = null;
|
||||
try{
|
||||
a = sdf.format(infoEO.getIssueTime());
|
||||
saveMap.put("issue_time"," "+a);
|
||||
}catch (Exception e){
|
||||
saveMap.put("issue_time"," ");
|
||||
}
|
||||
|
||||
|
||||
|
||||
//发布日期 高级查询
|
||||
saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime()));
|
||||
Date issue_time_data = null;
|
||||
if (StringUtils.isNotBlank(a)) {
|
||||
if (StringUtils.isNotBlank(infoEO.getIssueTime())) {
|
||||
try {
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
issue_time_data = format.parse(saveMap.get("issue_time")+" 00:00:00");
|
||||
issue_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00");
|
||||
} catch (ParseException ignored) {
|
||||
}
|
||||
}
|
||||
if (issue_time_data != null) {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(issue_time_data);
|
||||
int month = calendar.get(Calendar.MONTH)+1;
|
||||
String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH));
|
||||
saveMap.put("issue_time_data",Long.valueOf(times));
|
||||
saveMap.put("issue_time_data",issue_time_data.getTime());
|
||||
}else{
|
||||
saveMap.put("issue_time_data",-1000000000000000000L);
|
||||
}
|
||||
|
||||
try{
|
||||
saveMap.put("put_time"," "+ sdf.format(infoEO.getPutTime()));
|
||||
}catch (Exception e){
|
||||
saveMap.put("put_time"," ");
|
||||
}
|
||||
|
||||
//实施日期 高级查询
|
||||
saveMap.put("putTime",dateFormatToStr(infoEO.getPutTime()));
|
||||
Date put_time_data = null;
|
||||
if (StringUtils.isNotBlank(a)) {
|
||||
if (StringUtils.isNotBlank(infoEO.getPutTime())) {
|
||||
try {
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
put_time_data = format.parse(saveMap.get("put_time")+" 00:00:00");
|
||||
put_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00");
|
||||
} catch (ParseException ignored) {
|
||||
}
|
||||
}
|
||||
if (put_time_data != null) {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(put_time_data);
|
||||
int month = calendar.get(Calendar.MONTH)+1;
|
||||
String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH));
|
||||
saveMap.put("put_time_data",Long.valueOf(times));
|
||||
saveMap.put("put_time_data",put_time_data.getTime());
|
||||
}else{
|
||||
saveMap.put("put_time_data",-1000000000000000000L);
|
||||
}
|
||||
// saveMap.put("put_time",sdf.format(infoEO.getPutTime()));
|
||||
|
||||
saveMap.put("id",infoEO.getId());
|
||||
saveMap.put("standSort",infoEO.getStandSort());
|
||||
@@ -172,6 +148,13 @@ public class SendBussMQService {
|
||||
String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandStatus());
|
||||
saveMap.put("standstateshow",codeName);
|
||||
}
|
||||
String textStatusBussName = "";
|
||||
if(infoEO.getTextStatusBuss() != null && StringUtils.isNotBlank(infoEO.getTextStatusBuss())){
|
||||
List<String> valArr = Arrays.asList(infoEO.getTextStatusBuss().split(","));
|
||||
textStatusBussName = dicTypeEODao.getDicNamesByCodes(valArr);
|
||||
}
|
||||
saveMap.put("textStatusBuss",infoEO.getTextStatusBuss());
|
||||
saveMap.put("textStatusBussName",textStatusBussName);
|
||||
//新加字段
|
||||
saveMap.put("country",infoEO.getApplyCountry());
|
||||
if(StringUtils.isNotEmpty(infoEO.getApplyCountry())){
|
||||
@@ -179,10 +162,6 @@ public class SendBussMQService {
|
||||
saveMap.put("countryShow",codeName);
|
||||
}
|
||||
// 自定义属性字段
|
||||
String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
|
||||
Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
|
||||
Map<String,Object> infoMap = infoEO.getAttrInfoMap();
|
||||
|
||||
if (attrInfoMap != null && !attrInfoMap.isEmpty()) {
|
||||
attrInfoMap = sysInfoEOService.changeSelectInfo(attrInfoMap, "stand",baseSearchContent);
|
||||
saveMap.putAll(attrInfoMap);
|
||||
|
||||
Reference in New Issue
Block a user