bug修改

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/iot/service/impl/IotDeviceInfoServiceImpl.java

@@ -565,6 +565,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
             final ArrayList<Object> list = new ArrayList<>();
             list.add("FSU_DoPowerControlBoxButton");
             list.add("FSU_DoPowerCollection");
+            list.add("FSU_DoPowerControl");
             //处理通道或者动环传感器信息
             for (SubDeviceInfo subDeviceInfo : subDeviceList) {
                 //动环中 控电箱按钮与 市电总回路/八小时总回路通电状态不同步

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/IotDayWorkService.java

@@ -30,7 +30,7 @@ public interface IotDayWorkService extends IService<IotDayWork> {
      * @param dateTime
      * @return
      */
-    Integer getWorkTime(String dateTime);
+    Integer getWorkTime(String dateTime, Long orgId);
 
     /**
      * 执行一键上下班操作,通知主机开始控制

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDayWorkServiceImpl.java

@@ -85,7 +85,7 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
         workVo.setDataType(workType);
         if (workType == null) {
             //获取当前应该显示的状态
-            Integer dataType = getWorkTime(date);
+            Integer dataType = getWorkTime(date, sysUser.getOrgId());
             workVo.setDataType(dataType);
             workDayDto.setDataType(dataType);
         }
@@ -101,31 +101,31 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
         //获取用户机构下的IotToken 暂不考虑一个机构多个Token的问题，目前先取第一个
         List<IotServerInfo> iotServerInfos = iotServerInfoService.selectConnectOrg(false, sysUser.getOrgId(), null);
 
-        if(ObjectUtil.isEmpty(iotServerInfos))
-        {
+        if (ObjectUtil.isEmpty(iotServerInfos)) {
             // 说明该机构下没有注册主机
             throw new RuntimeException("该机构尚未安装巡检主机，暂不支持此功能");
         }
-        String iotToken=iotServerInfos.get(0).getIotCode();
+        String iotToken = iotServerInfos.get(0).getIotCode();
         //处理布撤防数据
         WorkFieldStrategy workStrategy = workStrategyFactory.getWorkStrategy(GroupTypeEnum.DEFENSE_TYPE.getNum());
         List<WorkFieldDataVo> realWorkData = workStrategy.getRealWorkData(operMap.get(RedirectTypeEnum.DEFENSE_REDIRECT_TYPE.getNum())
-                , workDayDto.getDataType(),iotToken);
+                , workDayDto.getDataType(), iotToken);
         workVo.setDeploys(realWorkData);
 
         //处理用电数据
         workStrategy = workStrategyFactory.getWorkStrategy(GroupTypeEnum.ELECT_TYPE.getNum());
-        List<WorkFieldDataVo> eletcs = workStrategy.getRealWorkData(operMap.get(RedirectTypeEnum.ELECT_REDIRECT_TYPE.getNum()), workDayDto.getDataType(),iotToken);
+        List<WorkFieldDataVo> eletcs = workStrategy.getRealWorkData(operMap.get(RedirectTypeEnum.ELECT_REDIRECT_TYPE.getNum()), workDayDto.getDataType(), iotToken);
         workVo.setEletcs(eletcs);
         return workVo;
     }
 
 
     @Override
-    public Integer getWorkTime(String dateTime) {
+    public Integer getWorkTime(String dateTime, Long orgId) {
         QueryWrapper<IotDayWork> qw = new QueryWrapper<>();
         qw.lambda()
                 .eq(IotDayWork::getWorkDate, dateTime)
+                .eq(IotDayWork::getOrgId, orgId)
                 .eq(IotDayWork::getDataStatus, 1)
                 .orderByDesc(IotDayWork::getCreateTime)
                 .last(Constants.LIMIT1);
@@ -142,8 +142,11 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
 
     private IotDayWork getGoWork(Long orgId) {
         QueryWrapper<IotDayWork> qw = new QueryWrapper<>();
-        qw.lambda().eq(IotDayWork::getDataStatus, 0);
-        qw.lambda().eq(IotDayWork::getOrgId, orgId);
+        qw.lambda()
+                .eq(IotDayWork::getOrgId, orgId)
+                .eq(IotDayWork::getDataStatus, 0)
+                .orderByDesc(IotDayWork::getWorkDate)
+                .last(Constants.LIMIT1);
         return baseMapper.selectOne(qw);
     }
 
@@ -170,7 +173,7 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
     public WorkHistoryVo getHistoryList(WorkDayDto workDayDto) {
         final SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         // 页面端目前没有加机构树，先默认查询登录机构以及下级机构的 记录
-        SysOrg sysOrg= orgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
+        SysOrg sysOrg = orgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
         workDayDto.setOrgPath(sysOrg.getPath());
 
         String workDate = workDayDto.getWorkDate();
@@ -180,15 +183,15 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
         DateTime parse = DateUtil.parse(workDate, "yyyy-MM-dd");
         //根据日期，获取月开始时间和结束时间
         Date startTime = DateUtil.beginOfMonth(parse);
-        Date endTime =  DateUtil.endOfMonth(parse);
+        Date endTime = DateUtil.endOfMonth(parse);
 
         //获取有记录的天数
-        List<String> dates = operationService.selectWorkDayList(startTime, endTime,workDayDto.getOrgId(),workDayDto.getOrgPath());
+        List<String> dates = operationService.selectWorkDayList(startTime, endTime, workDayDto.getOrgId(), workDayDto.getOrgPath());
 
         //获取当天的工作记录
         QueryWrapper<IotDayWork> qw = new QueryWrapper<>();
         qw.lambda().eq(IotDayWork::getWorkDate, workDate)
-                .likeRight(IotDayWork::getOrgPath,workDayDto.getOrgPath())
+                .likeRight(IotDayWork::getOrgPath, workDayDto.getOrgPath())
                 .orderByDesc(IotDayWork::getCreateTime);
         List<IotDayWork> list = baseMapper.selectList(qw);