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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java

@@ -61,4 +61,7 @@ public class SarStandMenu extends BaseEntity {
     @TableField(exist = false)
     private String menuName;
 
+    @TableField(exist = false)
+    private String standCode;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -108,4 +108,9 @@ public class SarStandardsInfoEOPage extends BasePage {
      *   标准添加到体系中的id多个
      */
     private String menuIds;
+
+    /**
+     *   标准号
+     */
+    private String standCode;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1,6 +1,8 @@
 package com.adc.da.slrs.sarStandardsInfo.service.impl;
 
 import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.person.entity.StandInfo;
+import com.adc.da.person.entity.TsPersonCollect;
 import com.adc.da.slrs.sarPosition.entity.TsPosition;
 import com.adc.da.slrs.sarPosition.service.ITsPositionService;
 import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao;
@@ -814,6 +816,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         sarStandardsInfoEO.setCreationTime(new Date());
         sarStandardsInfoEO.setModifyTime(new Date());
         //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
+
+        //当代替标准号在我的收藏中时此标准也关联到我的收藏中
+        associatedCollection(sarStandardsInfoEO);
+
         if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
 
             for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
@@ -1411,8 +1417,57 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         sarStandardsInfoEO.setStandState(resultState);
     }
 
-    @Autowired
-    private ISarStandardsInfoService sarStandardsInfoEOService;
+
+    private void associatedCollection(SarStandardsInfo standInfo){
+        /**
+         * 获取代替标准号
+         * 判断getAttrInfoMap, dtbzh.get("DTBJH") 不为空
+         */
+
+        String DTBJH = Optional.ofNullable(standInfo)
+                .flatMap(standEO -> Optional.ofNullable(JSONObject.fromObject(standEO.getSarStandAttrEOStr())))
+                .flatMap(attrMap -> Optional.ofNullable(attrMap.get("DTBJH")))
+                .map(str -> str.toString())
+                .orElse("");
+
+        if (!"".equals(DTBJH)){
+
+            for (String s : DTBJH.split(",")) {
+
+                /**
+                 * 以逗号分割的代替标准号,只要其中一个存在于我的收藏之中,此标准就插入我的收藏
+                 */
+
+                StandInfo query = new StandInfo();
+
+                //用户id
+                query.setUserId(LoginUserUtil.getUserId());
+                query.setStandCode(s);
+                if (personCollectEOService.countPersonCollectByStandInfo(query)>0){
+
+                    TsPersonCollect tsPersonCollect = new TsPersonCollect();
+                    tsPersonCollect.setId(UUIDUtils.randomUUID20());
+                    tsPersonCollect.setValidFlag(0);
+                    tsPersonCollect.setCreationTime(new Date());
+                    tsPersonCollect.setModifyTime(new Date());
+                    tsPersonCollect.setCollectResId(standInfo.getId());
+                    tsPersonCollect.setCollectType(standInfo.getStandType()+"_STAND");
+                    tsPersonCollect.setCollectTitle(standInfo.getStandName() +"(编号:"+ standInfo.getStandSort()+" "+standInfo.getStandNumber()+"-"+standInfo.getStandYear()+  ")");
+                    tsPersonCollect.setUserId(LoginUserUtil.getUserId());
+                    QueryWrapper<TsPersonCollect> ew = new QueryWrapper<>();
+                    ew.eq("COLLECT_RES_ID",standInfo.getId())
+                            .eq("VALID_FLAG",'0');
+                    personCollectEOService.saveOrUpdate(tsPersonCollect,ew);
+
+                    break;
+                }
+
+            }
+
+
+        }
+
+    }
 
 
     /***
@@ -1466,8 +1521,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         sarStandAttrInfoEODao.deleteStandAttrByStandId(standId);
         createStandAttrInfo(sarStandardsInfoEO);
         /**
-         * 编辑体系目录
+         * 编辑体系目录  当代替的标准号在我的收藏中时,此条标准也需要在我的收藏中
          */
+        //当代替标准号在我的收藏中时此标准也关联到我的收藏中
+        associatedCollection(sarStandardsInfoEO);
+
 
         if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
 
@@ -1478,9 +1536,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
 
                 try {
-                    sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
+                    updateStandardsMenu(standardsInfoEO);
                 }catch (NullPointerException e){
-                    sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
+                    updateStandInfo(standardsInfoEO);
                 }
             }
         }