feat: There is no way the ES BUSS

2021-08-24 17:29:53 +08:00
parent 052222a52f
commit 02a8b6c969
10 changed files with 522 additions and 250 deletions
@@ -43,7 +43,7 @@ public class CreateStandMQService {
        this.rabbitTemplate.convertAndSend("laws-exchange_SQ_GSAR", "laws-key_SQ_GSAR", lawsMap);
    }

-    public void sendBussStandMQ(SarBussionessStand sarBussionessStandEO, String addOrUpdate) throws Exception{
+    public void sendBussStandMQ(Object sarBussionessStandEO, String addOrUpdate) throws Exception{
        JSONObject json = JSONObject.fromObject(sarBussionessStandEO);
        String sarBussInfoStr = json.toString();
        Map<String,Object> bussMap = new HashMap<String,Object>();
@@ -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);
@@ -31,4 +31,6 @@ public interface SarBussStandMenuDao extends BaseMapper<SarBussStandMenu> {

    int deleteByStandIdAndMenuId (SarBussStandMenu sarStandMenuEO);

+    int insertSelective (SarBussStandMenu sarStandMenuEO);
+
 }
@@ -97,6 +97,8 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {

    int updateByPrimaryKeySelective(SarBussionessStand sarBussionessStandEO);

+    int insertSelective(SarBussionessStand sarBussionessStandEO);
+

 }

@@ -52,13 +52,12 @@ public class SarBussionessStand extends BaseEntity {

    @ApiModelProperty(value = "发布日期")
    @TableField("ISSUE_TIME")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date issueTime;
+    private String issueTime;

    @ApiModelProperty(value = "实施日期")
    @TableField("PUT_TIME")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date putTime;
+    private String putTime;

    @ApiModelProperty(value = "代替标准号")
    @TableField("REPLACE_STAND_NUM")
@@ -192,5 +191,343 @@ public class SarBussionessStand extends BaseEntity {
    @TableField(exist = false)
    private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();

+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }

+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getStandCode() {
+        return standCode;
+    }
+
+    public void setStandCode(String standCode) {
+        this.standCode = standCode;
+    }
+
+    public String getStandName() {
+        return standName;
+    }
+
+    public void setStandName(String standName) {
+        this.standName = standName;
+    }
+
+    public String getStandEnName() {
+        return standEnName;
+    }
+
+    public void setStandEnName(String standEnName) {
+        this.standEnName = standEnName;
+    }
+
+    public String getIssueTime() {
+        return issueTime;
+    }
+
+    public void setIssueTime(String issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    public String getPutTime() {
+        return putTime;
+    }
+
+    public void setPutTime(String putTime) {
+        this.putTime = putTime;
+    }
+
+    public String getReplaceStandNum() {
+        return replaceStandNum;
+    }
+
+    public void setReplaceStandNum(String replaceStandNum) {
+        this.replaceStandNum = replaceStandNum;
+    }
+
+    public String getReplacedStandNum() {
+        return replacedStandNum;
+    }
+
+    public void setReplacedStandNum(String replacedStandNum) {
+        this.replacedStandNum = replacedStandNum;
+    }
+
+    public String getStandStatus() {
+        return standStatus;
+    }
+
+    public void setStandStatus(String standStatus) {
+        this.standStatus = standStatus;
+    }
+
+    public String getApplyCountry() {
+        return applyCountry;
+    }
+
+    public void setApplyCountry(String applyCountry) {
+        this.applyCountry = applyCountry;
+    }
+
+    public String getStandNature() {
+        return standNature;
+    }
+
+    public void setStandNature(String standNature) {
+        this.standNature = standNature;
+    }
+
+    public String getStandSort() {
+        return standSort;
+    }
+
+    public void setStandSort(String standSort) {
+        this.standSort = standSort;
+    }
+
+    public String getStandYear() {
+        return standYear;
+    }
+
+    public void setStandYear(String standYear) {
+        this.standYear = standYear;
+    }
+
+    public Integer getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(Integer validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public Date getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getTextStatusBuss() {
+        return textStatusBuss;
+    }
+
+    public void setTextStatusBuss(String textStatusBuss) {
+        this.textStatusBuss = textStatusBuss;
+    }
+
+    public String getFirstPutTime() {
+        return firstPutTime;
+    }
+
+    public void setFirstPutTime(String firstPutTime) {
+        this.firstPutTime = firstPutTime;
+    }
+
+    public String getPutTimeShow() {
+        return putTimeShow;
+    }
+
+    public void setPutTimeShow(String putTimeShow) {
+        this.putTimeShow = putTimeShow;
+    }
+
+    public String getIssueTimeShow() {
+        return issueTimeShow;
+    }
+
+    public void setIssueTimeShow(String issueTimeShow) {
+        this.issueTimeShow = issueTimeShow;
+    }
+
+    public String getIssueTimeStr() {
+        return issueTimeStr;
+    }
+
+    public void setIssueTimeStr(String issueTimeStr) {
+        this.issueTimeStr = issueTimeStr;
+    }
+
+    public String getPutTimeStr() {
+        return putTimeStr;
+    }
+
+    public void setPutTimeStr(String putTimeStr) {
+        this.putTimeStr = putTimeStr;
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public String getMenuParentId() {
+        return menuParentId;
+    }
+
+    public void setMenuParentId(String menuParentId) {
+        this.menuParentId = menuParentId;
+    }
+
+    public String getStandStatusShow() {
+        return standStatusShow;
+    }
+
+    public void setStandStatusShow(String standStatusShow) {
+        this.standStatusShow = standStatusShow;
+    }
+
+    public String getStandNatrueShow() {
+        return standNatrueShow;
+    }
+
+    public void setStandNatrueShow(String standNatrueShow) {
+        this.standNatrueShow = standNatrueShow;
+    }
+
+    public String getStandSortShow() {
+        return standSortShow;
+    }
+
+    public void setStandSortShow(String standSortShow) {
+        this.standSortShow = standSortShow;
+    }
+
+    public String getApplyCountryShow() {
+        return applyCountryShow;
+    }
+
+    public void setApplyCountryShow(String applyCountryShow) {
+        this.applyCountryShow = applyCountryShow;
+    }
+
+    public List<AttFileVo> getStandFileList() {
+        return standFileList;
+    }
+
+    public void setStandFileList(List<AttFileVo> standFileList) {
+        this.standFileList = standFileList;
+    }
+
+    public List<AttFileVo> getOpinionFilesList() {
+        return opinionFilesList;
+    }
+
+    public void setOpinionFilesList(List<AttFileVo> opinionFilesList) {
+        this.opinionFilesList = opinionFilesList;
+    }
+
+    public List<AttFileVo> getRelevanceFileList() {
+        return relevanceFileList;
+    }
+
+    public void setRelevanceFileList(List<AttFileVo> relevanceFileList) {
+        this.relevanceFileList = relevanceFileList;
+    }
+
+    public String getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(String collectId) {
+        this.collectId = collectId;
+    }
+
+    public String getStandFileClassify() {
+        return standFileClassify;
+    }
+
+    public void setStandFileClassify(String standFileClassify) {
+        this.standFileClassify = standFileClassify;
+    }
+
+    public String getAttId() {
+        return attId;
+    }
+
+    public void setAttId(String attId) {
+        this.attId = attId;
+    }
+
+    public int getUpReplaceNumFlag() {
+        return upReplaceNumFlag;
+    }
+
+    public void setUpReplaceNumFlag(int upReplaceNumFlag) {
+        this.upReplaceNumFlag = upReplaceNumFlag;
+    }
+
+    public int getUpNumFlag() {
+        return upNumFlag;
+    }
+
+    public void setUpNumFlag(int upNumFlag) {
+        this.upNumFlag = upNumFlag;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getAttrInfoMap() {
+        return attrInfoMap;
+    }
+
+    public void setAttrInfoMap(Map<String, Object> attrInfoMap) {
+        this.attrInfoMap = attrInfoMap;
+    }
+
+    public Map<String, Object> getAttrInfoCaseMap() {
+        return attrInfoCaseMap;
+    }
+
+    public void setAttrInfoCaseMap(Map<String, Object> attrInfoCaseMap) {
+        this.attrInfoCaseMap = attrInfoCaseMap;
+    }
+
+    public String getSarStandAttrEOStr() {
+        return sarStandAttrEOStr;
+    }
+
+    public void setSarStandAttrEOStr(String sarStandAttrEOStr) {
+        this.sarStandAttrEOStr = sarStandAttrEOStr;
+    }
+
+    public String getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(String fileIds) {
+        this.fileIds = fileIds;
+    }
+
+    public List<SarStandAttrDetailsEO> getAttrInfoList() {
+        return attrInfoList;
+    }
+
+    public void setAttrInfoList(List<SarStandAttrDetailsEO> attrInfoList) {
+        this.attrInfoList = attrInfoList;
+    }
 }
@@ -187,6 +187,49 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
        return Result.success("0", "删除成功", sarStandardsInfoEO);
    }

+    public ResponseMessage<SarBussionessStand> createSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception {
+        //标准信息表中插入一条数据
+        sarBussionessStandEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+        sarBussionessStandEO.setCreationTime(new Date());
+        sarBussionessStandEO.setModifyTime(new Date());
+        sarBussionessStandEO.setId(UUIDUtils.randomUUID20());
+        //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
+        if (StringUtils.isNotEmpty(sarBussionessStandEO.getMenuId())) {
+            SarBussStandMenu sarStandMenuEO = new SarBussStandMenu();
+            sarStandMenuEO.setBussStandId(sarBussionessStandEO.getId());
+            sarStandMenuEO.setMenuId(sarBussionessStandEO.getMenuId());
+            sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+            sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+            sarBussStandMenuEODao.insertSelective(sarStandMenuEO);
+        }
+        int insertresult = sarBussionessStandEODao.insertSelective(sarBussionessStandEO);
+        if (insertresult >= 1) {
+            // 根据代替标准号 ，修改代替标准号标准中的，被代替标准号
+            updateReplaceConnect(sarBussionessStandEO);
+            //编写预警信息
+//            writeWarnings(sarBussionessStandEO);
+            // 处理属性表信息
+            if (StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())) {
+                createStandAttrInfo(sarBussionessStandEO);
+            }
+            // 增加关联事件
+            String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort());
+            String number = sortName + " " + sarBussionessStandEO.getStandCode();
+            if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) {
+                number += "-" + sarBussionessStandEO.getStandYear();
+            }
+            String content = "新增" + number + " 《" + sarBussionessStandEO.getStandName() + "》";
+            sarUpdLogEOService.createBaseLog(sarBussionessStandEO.getId(),"BUSINESS",content);
+            if(elasflag) {
+                attrInfoShowSearchDetails(sarBussionessStandEO,"add");
+                createStandMQService.sendBussStandMQ(sarBussionessStandEO,"add");
+            }
+            return Result.success("00", "插入数据成功", sarBussionessStandEO);
+        } else {
+            return Result.error("01", "插入输入过程中出错");
+        }
+    }
+

    @Override
    public List<SarBussionessStand> getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception {
@@ -324,6 +367,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
            // 记录修改日志
            saveUpdateLog(sarBussionessStandEO,beforeStandEO);
            if (elasflag) {
+                attrInfoShowSearchDetails(sarBussionessStandEO,"upd");
                createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update");
            }
        }
@@ -349,29 +393,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
    }

    public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) {
-        map.put("country",sarStandardsInfoEO.getApplyCountry());
-        map.put("standSort",sarStandardsInfoEO.getStandSort());
-        map.put("standNumber",sarStandardsInfoEO.getStandCode());
-        map.put("standYear",sarStandardsInfoEO.getStandYear());
-        map.put("standName",sarStandardsInfoEO.getStandName());
-        map.put("standEnName",sarStandardsInfoEO.getStandEnName());
-        map.put("standNature",sarStandardsInfoEO.getStandNature());
-        map.put("standState",sarStandardsInfoEO.getStandStatus());
-        if (sarStandardsInfoEO.getIssueTime() != null) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-            String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
-            map.put("issueTime",issueStr);
-        }
-        if (sarStandardsInfoEO.getPutTime() != null) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-            String issueStr = format.format(sarStandardsInfoEO.getPutTime());
-            map.put("putTime",issueStr);
-        }
+        map.put("country",verifyObj(sarStandardsInfoEO.getApplyCountry()));
+        map.put("standSort",verifyObj(sarStandardsInfoEO.getStandSort()));
+        map.put("standNumber",verifyObj(sarStandardsInfoEO.getStandCode()));
+        map.put("standYear",verifyObj(sarStandardsInfoEO.getStandYear()));
+        map.put("standName",verifyObj(sarStandardsInfoEO.getStandName()));
+        map.put("standEnName",verifyObj(sarStandardsInfoEO.getStandEnName()));
+        map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature()));
+        map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus()));
+//        if (sarStandardsInfoEO.getIssueTime() != null) {
+//            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+//            String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
+//            map.put("issueTime",issueStr);
+//        }
+        map.put("issueTime", verifyObj(sarStandardsInfoEO.getIssueTime()));
+        map.put("putTime", verifyObj(sarStandardsInfoEO.getPutTime()));
+//        if (sarStandardsInfoEO.getPutTime() != null) {
+//            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+//            String issueStr = format.format(sarStandardsInfoEO.getPutTime());
+//            map.put("putTime",issueStr);
+//        }
        map.put("replaceStandNum",sarStandardsInfoEO.getReplaceStandNum());
        map.put("replacedStandNum",sarStandardsInfoEO.getReplacedStandNum());
        return map;
    }

+    private Object verifyObj(Object str){
+        return str == null ? "" : str;
+    }
+
    public void updateCollectAndShare(SarBussionessStand sarBussionessStandEO) throws Exception {
        //修改收藏表中
        String number = sarBussionessStandEO.getStandCode()+ "）";