feat(单位模块): 添加了单位逻辑注释

dev-sendback/src/main/java/com/tykj/dev/device/sendback/repository/DeviceRepelDetailDao.java

@@ -22,4 +22,6 @@ public interface DeviceRepelDetailDao extends JpaRepository<DeviceRepelDetail, I
  int updateDeviceRepelDetailIsDelByIds(Integer deleteTag, List<Integer> ids);
 
  List<DeviceRepelDetail> findAllByRepelType(Integer repelType);
+
+ List<DeviceRepelDetail> findAllBySendUnitIdAndSendTimeBetween(Integer unitId,Date sTime,Date eTime);
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/DeviceRepelDetailService.java

@@ -51,4 +51,6 @@ public interface DeviceRepelDetailService {
 
     List<DeviceRepelDetail> queryRepelTypeThree();
 
+    List<DeviceRepelDetail> queryDeviceRepelDetailList(Integer unitId, Date startTime, Date endTime);
+
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelQueryService.java

@@ -8,6 +8,7 @@ import com.tykj.dev.device.sendback.entity.domain.RepelEscrow;
 import com.tykj.dev.device.sendback.entity.vo.*;
 import org.springframework.data.domain.Page;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -141,4 +142,9 @@ public interface RepelQueryService {
      * 查询省本级清退数量
      */
     Integer queryCountSameLevel();
+
+    /**
+     * 根据单位id以及开始时间结束时间查询zb数量
+     */
+    Integer queryDeviceCount(Integer unitId, Date startTime,Date endTime);
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java

@@ -145,6 +145,12 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
         return deviceRepelDetailDao.findAllByRepelType(3);
     }
 
+    @Override
+    public List<DeviceRepelDetail> queryDeviceRepelDetailList(Integer unitId, Date startTime, Date endTime) {
+
+        return deviceRepelDetailDao.findAllBySendUnitIdAndSendTimeBetween(unitId, startTime, endTime);
+    }
+
 
     private Specification<DeviceRepelDetail> getFindRetiredSpecification(RepelDetailSelectVo repelDetailSelectVo) {
         PredicateBuilder<DeviceRepelDetail> predicateBuilder = Specifications.and();

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -647,6 +647,20 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         return count.get();
     }
 
+    @Override
+    public Integer queryDeviceCount(Integer unitId, Date startTime, Date endTime) {
+        List<DeviceRepelDetail> deviceRepelDetails = repelDetailService.queryDeviceRepelDetailList(unitId, startTime, endTime);
+        AtomicReference<Integer> count= new AtomicReference<>(0);
+        deviceRepelDetails.forEach(deviceRepelDetail -> {
+            if (deviceRepelDetail.getScriptJson()!=null&&!"".equals(deviceRepelDetail.getScriptJson())) {
+                Integer collect = JacksonUtil.readValue(deviceRepelDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
+                }).stream().mapToInt(ScriptSaveVo::getNum).sum();
+                count.getAndSet(count.get() + collect);
+            }
+        });
+        return count.get();
+    }
+
     private Specification<DeviceLibrary> getRepelDeviceSpecificationIn(RepelManagementVo repelManagementVo) {
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
         //unitId为空，默认查询当前单位