精益事件代码同步01

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/impl/LeanEventsHostServiceImpl.java

@@ -11,9 +11,9 @@ import org.jeecg.modules.events.service.ILeanEventsHostService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 精益事件设备启停配置表
@@ -32,31 +32,48 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
         if(oConvertUtils.listIsNotEmpty(leanEventsHostEditParam.getLeanEventsHosts())){
             LambdaQueryWrapper<LeanEventsHost> deleteQuery = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, leanEventsHostEditParam.getLeanEventsHosts().get(0).getEventsId());
             baseMapper.delete(deleteQuery);
-            leanEventsHostEditParam.getLeanEventsHosts().forEach(leanEventsHost -> {
+            LeanEventsHost leanEventsHost = leanEventsHostEditParam.getLeanEventsHosts().get(0);
+            if (oConvertUtils.isNotEmpty(leanEventsHost.getDeviceInformationList())){
                 baseMapper.insert(leanEventsHost);
-            });
+            }
         }
     }
 
     @Override
     public List<LeanEventsHost> getConfig(String id) {
-
-
-
         LambdaQueryWrapper<LeanEventsHost> query = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, id);
         List<LeanEventsHost> leanEventsHosts = baseMapper.selectList(query);
         leanEventsHosts.forEach(leanEventsHost -> {
-            String deviceTitle = deviceInformationMapper.selectById(leanEventsHost.getDeviceInformationId()).getDeviceTitle();
-            leanEventsHost.setDeviceInformationId(leanEventsHost.getDeviceInformationId()+"|"+deviceTitle);
+            // 检查设备信息 ID 是否包含特定字符串，若不包含则进行处理；(false：峰平谷)
+            if (!containsAny(leanEventsHost.getDeviceInformationId(), "tops", "peaks", "flat", "valleys")) {
+                // 根据设备信息 ID 查询设备标题并赋值到主设备Id
+                String deviceTitle = deviceInformationMapper.selectById(leanEventsHost.getDeviceInformationId()).getDeviceTitle();
+                leanEventsHost.setDeviceInformationId(leanEventsHost.getDeviceInformationId() + "|" + deviceTitle);
+            }
+            // 处理辅设备标题列表
             List<String> deviceChildTites = Arrays.asList(leanEventsHost.getDeviceInformationList().split(","));
-            List<String> resChildTites = new ArrayList<>();
-            deviceChildTites.forEach(deviceChildTite->{
-                String deviceName = deviceInformationMapper.selectById(deviceChildTite).getDeviceTitle();
-                resChildTites.add(deviceChildTite.concat("|"+deviceName));
-            });
-            leanEventsHost.setDeviceInformationList(String.join(",",resChildTites));
+            List<String> resChildTites = deviceInformationMapper.selectBatchIds(deviceChildTites)
+                    .stream()
+                    .map(x -> x.getId() + "|" + x.getDeviceTitle())
+                    .collect(Collectors.toList());
+            // 更新 LeanEventsHost 对象的辅设备配置信息ID集
+            leanEventsHost.setDeviceInformationList(String.join(",", resChildTites));
         });
         return leanEventsHosts;
     }
 
+    /**
+     * 检查字符串是否包含多个子字符串中的任意一个
+     * @param str
+     * @param substrings
+     * @return
+     */
+    private boolean containsAny(String str, String... substrings) {
+        for (String substring : substrings) {
+            if (str.contains(substring)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfig.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -28,43 +29,44 @@ import java.io.Serializable;
 public class PeaksAndValleysTimeConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
-	/**创建人*/
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
     private String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**所属部门*/
+    /**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
-	/**开始时间*/
-	@Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    /**开始时间*/
+    @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
     private java.util.Date startTime;
-	/**结束时间*/
-	@Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    /**结束时间*/
+    @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private java.util.Date endTime;
-	/**峰平谷类型*/
-	@Excel(name = "峰平谷类型", width = 15)
-    @ApiModelProperty(value = "峰平谷类型(0:峰 1:平 2:谷)")
+    /**峰平谷类型*/
+    @Excel(name = "峰平谷类型", width = 15)
+    @ApiModelProperty(value = "峰平谷类型(尖：tops 峰:peaks 平:flat 谷:valleys)")
+    @Dict(dicCode = "fpg_type")
     private String type;
 }

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfigParam.java

@@ -22,6 +22,9 @@ import java.util.List;
 public class PeaksAndValleysTimeConfigParam implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "尖")
+    private List<PeaksAndValleysTimeConfig> tops;
+
     @ApiModelProperty(value = "峰")
     private List<PeaksAndValleysTimeConfig> peaks;
 

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/service/impl/PeaksAndValleysTimeConfigServiceImpl.java

@@ -20,15 +20,18 @@ public class PeaksAndValleysTimeConfigServiceImpl extends ServiceImpl<PeaksAndVa
     @Override
     public PeaksAndValleysTimeConfigParam get() {
         PeaksAndValleysTimeConfigParam res = new PeaksAndValleysTimeConfigParam();
+        //获取尖
+        res.setTops(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"tops").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         //获取峰
         res.setPeaks(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
-                .eq(PeaksAndValleysTimeConfig::getType,"0").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+                .eq(PeaksAndValleysTimeConfig::getType,"peaks").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         //获取平
         res.setFlat(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
-                .eq(PeaksAndValleysTimeConfig::getType,"1").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+                .eq(PeaksAndValleysTimeConfig::getType,"flat").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         //获取谷
         res.setValleys(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
-                .eq(PeaksAndValleysTimeConfig::getType,"2").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+                .eq(PeaksAndValleysTimeConfig::getType,"valleys").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         return res;
     }
 
@@ -37,6 +40,10 @@ public class PeaksAndValleysTimeConfigServiceImpl extends ServiceImpl<PeaksAndVa
         //先删后增
         //删除所有配置
         baseMapper.delete(null);
+        //添加尖时段配置
+        peaksAndValleysTimeConfigParam.getTops().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
         //添加峰时段配置
         peaksAndValleysTimeConfigParam.getPeaks().forEach(peaksAndValleysTimeConfig -> {
             baseMapper.insert(peaksAndValleysTimeConfig);
@@ -51,3 +58,5 @@ public class PeaksAndValleysTimeConfigServiceImpl extends ServiceImpl<PeaksAndVa
         });
     }
 }
+
+