fix workdayHourEnd to onDutyHourEnd

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/digitalmans/feign/RemoteDigitalmanMqttService.java

@@ -18,7 +18,7 @@ public interface RemoteDigitalmanMqttService {
 
 
     @PostMapping("/man/api/mqtt/heartbeat")
-    public void heartbeat(@RequestBody(required = true) String message);
+    public void heartbeat(@RequestBody(required = true) String message,@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
     @PostMapping("/man/api/mqtt/log-upload")

xueyi-modules/xueyi-message/src/main/java/com/xueyi/message/handler/MqttTopicHandle.java

@@ -57,7 +57,7 @@ public class MqttTopicHandle {
         JSONObject heartBeatObj = JSONObject.parseObject(messageStr);
         String devId = heartBeatObj.getString("devId");
         DeviceTenantSourceMergeVo vo = remoteDeviceTenantMergeService.selectDeviceTenantSourceMerge(devId);
-        remoteDigitalmanMqttService.heartbeat(messageStr);
+        remoteDigitalmanMqttService.heartbeat(messageStr, vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
 
     }
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmDigitalmanController.java

@@ -266,11 +266,13 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
         String network = heartBeatObj.getString("wifi_rssi");
         String cpu_max = heartBeatObj.getString("cpuinfo_max_freq");
         String cpu_scaling = heartBeatObj.getString("scaling_cur_freq");
+        String ipAddr = heartBeatObj.getString("ip_addr");
         String cpu = Double.valueOf(cpu_scaling) / Double.valueOf(cpu_max) * 100 + "";
         String memoryTotal = heartBeatObj.getString("memory_total");
         Double memoryFree = Double.valueOf(heartBeatObj.getString("memory_free"));
         String memory = (Double.valueOf(memoryTotal) - memoryFree) / Double.valueOf(memoryTotal)  * 100 + "";
         String occurTime = "";
+//        DmDigitalmanExtPo
 
         try {
             occurTime = DateUtils.formatDate(DateUtils.parseLongToDate(timestamp),"HH:mm");
@@ -298,14 +300,14 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
 
     @PostMapping("/api/mqtt/log-upload")
     public void logUpload(@RequestBody(required = true) String message) {
-        JSONObject heartBeatObj = JSONObject.parseObject(message);
-        String devId = heartBeatObj.getString("devId");
-        String timestamp = heartBeatObj.getString("timestamp");
-        String fileName = heartBeatObj.getString("file_name");
-        String path = heartBeatObj.getString("path");
-        String type = heartBeatObj.getString("type");
-        Integer level = heartBeatObj.getInteger("level");
-        Integer uploadType = heartBeatObj.getInteger("upload_type");
+        JSONObject uploadObj = JSONObject.parseObject(message);
+        String devId = uploadObj.getString("devId");
+        String timestamp = uploadObj.getString("timestamp");
+        String fileName = uploadObj.getString("file_name");
+        String path = uploadObj.getString("path");
+        String type = uploadObj.getString("type");
+        Integer level = uploadObj.getInteger("level");
+        Integer uploadType = uploadObj.getInteger("upload_type");
 
 
         DmExceptionLogDto exceptionLogDto = new DmExceptionLogDto();

xueyi-modules/xueyi-system/src/main/resources/mapper/deptExt/SysDeptExtMapper.xml

@@ -19,14 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertWorkTimeByDeptId" parameterType="SysDeptExt">
         insert into sys_dept_ext (dept_id,on_duty_hour_start,on_duty_hour_end,off_duty_hour_start,off_duty_hour_end)
-        values (#{deptId},#{workdayHourStart},#{workdayHourEnd},#{offDutyHourStart},#{offDutyHourEnd})
+        values (#{deptId},#{onDutyHourStart},#{onDutyHourEnd},#{offDutyHourStart},#{offDutyHourEnd})
     </insert>
 
     <update id="updateWorkTimeByDeptId" parameterType="SysDeptExt">
         update sys_dept_ext
         <set>
-            <if test="workdayHourStart != null  ">on_duty_hour_start = #{workdayHourStart},</if>
-            <if test="workdayHourEnd != null  ">on_duty_hour_end = #{workdayHourEnd},</if>
+            <if test="onDutyHourStart != null  ">on_duty_hour_start = #{onDutyHourStart},</if>
+            <if test="onDutyHourEnd != null  ">on_duty_hour_end = #{onDutyHourEnd},</if>
             <if test="offDutyHourStart != null  ">off_duty_hour_start = #{weekendHourStart},</if>
             <if test="offDutyHourEnd != null  ">off_duty_hour_end = #{offDutyHourEnd},</if>
         </set>