统计

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java

@@ -154,7 +154,7 @@ public class DateUtils {
         // 昨天开始时间（00:00:00）
         LocalDateTime yesterdayStart = LocalDate.now().minusDays(day).atStartOfDay();
         // 昨天结束时间（23:59:59.999999999）
-        LocalDateTime yesterdayEnd = LocalDateTime.of(LocalDate.now().minusDays(1), LocalTime.MAX);
+        LocalDateTime yesterdayEnd = LocalDateTime.of(LocalDate.now().minusDays(day), LocalTime.MAX);
         return ImmutableMap.of("start", yesterdayStart, "end", yesterdayEnd);
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorder.IotMainWorkOrderDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotsapstock.IotSapStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotProductClassifyMapper;
@@ -21,6 +22,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.TDDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.failure.IotFailureReportMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmainworkorder.IotMainWorkOrderMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotsapstock.IotSapStockMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.maintain.IotMaintainMapper;
 import cn.iocoder.yudao.module.pms.service.DeviceServiceImpl;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectOrderService;
@@ -76,6 +78,8 @@ public class IotStaticController {
     private DeptApi deptApi;
     @Autowired
     private AdminUserApi adminUserApi;
+    @Autowired
+    private IotSapStockMapper iotSapStockMapper;
 
     @GetMapping("/main/day")
     public CommonResult<Map<String, Object>> getMaintainDay() {
@@ -234,7 +238,7 @@ public class IotStaticController {
         IotMainWorkOrderPageReqVO iotMainWorkOrderPageReqVO = new IotMainWorkOrderPageReqVO();
         iotMainWorkOrderPageReqVO.setCreateTime(new LocalDateTime[]{beginEndDay.get("start"), beginEndDay.get("end")});
         Long inspectDayTotal = iotMainWorkOrderMapper.selectCountByTimeAndStatus(iotMainWorkOrderPageReqVO);
-        iotMainWorkOrderPageReqVO.setStatus(1);
+        iotMainWorkOrderPageReqVO.setResult(1);
         Long inspectDayTodo = iotMainWorkOrderMapper.selectCountByTimeAndStatus(iotMainWorkOrderPageReqVO);
 
         return CommonResult.success(ImmutableMap.of("total", inspectDayTotal,"todo", inspectDayTodo));
@@ -246,7 +250,7 @@ public class IotStaticController {
         ImmutableMap<String, LocalDateTime> beginEndWeek = DateUtils.getBeginEndWeek();
         iotMainWorkOrderPageReqVO.setCreateTime(new LocalDateTime[]{beginEndWeek.get("start"), beginEndWeek.get("end")});
         Long inspectWeekTotal = iotMainWorkOrderMapper.selectCountByTimeAndStatus(iotMainWorkOrderPageReqVO);
-        iotMainWorkOrderPageReqVO.setStatus(1);
+        iotMainWorkOrderPageReqVO.setResult(1);
         Long inspectWeekTodo = iotMainWorkOrderMapper.selectCountByTimeAndStatus(iotMainWorkOrderPageReqVO);
 
         return CommonResult.success(ImmutableMap.of("total", inspectWeekTotal,"todo", inspectWeekTodo));
@@ -258,7 +262,7 @@ public class IotStaticController {
         ImmutableMap<String, LocalDateTime> beginEndMonth = DateUtils.getBeginEndMonth();
         iotMainWorkOrderPageReqVO.setCreateTime(new LocalDateTime[]{beginEndMonth.get("start"), beginEndMonth.get("end")});
         Long inspectWeekTotal = iotMainWorkOrderMapper.selectCountByTimeAndStatus(iotMainWorkOrderPageReqVO);
-        iotMainWorkOrderPageReqVO.setStatus(1);
+        iotMainWorkOrderPageReqVO.setResult(1);
         Long inspectWeekTodo = iotMainWorkOrderMapper.selectCountByTimeAndStatus(iotMainWorkOrderPageReqVO);
 
         return CommonResult.success(ImmutableMap.of("total", inspectWeekTotal,"todo", inspectWeekTodo));
@@ -267,7 +271,7 @@ public class IotStaticController {
     @GetMapping("/maintenance/total")
     public CommonResult<Map<String, Object>> getMaintenanceTotal() {
         Long total = iotMainWorkOrderMapper.selectCount();
-        Long todo = iotMainWorkOrderMapper.selectCount("status", "todo");
+        Long todo = iotMainWorkOrderMapper.selectCount("result", 1);
 
         return CommonResult.success(ImmutableMap.of("total", total,"todo", todo));
     }
@@ -425,5 +429,15 @@ public class IotStaticController {
         return CommonResult.success(userCountByDeptId);
     }
 
-
+    @GetMapping("/home/safe")
+    public CommonResult<Integer> getSafe() {
+        List<IotSapStockDO> iotSapStockDOS = iotSapStockMapper.selectList();
+        List<Long> ids = new ArrayList<>();
+        iotSapStockDOS.forEach(e ->{
+            if (e.getSafetyStock().compareTo(e.getQuantity())>0) {
+                ids.add(e.getId());
+            }
+        });
+        return CommonResult.success(ids.size());
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmainworkorder/IotMainWorkOrderMapper.java

@@ -49,7 +49,7 @@ public interface IotMainWorkOrderMapper extends BaseMapperX<IotMainWorkOrderDO>
     }
     default Long selectCountByTimeAndStatus(IotMainWorkOrderPageReqVO reqVO) {
         return selectCount(new LambdaQueryWrapperX<IotMainWorkOrderDO>()
-                .eqIfPresent(IotMainWorkOrderDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotMainWorkOrderDO::getResult, reqVO.getResult())
                 .betweenIfPresent(IotMainWorkOrderDO::getCreateTime, reqVO.getCreateTime()));
     }
     default List<IotMainWorkOrderDO> selectListByCreateTime(IotMainWorkOrderPageReqVO reqVO) {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -54,21 +54,21 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
         IotInspectRouteDO routeDO1 = JSON.parseArray(order.getDeviceIds(), IotInspectRouteDO.class).stream().filter(e -> String.valueOf(e.getDeviceId()).equals(deviceId)).findFirst().get();
         List<Map> maps1 = JSON.parseArray(routeDO1.getItemJson(), Map.class);
 
-        List<IotInspectOrderDetailDO> details = iotInspectOrderDetailMapper.selectByMap(ImmutableMap.of("order_id", orderId, "device_id", deviceId, "index_id", Long.valueOf(indexId)));
-        Long itemId = details.get(0).getItemId();
-        if (CollUtil.isNotEmpty(details)){
-            iotInspectOrderDetailMapper.deleteByIds(details);
-        }
-        IotInspectOrderDetailDO detailDO = new IotInspectOrderDetailDO();
-        detailDO.setOrderId(orderId);
-        detailDO.setDeviceId(Long.valueOf(deviceId));
-        detailDO.setItemId(itemId);
-        detailDO.setIfNormal("1".equals(ifNormal));
-        detailDO.setDescription(description);
-        detailDO.setPicUrl(picUrl);
-        detailDO.setIndexId(Long.valueOf(indexId));
-        detailDO.setDeleted(false);
-        iotInspectOrderDetailMapper.insert(detailDO);
+//        List<IotInspectOrderDetailDO> details = iotInspectOrderDetailMapper.selectByMap(ImmutableMap.of("order_id", orderId, "device_id", deviceId, "index_id", Long.valueOf(indexId)));
+//        Long itemId = details.get(0).getItemId();
+//        if (CollUtil.isNotEmpty(details)){
+//            iotInspectOrderDetailMapper.deleteByIds(details);
+//        }
+//        IotInspectOrderDetailDO detailDO = new IotInspectOrderDetailDO();
+//        detailDO.setOrderId(orderId);
+//        detailDO.setDeviceId(Long.valueOf(deviceId));
+//        detailDO.setItemId(itemId);
+//        detailDO.setIfNormal("1".equals(ifNormal));
+//        detailDO.setDescription(description);
+//        detailDO.setPicUrl(picUrl);
+//        detailDO.setIndexId(Long.valueOf(indexId));
+//        detailDO.setDeleted(false);
+//        iotInspectOrderDetailMapper.insert(detailDO);
         //更新order的json串
         List<IotInspectRouteDO> routeDOS = JSON.parseArray(order.getDeviceIds(), IotInspectRouteDO.class);
         List<IotInspectRouteDO> newArray = new ArrayList<>();