fix 旁路字段名

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/dto/InterlockDetailAddDTO.java

@@ -149,7 +149,7 @@ public class InterlockDetailAddDTO {
     private java.lang.String ifBypass;
     /**旁路状态*/
     @ApiModelProperty(value = "旁路状态")
-    private java.lang.String bypassstatus;
+    private java.lang.String bypass;
     /**旁路状态-设备id*/
     @Excel(name = "旁路状态-设备id", width = 15)
     @ApiModelProperty(value = "旁路状态-设备id")
@@ -161,7 +161,7 @@ public class InterlockDetailAddDTO {
     /**旁路状态点位*/
     @Excel(name = "旁路状态点位", width = 15)
     @ApiModelProperty(value = "旁路状态点位")
-    private java.lang.String ifBypassTag;
+    private java.lang.String bypassTag;
 
     /**输入卡件状态*/
     @Excel(name = "输入卡件状态", width = 15)

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/entity/InterlockDetail.java

@@ -56,14 +56,6 @@ public class InterlockDetail implements Serializable {
 	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
     private java.lang.String description;
-//	/**设备id*/
-//	@Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
-//    private java.lang.String deviceId;
-//	/**模块名称*/
-//	@Excel(name = "模块名称", width = 15)
-//    @ApiModelProperty(value = "模块名称")
-//    private java.lang.String moduleName;
 	/**仪表状态*/
 	@Excel(name = "仪表状态", width = 15)
     @ApiModelProperty(value = "仪表状态")
@@ -135,10 +127,13 @@ public class InterlockDetail implements Serializable {
 	@Excel(name = "是否旁路", width = 15)
     @ApiModelProperty(value = "是否旁路")
     private java.lang.String ifBypass;
-	/**旁路状态点位*/
-	@Excel(name = "旁路状态点位", width = 15)
+    /**旁路状态*/
+    @ApiModelProperty(value = "旁路状态")
+    private java.lang.String bypass;
+    /**旁路状态点位*/
+    @Excel(name = "旁路状态点位", width = 15)
     @ApiModelProperty(value = "旁路状态点位")
-    private java.lang.String ifBypassTag;
+    private java.lang.String bypassTag;
 	/**输入卡件状态*/
 	@Excel(name = "输入卡件状态", width = 15)
     @ApiModelProperty(value = "输入卡件状态")

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/controller/InterlockSummaryController.java

@@ -43,7 +43,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  * @Date:   2024-05-23
  * @Version: V1.0
  */
-@Api(tags="联锁总表")
+@Api(tags=".联锁总表")
 @RestController
 @RequestMapping("/summary/interlockSummary")
 @Slf4j
@@ -51,6 +51,15 @@ public class InterlockSummaryController extends JeecgController<InterlockSummary
 	@Autowired
 	private IInterlockSummaryService interlockSummaryService;
 
+	 @ApiOperation(value="测试", notes="测试")
+	 @GetMapping(value = "/list111")
+	 public Result<List<InterlockSummary>> list(InterlockSummary interlockSummary,
+														  HttpServletRequest req) {
+		 QueryWrapper<InterlockSummary> queryWrapper = QueryGenerator.initQueryWrapper(interlockSummary, req.getParameterMap());
+		 List<InterlockSummary> list = interlockSummaryService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
+
 	/**
 	 *  联锁及详细信息——用于编辑
 	 */

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/entity/InterlockSummary.java

@@ -48,14 +48,6 @@ public class InterlockSummary implements Serializable {
     @Excel(name = "系统id", width = 15)
     @ApiModelProperty(value = "系统id")
     private java.lang.String interlockSystemId;
-//	/**设备id*/
-//	@Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
-//    private java.lang.String deviceId;
-//	/**模块名称*/
-//	@Excel(name = "模块名称", width = 15)
-//    @ApiModelProperty(value = "模块名称")
-//    private java.lang.String moduleName;
 	/**联锁状态*/
 	@Excel(name = "联锁状态", width = 15)
     @ApiModelProperty(value = "联锁状态")

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/service/impl/InterlockSummaryServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 联锁总表
@@ -55,18 +56,12 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
 
         InterlockSummary summary = interlockSummaryMapper.selectById(id);
 
-        List<InterlockDetailAddDTO> interlockDetailAddDTOList = new ArrayList<>();
-
         LambdaQueryWrapper<InterlockDetail> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(InterlockDetail::getSummaryid,id);
         List<InterlockDetail> detailList = interlockDetailMapper.selectList(queryWrapper);
-        for (InterlockDetail detail : detailList){
-            LambdaQueryWrapper<InterlockTag> queryWrapper1 = new LambdaQueryWrapper<>();
-            queryWrapper1.eq(InterlockTag::getInterlockConditionId,id);
-            List<InterlockTag> tagList = interlockTagService.list(queryWrapper1);
-
-            interlockDetailAddDTOList.add(InterlockDetailConvert.INSTANCE.toDTO(detail));
-        }
+        List<InterlockDetailAddDTO> interlockDetailAddDTOList = detailList.stream().map(i-> {
+            return InterlockDetailConvert.INSTANCE.toDTO(i);
+        }).collect(Collectors.toList());
 
         InterlockAddDTO dto = InterlockSummaryConvert.INSTANCE.toDTO(summary,interlockDetailAddDTOList);
         return dto;
@@ -112,10 +107,14 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
 
         for (InterlockDetailAddDTO dto : interlockDetailAddDTOList){
             dto.setSummaryid(summaryId);
-            //旁路
-            if(dto.getIfBypass()!=null && "1".equals(dto.getIfBypass())){ //是否旁路，0否（手动输入）1是（再看点位）
-                if(dto.getBypassstatus()!=null && "1".equals(dto.getBypassstatus())) interlockStatus = "0";
+
+            //联锁状态  0未投用1投用
+            if(dto.getIfBypass()!=null ){
+                //是否旁路，0否（手动输入——手动输入什么？？？？）1是（再看点位——点位值是什么格式？？？？？？？？？？？？？？？？？）
+                if("1".equals(dto.getIfBypass())) if(dto.getBypass()!=null && "1".equals(dto.getBypass())) interlockStatus = "0";//旁路状态是多个的话，任何一个旁路是1（是），则联锁状态是0未投用。
+                else if("0".equals(dto.getIfBypass()))  if(dto.getBypass()!=null && "1".equals(dto.getBypass())) interlockStatus = "0";//旁路状态是多个的话，任何一个旁路是1（是），则联锁状态是0未投用。
             }
+
             //仪表状态：0正常1故障
             if(dto.getInstrumentStatusJuge()!=null){
                 if("0".equals(dto.getInstrumentStatusJuge())){ //0直接读取位号
@@ -146,7 +145,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
             interlockTagService.saveBatch(toTagList(dto,summaryId));
         }
 
-        if("1".equals(instrumentStatus)) i++; //？？？投用未投用哪个算正常状态
+        if("0".equals(instrumentStatus)) i++; //？？？0未投用1投用用哪个算正常状态  先按0未投用不正常算
         if("1".equals(interlockStatus)) i++;
         if("1".equals(controlSystemStatus)) i++;
         if(i==0)  loopHealthLevel="A";
@@ -187,10 +186,14 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
 
         for (InterlockDetailAddDTO dto : interlockDetailAddDTOList){
             dto.setSummaryid(summaryId);
-            //旁路
-            if(dto.getIfBypass()!=null && "1".equals(dto.getIfBypass())){ //是否旁路，0否（手动输入）1是（再看点位）
-                if(dto.getBypassstatus()!=null && "1".equals(dto.getBypassstatus())) interlockStatus = "0";
+
+            //联锁状态  0未投用1投用
+            if(dto.getIfBypass()!=null ){
+                //是否旁路，0否（手动输入——手动输入什么？？？？）1是（再看点位——点位值是什么格式？？？？？？？？？？？？？？？？？）
+                if("1".equals(dto.getIfBypass())) if(dto.getBypass()!=null && "1".equals(dto.getBypass())) interlockStatus = "0";//旁路状态是多个的话，任何一个旁路是1（是），则联锁状态是0未投用。
+                else if("0".equals(dto.getIfBypass()))  if(dto.getBypass()!=null && "1".equals(dto.getBypass())) interlockStatus = "0";//旁路状态是多个的话，任何一个旁路是1（是），则联锁状态是0未投用。
             }
+
             //仪表状态：0正常1故障
             if(dto.getInstrumentStatusJuge()!=null){
                 if("0".equals(dto.getInstrumentStatusJuge())){ //0直接读取位号
@@ -221,7 +224,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
             interlockTagService.saveBatch(toTagList(dto,summaryId));
         }
 
-        if("1".equals(instrumentStatus)) i++; //？？？投用未投用哪个算正常状态
+        if("0".equals(instrumentStatus)) i++; //？？？0未投用1投用用哪个算正常状态  先按0未投用不正常算
         if("1".equals(interlockStatus)) i++;
         if("1".equals(controlSystemStatus)) i++;
         if(i==0)  loopHealthLevel="A";
@@ -250,7 +253,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
         //当前值
         interlockTagList.add(createInterlockTag(dto.getCurrentValueDeviceId(),dto.getCurrentValueModuleName(),dto.getCurrentValueTag(),dto.getCurrentValue(),"当前值",interlockConditionId));
         //旁路状态、、、、、、、、、、、、、、、、、、、
-        interlockTagList.add(createInterlockTag(dto.getBypassDeviceId(),dto.getBypassModuleName(),dto.getIfBypassTag(),dto.getIfBypass(),"旁路状态",interlockConditionId));
+        interlockTagList.add(createInterlockTag(dto.getBypassDeviceId(),dto.getBypassModuleName(),dto.getBypassTag(),dto.getBypass(),"旁路状态",interlockConditionId));
         //输入卡件状态
         interlockTagList.add(createInterlockTag(dto.getInputStatusDeviceId(),dto.getInputStatusModuleName(),dto.getInputStatusTag(),dto.getInputStatus(),"输入卡件状态",interlockConditionId));
         //输出卡件状态