s

src/main/java/com/yt/zhylplat/app/service/impl/ZhjcIrrigationBaseServiceImpl.java

@@ -39,6 +39,8 @@ import java.util.Map;
 public class ZhjcIrrigationBaseServiceImpl extends ServiceImpl<ZhjcIrrigationBaseMapper, ZhjcIrrigationBase> implements ZhjcIrrigationBaseService {
     @Autowired
     private TMapPolygonPropertiesMapper mapPolygonPropertiesMapper;
+    @Autowired
+    private ZhjcIrrigationBaseMapper zhjcIrrigationBaseMapper;
 
     @Override
     public ResultResponse createIrrigation(ZhjcIrrigationBase data) {
@@ -107,9 +109,9 @@ public class ZhjcIrrigationBaseServiceImpl extends ServiceImpl<ZhjcIrrigationBas
     @Override
     public ResultResponse dataInsights(int id) {
         Map<String,Object> map=new HashMap<>();
-        ZhjcIrrigationEfficiency Efficiency= baseMapper.selectEfficiency();
+        List<ZhjcIrrigationEfficiency> Efficiency= baseMapper.selectEfficiency();
 
-        ZhjcIrrigationConsumption Consumption= baseMapper.selectConsumption();
+        List<ZhjcIrrigationConsumption>     Consumption= baseMapper.selectConsumption();
 
 
         List<Map<String, Object>> effect=mapPolygonPropertiesMapper.

src/main/java/com/yt/zhylplat/moduleMap/service/impl/TMapPolygonPropertiesServiceImpl.java

@@ -1037,8 +1037,8 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
                 Map<String,Object> statisticsMap=new HashMap<>();
                 statisticsMap.put("name",item.getfCategoryname());
                 statisticsMap.put("total",Category.size());
-                statisticsMap.put("normal",Category.stream().filter(x->x.getFStateid()>0));
-                statisticsMap.put("abnormal",Category.stream().filter(x->x.getFStateid().equals(0)));
+                statisticsMap.put("normal",Category.stream().filter(x->x.getFStateid()!=null&&x.getFStateid()>0).collect(Collectors.toList()));
+                statisticsMap.put("abnormal",Category.stream().filter(x->x.getFStateid()!=null&&x.getFStateid().equals(0)).collect(Collectors.toList()));
                 statistics.add(statisticsMap);
             }
         }
@@ -1046,32 +1046,26 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
         Map<String,Object> statisticsMap=new HashMap<>();
         statisticsMap.put("name","监控");
         statisticsMap.put("total",Driveinfos.size());
-        statisticsMap.put("normal",Driveinfos.stream().filter(x->x.getfState()>0));
-        statisticsMap.put("abnormal",Driveinfos.stream().filter(x->x.getfState().equals(0)));
+        statisticsMap.put("normal",Driveinfos.stream().filter(x->x.getfState()!=null&&x.getfState()>0).collect(Collectors.toList()));
+        statisticsMap.put("abnormal",Driveinfos.stream().filter(x->x.getfState()!=null&&x.getfState().equals(0)).collect(Collectors.toList()));
         statistics.add(statisticsMap);
         map.put("statistics",statistics);
 
         //保养
-        List<TEquipmentMaintenance> maintenance=
-                equipmentMaintenances.stream().filter(x->x.getParkId().equals(map.get("fParkid"))).
-                        collect(Collectors.toList());
-        map.put("maintenance",maintenance);
+        map.put("maintenance",equipmentMaintenances);
         //出勤
 
         Map<String,Object> attendance=new HashMap<>();
-        attendance.put("dueToArrive",employeeinfos.stream().filter(x->x.getfParkid().equals(map.get("fParkid"))).count() );
-        attendance.put("present",baseEmployeeinfos.stream().filter(x->x.getfParkid().equals(map.get("fParkid"))&&
-                (x.getfWorktype()==1|| x.getfWorktype()==2|| x.getfWorktype()==3) ).count() );
-        attendance.put("leave",baseEmployeeinfos.stream().filter(x->x.getfParkid().equals(map.get("fParkid"))&&
-                (x.getfWorktype()==4|| x.getfWorktype()==5|| x.getfWorktype()==6) ).count() );
+        attendance.put("dueToArrive",employeeinfos.size());
+        attendance.put("present",baseEmployeeinfos.stream().filter(x->x.getfWorktype()==1|| x.getfWorktype()==2|| x.getfWorktype()==3
+        ).count() );
+        attendance.put("leave",baseEmployeeinfos.stream().filter(x->
+                x.getfWorktype()==4|| x.getfWorktype()==5|| x.getfWorktype()==6 ).count() );
         map.put("attendance",attendance);
 
         //预警
-        List<TWoWorkorderbase> warningOrder=
-                warningWorklist.stream().filter(x->x.getfSguserid().equals(map.get("fParkid"))).
-                        collect(Collectors.toList());
-        map.put("warningOrder",warningOrder);
-        map.put("warningOrderCount",warningOrder.size());
+        map.put("warningOrder",warningWorklist);
+        map.put("warningOrderCount",warningWorklist.size());
 
         return ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).message
                 (ResultCodeEnum.SUCCESS.getMessage()).data(map).build();

src/main/java/com/yt/zhylplat/moduleZhjc/mapper/ZhjcIrrigationBaseMapper.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yt.zhylplat.moduleZhjc.entity.ZhjcIrrigationBase;
 import com.yt.zhylplat.moduleZhjc.entity.ZhjcIrrigationConsumption;
 import com.yt.zhylplat.moduleZhjc.entity.ZhjcIrrigationEfficiency;
+import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -15,12 +18,12 @@ import org.springframework.stereotype.Repository;
  * @author YTKJ
  * @since 2025-11-05
  */
-@Repository
+@Mapper
 public interface ZhjcIrrigationBaseMapper extends BaseMapper<ZhjcIrrigationBase> {
 
     /*养护效率趋势*/
-    ZhjcIrrigationEfficiency selectEfficiency();
+    List<ZhjcIrrigationEfficiency> selectEfficiency();
     /*资源消耗*/
 
-    ZhjcIrrigationConsumption selectConsumption();
+    List<ZhjcIrrigationConsumption>  selectConsumption();
 }

src/main/java/com/yt/zhylplat/service/impl/TWoWorkorderbaseServiceImpl.java

@@ -2376,8 +2376,8 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
         long  total=tWoWorkorderbaseslist.size();//总数
         long  endTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfStateid().equals(4)).count();//已完结
         long  tobeTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfStateid()!=4).count();//未完结
-        long  IoTTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().equals("物联感知")).count();//物联感知
-        long  bigDataTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().equals("视频捕捉")).count();//数据分析
+        long  IoTTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref()!=null&& t.getfFromref().equals("物联感知")).count();//物联感知
+        long  bigDataTotal= tWoWorkorderbaseslist.stream().filter(t ->t.getfFromref()!=null&& t.getfFromref().equals("视频捕捉")).count();//数据分析
 
 
         map.put("total", total);//总数

src/main/resources/application.properties

@@ -1,4 +1,4 @@
-#mybatis-plus.mapper-locations=classpath:/mapper/null/*.xml
+#mybatis-plus.mapper-locations=classpath:mapper/*.xml
 #mybatis-plus.type-aliases-package=com.yt.zhylplat.entity
 #spring.servlet.multipart.max-file-size = -1
 #spring.servlet.multipart.max-request-size=-1

src/main/resources/application.yml

@@ -110,7 +110,7 @@ mybatis-plus:
       logic-delete-value: 1 # 默认1是已删除的
       logic-not-delete-value: 0 # 默认0未删除
 
-  mapper-locations: classpath:/mapper/null/*.xml,classpath:/mapper*/*.xml,classpath:/mapper*/**/*.xml
+  mapper-locations: classpath:/mapper/null/*.xml,classpath:/mapper*/*.xml,classpath:/mapper*/**/*.xml,classpath:/moduleZhjc*/**/*.xml
   type-aliases-package: com.yt.zhylplat.entity,com.yt.zhylplat.*.entity