FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-08-13 16:44:17 +08:00
parent 699b1ef9c4 ecb5d3a67e
commit c660c36d40
8 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java
+10
View File
@@ -75,9 +75,15 @@ public class SendStandMQService {
String sarStandards = standMap.get("sarStandards").toString();
JSONObject jsonobject = JSONObject.fromObject(sarStandards);
SarStandardsInfo infoEO = (SarStandardsInfo) JSONObject.toBean(jsonobject,SarStandardsInfo.class);
if(infoEO.getMapItems() == null || infoEO.getMapItems().isEmpty()){
if(jsonobject.get("mapItems") != null){
infoEO.setMapItems(net.sf.json.JSONObject.fromObject(jsonobject.get("mapItems")));
}
}
String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
Map<String,Object> infoMap = infoEO.getAttrInfoMap();
Map<String,String> infoEOMapItems = infoEO.getMapItems();
// 往索引表中插入数据
String getCodeName = "";
@@ -182,6 +188,10 @@ public class SendStandMQService {
saveMap.put(field+"Name",fieldValue);
}
if(infoEOMapItems != null && !infoEOMapItems.isEmpty()){
saveMap.put("mapItems",infoEOMapItems);
}
//当建立代替时，产生的没有文件的问题
if (StringUtils.isBlank(String.valueOf(saveMap.get("content")))) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java
+2
View File
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Set;
@@ -20,6 +21,7 @@ import java.util.Set;
* @since 2021-06-01
*/
@Mapper
@Repository
public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+7 -4
View File
@@ -96,20 +96,23 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if (null != page.getNowOrderBy()) {
switch (page.getNowOrderBy()) {
case 1:
page.setOrderBy1("issueTime");
page.setOrderBy1("issueTime");//发布日期
break;
case 2:
page.setOrderBy1("XCXSSRQPAIXU");
page.setOrderBy1("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
break;
case 3:
page.setOrderBy1("ZCCSSRQPAIXU");
page.setOrderBy1("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
break;
case 4:
page.setOrderBy1("standStateShow");
page.setOrderBy1("SAR_STANDARDS_INFO.text_status");//文本状态
break;
case 5:
page.setOrderBy1("paixu");
break;
case 6:
page.setOrderBy1("SAR_STAND_ATTR_INFO.SSRQ");
break;
default:
page.setNowOrder(null);
break;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+4
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandardsInfo.entity;
import com.adc.da.base.entity.BaseEntity;
import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails;
import com.adc.da.slrs.sarStandItems.entity.SarItemVO;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.sys.entity.DicTypeEO;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -178,6 +179,9 @@ public class SarStandardsInfo extends BaseEntity {
private Date newCarPutTime;
@TableField(exist = false)
private List<SarStandItems> itemsList = new ArrayList<>();
@ApiModelProperty(value = "分解单条款内容")
@TableField(exist = false)
private Map<String,String> mapItems = new TreeMap<>();
@TableField(exist = false)
private String relateStand;//对应其他标准
@TableField(exist = false)
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+14 -30
View File
@@ -28,6 +28,8 @@ import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
import com.adc.da.slrs.sarStandFile.dao.SarStandFileDao;
import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
import com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO;
import com.adc.da.slrs.sarStandItems.entity.SarItemVO;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
@@ -116,6 +118,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private SarStandardsInfoDao dao;
@Autowired
private SarStandItemsDao standItemsDao;
@Autowired
private ITsResourceService sarMenuEOService;
@@ -1144,37 +1149,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
saveUpdateLog(sarStandardsInfoEO, beforeSarStandardsInfo);
if(elasflag) { //what?
attrInfoShowSearchDetails(sarStandardsInfoEO);
createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
List<String> bhs = new ArrayList<>(Arrays.asList(String.valueOf(map.get("DTBJH")).split(",")));
for (String bh :bhs) {
SarStandardsInfoEOPage page = new SarStandardsInfoEOPage();
int countStand = 10000;
int countSuccess = 0;
page.setValidFlag("0");
page.setPageSize(countStand);
page.setMenuId("nomenu");
page.setStandType("ALL");
page.setStandNumber(bh);
List<SarStandardsInfo> rowsStand = dao.selectStandardsInfoBynumber(page);
for (SarStandardsInfo sarStandardsInfo : rowsStand) {
List<SarStandardsInfo> sarStandardsInfoEOS = new ArrayList<>();
sarStandardsInfoEOS.add(sarStandardsInfo);
attrInfo(sarStandardsInfoEOS);
if (sarStandardsInfoEOS.size()>0) {
sarStandardsInfo = sarStandardsInfoEOS.get(0);
countSuccess++;
if (sarStandardsInfo.getAttrInfoMap() != null) {
if (sarStandardsInfo.getAttrInfoMap().containsKey("BDTBZBH")){
String bdtbh = String.valueOf(sarStandardsInfo.getAttrInfoMap().get("BDTBZBH"));
sarStandardsInfo.getAttrInfoMap().put("BDTBH", bdtbh);
sarStandardsInfo.setSarStandAttrEOStr(com.alibaba.fastjson.JSONObject.toJSONString(sarStandardsInfo.getAttrInfoMap()));
}
}
createStandMQService.sendStandMQ(sarStandardsInfo, "update");
}
}
FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
pageInfo.setStandId(sarStandardsInfoEO.getId());
pageInfo.setFileType("FBGBJBD");
List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
if(!sarItemVOS.isEmpty()){
Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
.collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
sarStandardsInfoEO.setMapItems(collectMap);
}
createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
}
return result;
}