安全巡检，巡检点编码查询

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java

@@ -59,4 +59,5 @@ public interface IBsEpciuInspectionPointService extends BaseService<BsEpciuInspe
 	 */
 	List<BsEpciuInspectionPointExcel> exportBsEpciuInspectionPoint(Wrapper<BsEpciuInspectionPointEntity> queryWrapper);
 
+	List<BsEpciuInspectionPointEntity> getByCode(String code);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java

@@ -61,4 +61,7 @@ public interface IBsEpciuPatrolInspectionService extends BaseService<BsEpciuPatr
 	List<BsEpciuPatrolInspectionExcel> exportBsEpciuPatrolInspection(Wrapper<BsEpciuPatrolInspectionEntity> queryWrapper);
 
     void epInspectionTasks(boolean b);
+
+    List<BsEpciuPatrolInspectionEntity> ListPi(String code, Long userId);
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java

@@ -60,6 +60,8 @@ public interface IBsSafeInspectionPointService extends BaseService<BsSafeInspect
 	 */
 	List<BsSafeInspectionPointExcel> exportBsSafeInspectionPoint(Wrapper<BsSafeInspectionPointEntity> queryWrapper);
 
+	List<BsSafeInspectionPointEntity> listByCode(String code);
+
 	/**
 	 * 导出pdf
 	 * @param list

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java

@@ -26,6 +26,7 @@
 package org.springblade.desk.energy.service.impl;
 
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.desk.energy.excel.BsEpciuInspectionPointExcel;
 import org.springblade.desk.energy.mapper.BsEpciuInspectionPointMapper;
 import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity;
@@ -61,4 +62,11 @@ public class BsEpciuInspectionPointServiceImpl extends BaseServiceImpl<BsEpciuIn
 		return bsEpciuInspectionPointList;
 	}
 
+    @Override
+    public List<BsEpciuInspectionPointEntity> getByCode(String code) {
+
+		return list(Wrappers.lambdaQuery(BsEpciuInspectionPointEntity.class)
+				.eq(BsEpciuInspectionPointEntity::getInsNum, code));
+    }
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java

@@ -28,6 +28,7 @@ package org.springblade.desk.energy.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -35,15 +36,20 @@ import org.springblade.desk.energy.excel.BsEpciuPatrolInspectionExcel;
 import org.springblade.desk.energy.mapper.BsEpciuPatrolInspectionMapper;
 import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity;
 import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity;
+import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity;
+import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity;
 import org.springblade.desk.energy.pojo.vo.BsEpciuPatrolInspectionVO;
 import org.springblade.desk.energy.service.IBsEpciuInspectionPointService;
 import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService;
+import org.springblade.desk.energy.service.IBsSafeInspectionPointService;
+import org.springblade.desk.energy.service.IBsSafePatrolInspectionService;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 环保巡检任务表 服务实现类
@@ -57,6 +63,10 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl<BsEpciuP
 
 
 	private final IBsEpciuInspectionPointService bsEpciuInspectionPointService;
+
+	private final IBsSafePatrolInspectionService bsSafePatrolInspectionservice;
+
+	private final IBsSafeInspectionPointService iBsSafeInspectionPointService;
 	@Override
 	public IPage<BsEpciuPatrolInspectionVO> selectBsEpciuPatrolInspectionPage(IPage<BsEpciuPatrolInspectionVO> page, BsEpciuPatrolInspectionVO bsEpciuPatrolInspection) {
 		if(bsEpciuPatrolInspection.getQueryLaunchTime()!=null){
@@ -146,4 +156,13 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl<BsEpciuP
 		}
 	}
 
+    @Override
+    public List<BsEpciuPatrolInspectionEntity> ListPi(String code, Long userId) {
+		List<BsSafeInspectionPointEntity> safeInspectionPointList = iBsSafeInspectionPointService.listByCode(code);
+		List<Long> safeInspectionPointIdList = safeInspectionPointList.stream().map(BsSafeInspectionPointEntity::getId).toList();
+		return list(Wrappers.lambdaQuery(BsEpciuPatrolInspectionEntity.class)
+				.in(BsEpciuPatrolInspectionEntity::getEpcId, safeInspectionPointIdList)
+				.eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.NO_CHECK.toString()));
+    }
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java

@@ -28,6 +28,7 @@ package org.springblade.desk.energy.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.energy.excel.BsSafeInspectionPointExcel;
 import org.springblade.desk.energy.mapper.BsSafeInspectionPointMapper;
@@ -167,4 +168,9 @@ public class BsSafeInspectionPointServiceImpl extends BaseServiceImpl<BsSafeInsp
 //		}
 //	}
 
+	@Override
+	public List<BsSafeInspectionPointEntity> listByCode(String code) {
+		return list(Wrappers.lambdaQuery(BsSafeInspectionPointEntity.class)
+				.eq(BsSafeInspectionPointEntity::getInsNum, code));
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java

@@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
 import org.springblade.desk.device.pojo.entity.RackSetEntity;
+import org.springblade.desk.oldv1.pojo.ResultInfo;
 import org.springblade.desk.produce.pojo.vo.BindModelVO;
 import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO;
 import org.springblade.desk.produce.service.IPdaLoadService;
@@ -105,4 +107,17 @@ public class PdaLoadController {
         return R.data(pdaLoadService.getHangNum(deviceCode));
     }
 
+    @ApiOperationSupport(order = 11)
+    @Operation(summary = "根据巡检器编码查询数据", description = "")
+    @GetMapping("/getInspectionByEcCode/{code}")
+    public ResultInfo getInspectionByEcCode(@PathVariable String code, HttpServletRequest request) throws Exception {
+        return ResultInfo.ok(pdaLoadService.getInspectionByEcCode(code, true,request));
+    }
+    @Operation(summary = "安全巡检保存", description = "")
+    @PostMapping("/saveByInspection")
+    public ResultInfo saveByInspection(@RequestBody JSONObject data, HttpServletRequest request) throws Exception {
+        pdaLoadService.saveByInspection(data,true);
+        return ResultInfo.ok();
+    }
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java

@@ -1,6 +1,7 @@
 package org.springblade.desk.produce.service;
 
 import com.alibaba.fastjson.JSONObject;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
@@ -72,4 +73,8 @@ public interface IPdaLoadService extends BaseService<WorkPlan> {
     boolean saveProCheck(InspectionTask inspectionTask);
 
     List<JSONObject> getHangNum(String deviceCode);
+
+    Object getInspectionByEcCode(String code,Boolean flag, HttpServletRequest request);
+
+    void saveByInspection(JSONObject data, boolean b);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java

@@ -3,9 +3,11 @@ package org.springblade.desk.produce.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springblade.common.exception.BusinessException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -20,6 +22,9 @@ import org.springblade.desk.device.pojo.entity.RackSetEntity;
 import org.springblade.desk.device.service.IEquipmentService;
 import org.springblade.desk.device.service.IFeiBaSetService;
 import org.springblade.desk.device.service.IRackSetService;
+import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity;
+import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity;
+import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.produce.mapper.WorkPlanMapper;
@@ -36,9 +41,7 @@ import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -85,6 +88,8 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 
     private final IWorkCenterService workCenterService;
 
+    private final IBsEpciuPatrolInspectionService bsEpciuPatrolInspectionService;
+
     //    @Value("${request.device.prefixId}")
     private String prefixId;
 
@@ -426,4 +431,27 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         }
         return workOrder;
     }
+
+    @Override
+    public Object getInspectionByEcCode(String code,Boolean flag, HttpServletRequest request) {
+        Long userId = AuthUtil.getUserId();
+        if (StringUtils.isBlank(code) || flag == null) {
+            throw new RuntimeException("pda.dataFormat.incorrect", null);
+        }
+        List<BsEpciuPatrolInspectionEntity> piList = bsEpciuPatrolInspectionService.ListPi(code, userId);
+        piList = piList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
+                new TreeSet<>(Comparator.comparing(BsEpciuPatrolInspectionEntity::getEpcId))), ArrayList::new));
+        if (piList == null || piList.size() == 0) {
+            if (flag) {
+                throw new RuntimeException("product.noPatrolCheckTask", null);
+            }
+        }
+        return piList;
+    }
+
+    @Override
+    public void saveByInspection(JSONObject data, boolean b) {
+
+    }
+
 }