网点自检代码迁移至iot模块

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/dayilcheck/service/impl/IotDailyCheckDataServiceImpl.java

@@ -1,5 +1,7 @@
 package com.xunmei.host.dayilcheck.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -9,6 +11,7 @@ import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.domain.iot.domain.IotDailyCheckData;
 import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
 import com.xunmei.common.core.domain.iot.vo.DailyCheckReq;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.host.dayilcheck.mapper.IotDailyCheckDataMapper;
 import com.xunmei.host.dayilcheck.service.IotDailyCheckDataService;
 import com.xunmei.host.server.service.IotServerInfoService;
@@ -59,7 +62,7 @@ public class IotDailyCheckDataServiceImpl extends ServiceImpl<IotDailyCheckDataM
         JSONObject obj = JSON.parseObject(data.toString());
         String type = obj.getString("id");
         String excelData = obj.getString("excelData");
-        IotServerInfo serverInfo = iotServerInfoService.getToken(req.getToken());
+        IotServerInfo serverInfo = iotServerInfoService.selectByToken(req.getToken());
         if (ObjectUtil.isEmpty(serverInfo)) {
             LogUtils.SOCKET_DAILY_HEALTH.error("未查询到token为 {} 的服务器信息", req.getToken());
             return null;
@@ -92,11 +95,12 @@ public class IotDailyCheckDataServiceImpl extends ServiceImpl<IotDailyCheckDataM
 
         DailyCheckReq req = JSON.parseObject(excelData, DailyCheckReq.class);
         dailyCheckData.setData(excelData);
-        dailyCheckData.setRecordDate(LocalDateTime.parse(req.getRecordDate()));
+        final DateTime time = DateUtil.parse(req.getRecordDate());
+        dailyCheckData.setRecordDate(DateUtils.toLocalDateTime(time));
         dailyCheckData.setUserName(req.getUserName());
         dailyCheckData.setFileName(serverInfo.getOrgName() + "检查日志" + LocalDateTimeUtil.format(dailyCheckData.getRecordDate(), Constants.HM_FORMAT));
 
         this.saveOrUpdate(dailyCheckData);
-
+        LogUtils.SOCKET_DAILY_HEALTH.error("[网点客户端自检结果上报],入库成功,ID:{},excelData:{}", id, excelData);
     }
 }

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

@@ -38,6 +38,7 @@ public class IotServerInfoServiceImpl extends ServiceImpl<IotServerInfoMapper, I
         queryWrapper.last(Constants.LIMIT1);
         IotServerInfo serverInfo = baseMapper.selectOne(queryWrapper);
         if (serverInfo == null) {
+            LogUtils.SOCKET_DAILY_HEALTH.error("未能根据registerCode查询到对应的token,registerCode:{}",registerCode);
             return null;
         }
         if (ObjectUtil.isEmpty(serverInfo.getIotCode())){

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

@@ -149,7 +149,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
         // 从WebSocket会话中获取登录用户信息
-            String token = WebSocketSessionHolder.updateToken(session);
+        String token = WebSocketSessionHolder.updateToken(session);
         //String token = "f1418fd8-64c3-4b9f-91b1-9bbe76b0314c";
         if (StringUtils.isEmpty(token)) {
             LogUtils.WEBSOCKET_MSG.error("会话消息不存在,ip:{}", WebSocketUtils.getIp(session));
@@ -179,7 +179,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
             IotServerInfo serverInfo = iotServerInfoService.selectByToken(token);
             if (ObjectUtil.isEmpty(serverInfo)) {
                 LogUtils.WEBSOCKET_MSG.error("未查询到token为 {} 的服务器信息", token);
-                return ;
+                return;
             }
             //上报消息内容
             final Object args = payloadResolve.getData();

soc-modules/soc-modules-host/src/main/resources/logback.xml

@@ -126,7 +126,7 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <maxFileSize>${max.file.size}</maxFileSize>
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/dailyHealth/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/socketDailyHealth/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>${max.history}</maxHistory>
             <totalSizeCap>${total.size.cap}</totalSizeCap>

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/controller/IotDailyCheckDataController.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/IotDailyCheckDataController.java

@@ -1,12 +1,12 @@
-package com.xunmei.deploy.controller;
+package com.xunmei.iot.controller;
 
 
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.deploy.dto.dailycheck.DailyCheckDataPageDto;
-import com.xunmei.deploy.service.IotDailyCheckDataService;
-import com.xunmei.deploy.vo.DailyCheckDataRateData;
-import com.xunmei.deploy.vo.DailyCheckDataStatisticsData;
+import com.xunmei.iot.dto.dailycheck.DailyCheckDataPageDto;
+import com.xunmei.iot.service.IotDailyCheckDataService;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataRateData;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataStatisticsData;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/dto/dailycheck/DailyCheckDataPageDto.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/dailycheck/DailyCheckDataPageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.deploy.dto.dailycheck;
+package com.xunmei.iot.dto.dailycheck;
 
 import com.xunmei.common.core.web.domain.PageRequest;
 import lombok.Data;

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/dao/IotDailyCheckDataMapper.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotDailyCheckDataMapper.java

@@ -1,10 +1,10 @@
-package com.xunmei.deploy.dao;
+package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.iot.domain.IotDailyCheckData;
-import com.xunmei.deploy.dto.dailycheck.DailyCheckDataPageDto;
-import com.xunmei.deploy.vo.DailyCheckDataPageVo;
+import com.xunmei.iot.dto.dailycheck.DailyCheckDataPageDto;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataPageVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/IotDailyCheckDataService.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/IotDailyCheckDataService.java

@@ -1,11 +1,11 @@
-package com.xunmei.deploy.service;
+package com.xunmei.iot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotDailyCheckData;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.deploy.dto.dailycheck.DailyCheckDataPageDto;
-import com.xunmei.deploy.vo.DailyCheckDataRateData;
-import com.xunmei.deploy.vo.DailyCheckDataStatisticsData;
+import com.xunmei.iot.dto.dailycheck.DailyCheckDataPageDto;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataRateData;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataStatisticsData;
 
 import javax.servlet.http.HttpServletResponse;
 

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/IotDailyCheckDataServiceImpl.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDailyCheckDataServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xunmei.deploy.service.impl;
+package com.xunmei.iot.service.impl;
 
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
@@ -19,13 +19,13 @@ import com.xunmei.common.core.domain.iot.vo.DailyCheckReq;
 import com.xunmei.common.core.utils.NumberUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.redis.utils.RedisUtils;
-import com.xunmei.deploy.dao.IotDailyCheckDataMapper;
-import com.xunmei.deploy.dto.dailycheck.DailyCheckDataPageDto;
-import com.xunmei.deploy.service.IotDailyCheckDataService;
-import com.xunmei.deploy.vo.DailyCheckDataPageVo;
-import com.xunmei.deploy.vo.DailyCheckDataRateData;
-import com.xunmei.deploy.vo.DailyCheckDataStatisticsData;
-import com.xunmei.deploy.vo.DailyCheckItemExportVo;
+import com.xunmei.iot.dto.dailycheck.DailyCheckDataPageDto;
+import com.xunmei.iot.mapper.IotDailyCheckDataMapper;
+import com.xunmei.iot.service.IotDailyCheckDataService;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataPageVo;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataRateData;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckDataStatisticsData;
+import com.xunmei.iot.vo.dayilcheck.DailyCheckItemExportVo;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.vo.SysOrgVO;

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/vo/DailyCheckDataPageVo.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/dayilcheck/DailyCheckDataPageVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.deploy.vo;
+package com.xunmei.iot.vo.dayilcheck;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/vo/DailyCheckDataRateData.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/dayilcheck/DailyCheckDataRateData.java

@@ -1,4 +1,4 @@
-package com.xunmei.deploy.vo;
+package com.xunmei.iot.vo.dayilcheck;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/vo/DailyCheckDataStatisticsData.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/dayilcheck/DailyCheckDataStatisticsData.java

@@ -1,4 +1,4 @@
-package com.xunmei.deploy.vo;
+package com.xunmei.iot.vo.dayilcheck;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/vo/DailyCheckItemExportVo.java → soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/dayilcheck/DailyCheckItemExportVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.deploy.vo;
+package com.xunmei.iot.vo.dayilcheck;
 
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;

soc-modules/soc-modules-deploy/src/main/resources/mapper/IotDailyCheckDataMapper.xml → soc-modules/soc-modules-iot/src/main/resources/mapper/IotDailyCheckDataMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.deploy.dao.IotDailyCheckDataMapper">
-    <select id="selectPageData" resultType="com.xunmei.deploy.vo.DailyCheckDataPageVo">
+<mapper namespace="com.xunmei.iot.mapper.IotDailyCheckDataMapper">
+    <select id="selectPageData" resultType="com.xunmei.iot.vo.dayilcheck.DailyCheckDataPageVo">
         select d.id,d.org_id,d.org_name,d.file_name,d.record_date,d.user_name,s.affiliated_area,s.affiliated_bank from iot_daily_check_data d inner join sys_org s  on d.org_id = s.id
         <where>
             <if test="req.checkSub==false">