FPG精益模型回显查询接口开发01

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.events.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.deviceLesm.entity.DeviceInformation;
 import org.jeecg.modules.deviceLesm.mapper.DeviceInformationMapper;
 import org.jeecg.modules.events.entity.LeanEventsHost;
 import org.jeecg.modules.events.entity.LeanEventsHostEditParam;
@@ -84,12 +85,17 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
             }
             // 处理辅设备标题列表
             List<String> deviceChildTites = Arrays.asList(leanEventsHost.getDeviceInformationList().split(","));
-            List<String> resChildTites = deviceInformationMapper.selectBatchIds(deviceChildTites)
-                    .stream()
-                    .map(x -> x.getId() + "|" + x.getDeviceTitle())
-                    .collect(Collectors.toList());
-            // 更新 LeanEventsHost 对象的辅设备配置信息ID集
-            leanEventsHost.setDeviceInformationList(String.join(",", resChildTites));
+            List<DeviceInformation> deviceInformationList = deviceInformationMapper.selectBatchIds(deviceChildTites);
+            if (!oConvertUtils.listIsNotEmpty(deviceInformationList)){
+                leanEventsHost.setDeviceInformationList(null);
+            }else {
+                List<String> resChildTites = deviceInformationList.stream()
+                        .map(x -> x.getId() + "|" + x.getDeviceTitle())
+                        .collect(Collectors.toList());
+                // 更新 LeanEventsHost 对象的辅设备配置信息ID集
+                leanEventsHost.setDeviceInformationList(String.join(",", resChildTites));
+            }
+
         });
 
         leanEventsHosts.forEach(x ->{
@@ -100,7 +106,14 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
         if (!oConvertUtils.listIsNotEmpty(leanEventsHostResultList)){
             return leanEventsHostResultList;
         }
-        List<String> list =leanEventsHostResultList.stream().map(LeanEventsHostResult::getDeviceInformationList).collect(Collectors.toList());
+
+        List<LeanEventsHostResult> leanEventsHostResultList1 = leanEventsHostResultList.stream()
+                .filter(s -> oConvertUtils.isNotEmpty(s.getDeviceInformationList()))
+                .collect(Collectors.toList());
+        if (!oConvertUtils.listIsNotEmpty(leanEventsHostResultList1)){
+            return leanEventsHostResultList;
+        }
+        List<String> list =leanEventsHostResultList1.stream().map(LeanEventsHostResult::getDeviceInformationList).collect(Collectors.toList());
 
         List<String> deviceInformationIdIds = new ArrayList<>();
         list.forEach(s ->{

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/controller/FpgLeanModelController.java

@@ -12,6 +12,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
+import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModelResult;
 import org.jeecg.modules.fpgLeanModel.service.IFpgLeanModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -159,4 +160,14 @@ public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLe
         return super.importExcel(request, response, FpgLeanModel.class);
     }
 
+	 @ApiOperation(value="峰平谷模型和设备信息-通过id查询", notes="峰平谷模型和设备信息-通过id查询")
+	 @GetMapping(value = "/queryFpgLeanModelById")
+	 public Result<FpgLeanModelResult> queryFpgLeanModelById(@RequestParam(name="id",required=true) String id) {
+		 FpgLeanModelResult fpgLeanModelResult = fpgLeanModelService.queryFpgLeanModelById(id);
+		 if(fpgLeanModelResult==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(fpgLeanModelResult);
+	 }
+
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/entity/FpgLeanModel.java

@@ -110,4 +110,10 @@ public class FpgLeanModel implements Serializable {
     @Dict(dicCode = "proportion_run_status")
     @ApiModelProperty(value = "运行时长 1：开启 2： 关闭")
     private Integer runTime;
+    @Excel(name = "电流 1：开启 2： 关闭", width = 15)
+    @ApiModelProperty(value = "电流 1：开启 2： 关闭")
+    private Integer electricCurrent;
+    @Excel(name = "设备ID集合", width = 15)
+    @ApiModelProperty(value = "设备ID集合")
+    private String deviceInformationIds;
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/entity/FpgLeanModelResult.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fpgLeanModel.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.deviceLesm.entity.DeviceInformation;
+
+import java.util.List;
+
+@Data
+public class FpgLeanModelResult {
+
+    @ApiModelProperty(value = "主键")
+    private String fpgLeanModelId;
+
+    @ApiModelProperty(value = "主键")
+    private List<DeviceInformation> deviceInformationList;
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/service/IFpgLeanModelService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.fpgLeanModel.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
+import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModelResult;
 
 /**
  * @Description: 峰平谷模型
@@ -11,4 +12,5 @@ import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
  */
 public interface IFpgLeanModelService extends IService<FpgLeanModel> {
 
+    FpgLeanModelResult queryFpgLeanModelById(String id);
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/service/impl/FpgLeanModelServiceImpl.java

@@ -2,11 +2,19 @@ package org.jeecg.modules.fpgLeanModel.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.deviceLesm.entity.DeviceInformation;
+import org.jeecg.modules.deviceLesm.mapper.DeviceInformationMapper;
 import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
+import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModelResult;
 import org.jeecg.modules.fpgLeanModel.mapper.FpgLeanModelMapper;
 import org.jeecg.modules.fpgLeanModel.service.IFpgLeanModelService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @Description: 峰平谷模型
  * @Author: jeecg-boot
@@ -16,4 +24,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class FpgLeanModelServiceImpl extends ServiceImpl<FpgLeanModelMapper, FpgLeanModel> implements IFpgLeanModelService {
 
+    @Autowired
+    private DeviceInformationMapper deviceInformationMapper;
+    @Override
+    public FpgLeanModelResult queryFpgLeanModelById(String id) {
+        FpgLeanModelResult fpgLeanModelResult = new FpgLeanModelResult();
+        fpgLeanModelResult.setFpgLeanModelId(id);
+        FpgLeanModel fpgLeanModel = baseMapper.selectById(id);
+        if (fpgLeanModel == null){
+            return fpgLeanModelResult;
+        }
+        if (oConvertUtils.isEmpty(fpgLeanModel.getDeviceInformationIds())){
+            return fpgLeanModelResult;
+        }
+        List<String> deviceInformationIds = Arrays.asList(fpgLeanModel.getDeviceInformationIds().split(","));
+        List<DeviceInformation> deviceInformations = deviceInformationMapper.selectBatchIds(deviceInformationIds);
+        if (!oConvertUtils.isNotEmpty(deviceInformations)){
+            return fpgLeanModelResult;
+        }
+        fpgLeanModelResult.setDeviceInformationList(deviceInformations);
+        return fpgLeanModelResult;
+    }
 }