1.上班数据代码提交

project_data/sql/0.1.1/soc/soc.sql

@@ -411,6 +411,7 @@ CREATE TABLE `iot_server_info` (
        `iot_ip` varchar(125) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'ip地址',
        `register_code` varchar(125) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '临时注册码',
        `register_code_status` int DEFAULT NULL COMMENT '临时注册码状态,0:未使用,1:已使用',
+       `password` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '上下班操作密码',
        `enable` int DEFAULT 0 COMMENT '是否启用,0:正常,1:停用',
        `create_by` varchar(125) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
        `create_time` datetime DEFAULT NULL COMMENT '创建时间',

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteHostService.java

@@ -1,21 +1,17 @@
 package com.xunmei.system.api;
 
-import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.constant.ServiceNameConstants;
-import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.host.remote.DiskInfoGetReq;
 import com.xunmei.common.core.domain.host.remote.VideoIntegrityGetReq;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.Eto.BreakerControlEto;
 import com.xunmei.system.api.Eto.SubSystemControlEto;
-import com.xunmei.system.api.domain.SysConfig;
-import com.xunmei.system.api.dto.SysJobDTO;
-import com.xunmei.system.api.factory.RemoteConfigFallbackFactory;
 import com.xunmei.system.api.factory.RemoteHostFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(contextId = "remoteHostService", value = ServiceNameConstants.HOST, fallbackFactory = RemoteHostFallbackFactory.class)
 public interface RemoteHostService {

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotServerInfo.java

@@ -77,6 +77,10 @@ public class IotServerInfo implements Serializable {
     @TableField("register_code_status")
     private Integer registerCodeStatus;
 
+    @ApiModelProperty(value = "上下班操作密码")
+    @TableField("password")
+    private String password;
+
     @TableField("enable")
     @ApiModelProperty(value = "是否启用")
     private Integer enable;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/work/ControlDeviceDto.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/dto/ControlDeviceDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.dto.work;
+package com.xunmei.common.core.domain.work.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/work/OperationPassDto.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/dto/OperationPassDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.dto.work;
+package com.xunmei.common.core.domain.work.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/work/WorkDayDto.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/dto/WorkDayDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.dto.work;
+package com.xunmei.common.core.domain.work.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/EnvironmentDataVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/EnvironmentDataVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/EquipmentStatusVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/EquipmentStatusVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/RealWorkDataVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/RealWorkDataVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/WorkControlVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/WorkControlVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/WorkDayGroupVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/WorkDayGroupVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 
 import com.xunmei.common.core.domain.work.domain.IotDayWorkField;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/WorkDayVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/WorkDayVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/WorkFieldDataVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/WorkFieldDataVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/WorkIotAlarmVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/WorkIotAlarmVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/WorkIotDeviceVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/WorkIotDeviceVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/work/WorkVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/vo/WorkVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.vo.work;
+package com.xunmei.common.core.domain.work.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/handler/RouterServiceHandler.java

@@ -17,13 +17,13 @@ public class RouterServiceHandler {
     private static final Map<ProductEnums, List<RouterService>> PRODUCT_HASH_MAP = new ConcurrentHashMap<>();
 
     static {
-        Map<String, RouterService> map = SpringUtil.getBeansOfType(RouterService.class);
-        Map<ProductEnums, List<RouterService>> productEnumsListMap = map.values().stream().collect(Collectors.groupingBy(RouterService::product));
-        PRODUCT_HASH_MAP.putAll(productEnumsListMap);
+            Map<String, RouterService> map = SpringUtil.getBeansOfType(RouterService.class);
+            Map<ProductEnums, List<RouterService>> productEnumsListMap = map.values().stream().collect(Collectors.groupingBy(RouterService::product));
+            PRODUCT_HASH_MAP.putAll(productEnumsListMap);
 
-        SpringUtil.getBeansOfType(RouterService.class).forEach((k, v) -> {
-            CONCURRENT_HASH_MAP.put(v.routerKey(), v);
-        });
+            SpringUtil.getBeansOfType(RouterService.class).forEach((k, v) -> {
+                CONCURRENT_HASH_MAP.put(v.routerKey(), v);
+            });
     }
 
     public static RouterService getRouteService(String productName, String routerKey) {

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

@@ -34,7 +34,7 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
 
     @Override
     public ProductEnums product() {
-        return null;
+        return ProductEnums.DETECTION_HOST;
     }
 
     @Override

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/IotDayWorkController.java

@@ -2,10 +2,13 @@ package com.xunmei.iot.controller;
 
 
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.iot.dto.work.WorkDayDto;
+import com.xunmei.common.core.domain.work.dto.OperationPassDto;
+import com.xunmei.common.core.domain.work.dto.WorkDayDto;
 import com.xunmei.iot.service.IotDayWorkService;
-import com.xunmei.iot.vo.work.WorkVo;
+import com.xunmei.iot.service.IotServerInfoService;
+import com.xunmei.common.core.domain.work.vo.WorkVo;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +30,8 @@ public class IotDayWorkController {
 
     @Resource
     IotDayWorkService workService;
+    @Autowired
+    private IotServerInfoService serverInfoService;
 
 
     @ApiOperation(value = "轮询获取巡检数据")
@@ -40,5 +45,33 @@ public class IotDayWorkController {
             return AjaxResult.error(e.getMessage());
         }
     }
+
+    /**
+     * 对比操作密码
+     * @param operationPassDto
+     * @return
+     */
+    @PostMapping("/operationPass")
+    public AjaxResult operationPass(@RequestBody OperationPassDto operationPassDto){
+        try {
+            Integer result = serverInfoService.comparePass(operationPassDto);
+            return AjaxResult.success(null,result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "一键上下班")
+    @PostMapping("/startWork")
+    public AjaxResult startWork(@RequestBody WorkDayDto workDayDto){
+        try{
+            workService.startWork(workDayDto);
+            return AjaxResult.success("指令下发成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            return AjaxResult.error("指令下发失败：,"+ e.getMessage());
+        }
+    }
 }
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/interfaces/WorkFieldStrategy.java

@@ -2,7 +2,7 @@ package com.xunmei.iot.interfaces;
 
 
 import com.xunmei.common.core.domain.work.domain.IotDayWorkOperation;
-import com.xunmei.iot.vo.work.WorkFieldDataVo;
+import com.xunmei.common.core.domain.work.vo.WorkFieldDataVo;
 
 import java.util.List;
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/interfaces/impl/DeployWorkStrategy.java

@@ -9,8 +9,8 @@ import com.xunmei.iot.enums.work.DataValueEnum;
 import com.xunmei.iot.interfaces.WorkFieldStrategy;
 import com.xunmei.iot.mapper.IotWorkRuleItemMapper;
 import com.xunmei.iot.service.IotWorkRuleService;
-import com.xunmei.iot.vo.work.WorkControlVo;
-import com.xunmei.iot.vo.work.WorkFieldDataVo;
+import com.xunmei.common.core.domain.work.vo.WorkControlVo;
+import com.xunmei.common.core.domain.work.vo.WorkFieldDataVo;
 import com.xunmei.system.api.RemoteHostService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/interfaces/impl/ElectWorkStrategy.java

@@ -12,8 +12,8 @@ import com.xunmei.iot.interfaces.WorkFieldStrategy;
 import com.xunmei.iot.mapper.IotDayWorkMapper;
 import com.xunmei.iot.service.IotWorkRuleService;
 import com.xunmei.iot.utils.DayWorkUtils;
-import com.xunmei.iot.vo.work.WorkControlVo;
-import com.xunmei.iot.vo.work.WorkFieldDataVo;
+import com.xunmei.common.core.domain.work.vo.WorkControlVo;
+import com.xunmei.common.core.domain.work.vo.WorkFieldDataVo;
 import com.xunmei.system.api.RemoteHostService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotDayWorkMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.work.domain.IotDayWork;
-import com.xunmei.iot.vo.work.WorkControlVo;
+import com.xunmei.common.core.domain.work.vo.WorkControlVo;
 
 import java.util.List;
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotWorkRuleItemMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.work.domain.IotWorkRuleItem;
-import com.xunmei.iot.vo.work.WorkControlVo;
+import com.xunmei.common.core.domain.work.vo.WorkControlVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -2,8 +2,8 @@ package com.xunmei.iot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.work.domain.IotDayWork;
-import com.xunmei.iot.dto.work.WorkDayDto;
-import com.xunmei.iot.vo.work.WorkVo;
+import com.xunmei.common.core.domain.work.dto.WorkDayDto;
+import com.xunmei.common.core.domain.work.vo.WorkVo;
 
 /**
  * <p>
@@ -30,4 +30,9 @@ public interface IotDayWorkService extends IService<IotDayWork> {
      */
     Integer getWorkTime(String dateTime);
 
+    /**
+     * 执行一键上下班操作,通知主机开始控制
+     * @param workDayDto
+     */
+    void startWork(WorkDayDto workDayDto);
 }

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

@@ -5,6 +5,7 @@ import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.serverInfo.IotServerInfoEditDto;
 import com.xunmei.iot.dto.serverInfo.IotServerInfoPageDto;
+import com.xunmei.common.core.domain.work.dto.OperationPassDto;
 import com.xunmei.iot.vo.serverInfo.IotServerInfoPageVo;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,4 +33,7 @@ public interface IotServerInfoService extends IService<IotServerInfo> {
 
 
     List<IotServerInfo> selectConnectOrg(Boolean checkSub, Long orgId, String orgPath);
+
+    Integer comparePass(OperationPassDto operationPassDto);
+
 }

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

@@ -8,7 +8,7 @@ import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.domain.work.domain.IotDayWork;
 import com.xunmei.common.core.domain.work.domain.IotDayWorkOperation;
 import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.iot.dto.work.WorkDayDto;
+import com.xunmei.common.core.domain.work.dto.WorkDayDto;
 import com.xunmei.iot.enums.work.GroupTypeEnum;
 import com.xunmei.iot.enums.work.RedirectTypeEnum;
 import com.xunmei.iot.enums.work.WorkTypeEnum;
@@ -17,8 +17,8 @@ import com.xunmei.iot.interfaces.WorkFieldStrategy;
 import com.xunmei.iot.mapper.IotDayWorkMapper;
 import com.xunmei.iot.service.IotDayWorkOperationService;
 import com.xunmei.iot.service.IotDayWorkService;
-import com.xunmei.iot.vo.work.WorkFieldDataVo;
-import com.xunmei.iot.vo.work.WorkVo;
+import com.xunmei.common.core.domain.work.vo.WorkFieldDataVo;
+import com.xunmei.common.core.domain.work.vo.WorkVo;
 import com.xunmei.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -114,4 +114,16 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
         qw.lambda().eq(IotDayWork::getDataStatus, 0);
         return baseMapper.selectOne(qw);
     }
+
+    @Override
+    public void startWork(WorkDayDto workDayDto) {
+
+        //直接通知主机开始执行命令,平台不做任何逻辑处理;
+
+
+
+
+    }
+
+
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
 import com.xunmei.common.core.enums.iot.IotServerConnectStatus;
@@ -16,6 +17,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.iot.dto.serverInfo.IotServerInfoEditDto;
 import com.xunmei.iot.dto.serverInfo.IotServerInfoPageDto;
+import com.xunmei.common.core.domain.work.dto.OperationPassDto;
 import com.xunmei.iot.mapper.IotServerInfoMapper;
 import com.xunmei.iot.service.IotAlarmDataService;
 import com.xunmei.iot.service.IotServerInfoService;
@@ -188,4 +190,18 @@ public class IotServerInfoServiceImpl extends ServiceImpl<IotServerInfoMapper, I
     public List<IotServerInfo> selectConnectOrg(Boolean checkSub, Long orgId, String orgPath) {
         return baseMapper.selectConnectOrg(checkSub, orgId, orgPath);
     }
+
+    @Override
+    public Integer comparePass(OperationPassDto operationPassDto) {
+        //final Long orgId = SecurityUtils.getLoginUser().getSysUser().getOrgId();
+        final Long orgId =4358025846522215L;
+        final LambdaQueryWrapper<IotServerInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IotServerInfo::getOrgId, orgId);
+        wrapper.last(Constants.LIMIT1);
+        final IotServerInfo serverInfo = baseMapper.selectOne(wrapper);
+        if (serverInfo == null) {
+            return 0;
+        }
+        return ObjectUtil.equal(serverInfo.getPassword(), operationPassDto.getPass()) ? 1 : 0;
+    }
 }

soc-modules/soc-modules-iot/src/main/resources/mapper/IotDayWorkMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.iot.mapper.IotDayWorkMapper">
 
-    <select id="selectLoopList" resultType="com.xunmei.iot.vo.work.WorkControlVo">
+    <select id="selectLoopList" resultType="com.xunmei.common.core.domain.work.vo.WorkControlVo">
         select d.device_product    as productName,
                d.device_name       AS object_name,
                d.`device_code`     AS device_name,
@@ -18,7 +18,7 @@
           and s.iot_token = 'ef261d3a-c768-4df6-8142-bc7fc12a4067'
     </select>
 
-    <select id="selectUPSList" resultType="com.xunmei.iot.vo.work.WorkControlVo">
+    <select id="selectUPSList" resultType="com.xunmei.common.core.domain.work.vo.WorkControlVo">
 
         select
             a.device_product as productName,

soc-modules/soc-modules-iot/src/main/resources/mapper/IotWorkRuleItemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.iot.mapper.IotWorkRuleItemMapper">
 
-    <select id="selectSubSystemByRuleId" resultType="com.xunmei.iot.vo.work.WorkControlVo">
+    <select id="selectSubSystemByRuleId" resultType="com.xunmei.common.core.domain.work.vo.WorkControlVo">
         SELECT s.id,
                d.device_product     AS product_name,
                d.device_code        AS device_name,