1.修复meeting启动报错（demo→meeting）2.修复会议设备新增和修改报错问题，优化代码

service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -1,7 +1,7 @@
 package com.ruoyi.job.task;
 
 import com.usky.common.core.utils.StringUtils;
-import com.usky.demo.RemoteMeetingService;
+import com.usky.meeting.RemoteMeetingService;
 import com.usky.fire.RemoteFireService;
 import com.usky.iot.RemoteIotTaskService;
 import com.usky.pm.RemotePmService;

service-meeting/service-meeting-api/src/main/java/com/usky/demo/RemoteMeetingService.java

@@ -1,22 +0,0 @@
-package com.usky.demo;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.demo.domain.SysUserVO;
-import com.usky.demo.factory.RemoteMeetingFallbackFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-import java.util.PrimitiveIterator;
-
-@FeignClient(contextId = "RemoteMeetingService", value = "service-meeting", fallbackFactory = RemoteMeetingFallbackFactory.class)
-public interface RemoteMeetingService {
-
-    @GetMapping("/meetingInfoStatus")
-    void meetingInfoStatus();
-
-}

service-meeting/service-meeting-api/src/main/java/com/usky/meeting/RemoteMeetingService.java

@@ -0,0 +1,14 @@
+package com.usky.meeting;
+
+
+import com.usky.meeting.factory.RemoteMeetingFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(contextId = "RemoteMeetingService", value = "service-meeting", fallbackFactory = RemoteMeetingFallbackFactory.class)
+public interface RemoteMeetingService {
+
+    @GetMapping("/meetingInfoStatus")
+    void meetingInfoStatus();
+
+}

service-meeting/service-meeting-api/src/main/java/com/usky/demo/RemoteUserService.java → service-meeting/service-meeting-api/src/main/java/com/usky/meeting/RemoteUserService.java

@@ -1,8 +1,8 @@
-package com.usky.demo;
+package com.usky.meeting;
 
 
 import com.usky.common.core.bean.ApiResult;
-import com.usky.demo.domain.SysUserVO;
+import com.usky.meeting.domain.SysUserVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

service-meeting/service-meeting-api/src/main/java/com/usky/demo/domain/SysUserVO.java → service-meeting/service-meeting-api/src/main/java/com/usky/meeting/domain/SysUserVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.domain;
+package com.usky.meeting.domain;
 
 
 import lombok.Data;

service-meeting/service-meeting-api/src/main/java/com/usky/demo/factory/RemoteMeetingFallbackFactory.java → service-meeting/service-meeting-api/src/main/java/com/usky/meeting/factory/RemoteMeetingFallbackFactory.java

@@ -1,18 +1,11 @@
-package com.usky.demo.factory;
+package com.usky.meeting.factory;
 
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.exception.FeignBadRequestException;
-import com.usky.demo.RemoteMeetingService;
-import com.usky.demo.RemoteUserService;
-import com.usky.demo.domain.SysUserVO;
+import com.usky.meeting.RemoteMeetingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 
 /**

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/MybatisGenerator.java

@@ -1,6 +1,4 @@
-package com.usky.meeting;//package com.usky.demo.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
-
-
+package com.usky.meeting;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/api/ServiceMeetingTaskApi.java

@@ -1,6 +1,6 @@
 package com.usky.meeting.controller.api;
 
-import com.usky.demo.RemoteMeetingService;
+import com.usky.meeting.RemoteMeetingService;
 import com.usky.meeting.service.MeetingInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/SysUserController.java

@@ -4,6 +4,7 @@ package com.usky.meeting.controller.web;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,7 +14,7 @@ import org.springframework.stereotype.Controller;
  * @author zyj
  * @since 2024-03-18
  */
-@Controller
+@RestController
 @RequestMapping("/sysUser")
 public class SysUserController {
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.usky.meeting.mapper;
 
 import com.usky.meeting.domain.SysUser;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author zyj
  * @since 2024-03-18
  */
+@Repository
 public interface SysUserMapper extends CrudMapper<SysUser> {
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingDeviceServiceImpl.java

@@ -190,9 +190,9 @@ public class MeetingDeviceServiceImpl extends AbstractCrudService<MeetingDeviceM
         meetingDevice.setCreateTime(now);
         meetingDevice.setTenantId(SecurityUtils.getTenantId());
 
-        String ipAddr = meetingDevice.getIpAddr();
+        String deviceCode = meetingDevice.getDeviceCode();
         LambdaQueryWrapper<MeetingDeviceHeartbeat> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(MeetingDeviceHeartbeat::getIpAddr, ipAddr);
+        queryWrapper.eq(MeetingDeviceHeartbeat::getDeviceCode, deviceCode);
         MeetingDeviceHeartbeat meetingDeviceHeartbeat = heartbeatMapper.selectOne(queryWrapper);
         if (meetingDeviceHeartbeat == null) {
             throw new BusinessException("设备离线!请重新输入");
@@ -218,9 +218,9 @@ public class MeetingDeviceServiceImpl extends AbstractCrudService<MeetingDeviceM
         meetingDevice.setUpdateBy(SecurityUtils.getUsername());
         meetingDevice.setUpdateTime(now);
 
-        String ipAddr = meetingDevice.getIpAddr();
+        String deviceCode = meetingDevice.getDeviceCode();
         LambdaQueryWrapper<MeetingDeviceHeartbeat> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(MeetingDeviceHeartbeat::getIpAddr, ipAddr);
+        queryWrapper.eq(MeetingDeviceHeartbeat::getDeviceCode, deviceCode);
         MeetingDeviceHeartbeat meetingDeviceHeartbeat = heartbeatMapper.selectOne(queryWrapper);
         if (meetingDeviceHeartbeat == null) {
             throw new BusinessException("设备离线!请重新输入");

service-meeting/service-meeting-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/log/uskycloud/usky-demo" />
+	<property name="log.path" value="/var/log/uskycloud/usky-meeting" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingDeviceHeartbeatMapper.xml

@@ -11,7 +11,7 @@
         <result column="device_type" property="deviceType"/>
         <result column="create_time" property="createTime"/>
         <result column="model" property="model"/>
-        <result column="manu_facturer" property="manufacturer"/>
+        <result column="manu_facturer"  property="manuFacturer"/>
         <result column="version" property="version"/>
         <result column="sdk" property="sdk"/>
     </resultMap>

service-meeting/service-meeting-biz/src/main/resources/smart-doc.json

@@ -4,10 +4,10 @@
   "isStrict": false,
   "coverOld": true,
   "allInOne": true,
-  "packageFilters": "com.usky.demo.controller.web",
+  "packageFilters": "com.usky.meeting.controller.web",
   "requestExample":"false",
   "responseExample":"true",
-  "projectName": "安防项目",
+  "projectName": "会议预约",
   "appKey": "20211216921084883495813120",
   "appToken":"36bde2426ad546a5a50311bb747e7e61",
   "secret": "N@Pd,KXAHki*BW3=zK.XPNykf!=CM79J",

usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/ApplicationRun.java → usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/meeting/ApplicationRun.java

@@ -1,4 +1,4 @@
-package com.usky.demo;
+package com.usky.meeting;
 
 
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
@@ -11,7 +11,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;