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

src/main/java/com/syc/slm/slmbi/service/InstrumentPanelConfigService.java

@@ -8,6 +8,7 @@ import com.syc.slm.slmbi.vo.InstrumentPanelConfigVo;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * slm-bi
@@ -90,4 +91,12 @@ public interface InstrumentPanelConfigService extends IService<InstrumentPanelCo
      * @param panelId
      */
     Map<String,String> getAssemblyConfig(@NotNull String panelId);
+
+
+    /**
+     * 根据仪表板id获取对应已发布配置
+     * @param ids
+     * @return
+     */
+    Set<String> getConfigByPanelIds(@NotNull Set<String> ids);
 }

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelConfigServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.slmbi.dao.InstrumentPanelConfigMapper;
 import com.syc.slm.slmbi.dto.InstrumentPanelConfigDTO;
@@ -30,6 +31,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -177,6 +179,7 @@ public class InstrumentPanelConfigServiceImpl extends ServiceImpl<InstrumentPane
             log.info("更新发布版本的groupId");
             draft.setGroupId(permission.getGroupId());
             draftService.updateById(draft);
+            panel.setPublished(PublishedStatus.PUBLISHED.value);
 
         } else {
             //修改
@@ -360,6 +363,21 @@ public class InstrumentPanelConfigServiceImpl extends ServiceImpl<InstrumentPane
         return maps;
     }
 
+    @Override
+    @Transactional
+    public Set<String> getConfigByPanelIds(@NotNull Set<String> ids) {
+        LambdaQueryWrapper<InstrumentPanelConfig> where = new LambdaQueryWrapper<>();
+        where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
+        where.in(InstrumentPanelConfig::getPanelId, ids);
+        where.eq(InstrumentPanelConfig::getPublished, PublishedStatus.WAIT_PUBLISHED.value);
+        List<InstrumentPanelConfig> configs = baseMapper.selectList(where);
+        if(CollectionUtils.isNotEmpty(configs)){
+            return configs.stream().map(InstrumentPanelConfig::getPanelId).collect(Collectors.toSet());
+        }
+
+        return Sets.newHashSet();
+    }
+
     private InstrumentPanelConfigVo getInstrumentPanelConfigVo(String instrumentPanelId, PublishedStatus published) {
 
         LambdaQueryWrapper<InstrumentPanelConfig> where = new LambdaQueryWrapper<>();

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelServiceImpl.java

@@ -95,15 +95,14 @@ public class InstrumentPanelServiceImpl extends ServiceImpl<InstrumentPanelMappe
             if(CollectionUtils.isNotEmpty(response.getRecords())){
                 Set<String> ids = response.getRecords()
                     .stream()
-                    .filter(x -> "未发布".equals(x.getPublished()))
+                    .filter(x -> "已发布".equals(x.getPublished()))
                     .map(BaseEntity::getId)
                     .collect(Collectors.toSet());
                 if(CollectionUtils.isNotEmpty(ids)){
-                    List<InstrumentPanelDraft> drafts = draftService.getByIds(ids);
-                    if(CollectionUtils.isNotEmpty(drafts)){
-                        Set<String> draftIds = drafts.stream().map(InstrumentPanelDraft::getPanelId).collect(Collectors.toSet());
+                    Set<String> waitIds = configService.getConfigByPanelIds(ids);
+                    if(CollectionUtils.isNotEmpty(waitIds)){
                         response.getRecords().forEach(x->{
-                            if(draftIds.contains(x.getId())){
+                            if(waitIds.contains(x.getId())){
                                 x.setHasWaitPublish("有未发布版本");
                             }
                         });

src/main/java/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java

@@ -76,7 +76,7 @@ public class VariableServiceImpl implements VariableService {
         List<VariableSourceVo> vos = Lists.newArrayList();
         VariableSourceVo vo = new VariableSourceVo();
         vo.setSourceId("6");
-        vo.setSourceName("请选择变量来源");
+        vo.setSourceName("--全部--");
         VariableSourceVo vo1 = new VariableSourceVo();
         vo1.setSourceId("1");
         vo1.setSourceName("基础采集点");