阶段性提交：换Ibase类，先不让报错

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotDeviceController.java

@@ -168,7 +168,7 @@ public class IotDeviceController extends BaseController {
         List<IotDeviceListResVo> list = iotDeviceService.selectIotDeviceList(reqVo);
         iotDeviceService.setDevPicByDevList(list);
 
-        String ignorStatusDeviceList = sysConfigService.selectConfigValueByKey("iot_ignor_status_devicelist");
+        String ignorStatusDeviceList = sysConfigService.selectConfigValueByCommonKey("iot_ignor_status_devicelist");
         String[] ignorStatusDevBids = ignorStatusDeviceList.split(",");
         for(IotDeviceListResVo item : list){
             //判断devbid是否在忽略状态设备列表中

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotDeviceHostingController.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseRole;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysRole;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.framework.web.service.ISysRoleService;
 import com.yunfeiyun.agmp.common.framework.web.service.PermissionService;
@@ -498,9 +498,9 @@ public class IotDeviceHostingController extends BaseController {
 
     public boolean checkRole(String roleKey) {
         String userId = SecurityUtils.getUserId();
-        List<IBaseRole> iBaseRoles = sysRoleService.selectRolesByUserId(userId);
-        for (IBaseRole iBaseRole : iBaseRoles) {
-            if (iBaseRole.isFlag() && roleKey.equals(iBaseRole.getRoleKey())) {
+        List<SysRole> SysRoles = sysRoleService.selectRolesByUserId(userId);
+        for (SysRole SysRole : SysRoles) {
+            if (SysRole.isFlag() && roleKey.equals(SysRole.getRoleKey())) {
                 return true;
             }
         }

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotSluiceDeviceController.java

@@ -8,7 +8,6 @@ import com.nlf.calendar.Lunar;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseUser;
 import com.yunfeiyun.agmp.common.core.page.PageDomain;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.core.page.TableSupport;
@@ -211,8 +210,8 @@ public class IotSluiceDeviceController extends BaseController {
         }
         PageDomain pageDomain = TableSupport.buildPageRequest();
         IPage<IotSluicectllog> iotSluicectllogIPage = mongoService.findListPage(IotSluicectllog.class,param,pageDomain);
-        List<IBaseUser> sysUserList = sysUserService.selectUserList(new SysUser());
-        Map<String,String> userNameMap = sysUserList.stream().collect(Collectors.toMap(IBaseUser::getUserId,IBaseUser::getUserName));
+        List<SysUser> sysUserList = sysUserService.selectUserList(new SysUser());
+        Map<String,String> userNameMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId,SysUser::getUserName));
         List<JSONObject> result =  iotSluicectllogIPage.getRecords().stream().map(item->{
             IotDeviceListResVo iotDeviceListResVo = iotDeviceMap.get(item.getDevBid());
             JSONObject jsonObject = JSONObject.from(item);

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotWarnconfigController.java

@@ -6,9 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysRole;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseRole;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseUser;
 import com.yunfeiyun.agmp.common.core.text.Convert;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.framework.web.service.ISysRoleService;
@@ -47,7 +46,7 @@ import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 
 /**
  * 预警配置Controller
- * 
+ *
  * @author 杨晓辉
  * @date 2024-04-29
  */
@@ -103,7 +102,7 @@ public class IotWarnconfigController extends BaseController
         List<IotWarnconfigResVo> list = iotWarnconfigService.selectIotWarnconfigList(iotWarnconfig);
 
         //取角色名称列表
-        List<IBaseRole> roleList = sysRoleService.selectRoleAll();
+        List<SysRole> roleList = sysRoleService.selectRoleAll();
 
         for (IotWarnconfigResVo item:list
         ) {
@@ -112,7 +111,7 @@ public class IotWarnconfigController extends BaseController
 
 
         //取用户名称列表
-        List<IBaseUser> userList = sysUserService.selectUserListOfAuth(new SysUser());
+        List<SysUser> userList = sysUserService.selectUserListOfAuth(new SysUser());
 
         for (IotWarnconfigResVo item:list
         ) {
@@ -225,12 +224,12 @@ public class IotWarnconfigController extends BaseController
         }
 
         //取角色名称列表
-        List<IBaseRole> roleList = sysRoleService.selectRoleAll();
+        List<SysRole> roleList = sysRoleService.selectRoleAll();
 
         iotWarnconfigResVo.setWcRevroleName(IotWarnlogController.getRolenameListByIds(iotWarnconfigResVo.getWcRevrole(),roleList));
 
         //取用户名称列表
-        List<IBaseUser> userList = sysUserService.selectUserListOfAuth(new SysUser());
+        List<SysUser> userList = sysUserService.selectUserListOfAuth(new SysUser());
 
         iotWarnconfigResVo.setWcRecvuserName(IotWarnlogController.getUsernamesByIds(iotWarnconfigResVo.getWcRecvuser(),userList));
 
@@ -302,7 +301,7 @@ public class IotWarnconfigController extends BaseController
                 if("0".equals(itemUserId)){
                     continue;
                 }
-                IBaseUser findUser = sysUserService.selectUserById(itemUserId);
+                SysUser findUser = sysUserService.selectUserById(itemUserId);
                 if (findUser == null
                         || (findUser != null && "2".equals(findUser.getUserDelstatus()))
                 ) {

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotWarnlogController.java

@@ -4,9 +4,8 @@ import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.entity.PtsMsg;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysRole;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseRole;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseUser;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.framework.web.service.ISysRoleService;
@@ -39,7 +38,7 @@ import java.util.List;
 
 /**
  * 预警记录Controller
- * 
+ *
  * @author 杨晓辉
  * @date 2024-04-29
  */
@@ -117,10 +116,10 @@ public class IotWarnlogController extends BaseController
         list = iotWarnlogService.selectIotWarnlogList(iotWarnlog);
 
         //取角色名称列表
-        List<IBaseRole> roleList = sysRoleService.selectRoleAll();
+        List<SysRole> roleList = sysRoleService.selectRoleAll();
 
         //取用户名称列表
-        List<IBaseUser> userList = sysUserService.selectUserList(new SysUser());
+        List<SysUser> userList = sysUserService.selectUserList(new SysUser());
 
         //取绑定地块信息
         HashMap<String,String> hmBlockInfo = new HashMap<>();
@@ -200,7 +199,7 @@ public class IotWarnlogController extends BaseController
      * @param roleList
      * @return
      */
-    public static String getRolenameListByIds(String roleids, List<IBaseRole> roleList){
+    public static String getRolenameListByIds(String roleids, List<SysRole> roleList){
         StringBuffer retSb = new StringBuffer();
 
         if(!StringUtils.isEmpty(roleids)){
@@ -214,7 +213,7 @@ public class IotWarnlogController extends BaseController
                 }
 
                 String rolename = "";
-                for (IBaseRole role:roleList
+                for (SysRole role:roleList
                      ) {
 
                     if(role.getRoleId().equals(roleid)){
@@ -238,7 +237,7 @@ public class IotWarnlogController extends BaseController
         return retSb.toString();
     }
 
-    public static String getUsernamesByIds(String userids,List<IBaseUser> userList){
+    public static String getUsernamesByIds(String userids,List<SysUser> userList){
 
 
         StringBuffer retSb = new StringBuffer();
@@ -254,7 +253,7 @@ public class IotWarnlogController extends BaseController
                 }
 
                 String username = "";
-                for (IBaseUser user:userList
+                for (SysUser user:userList
                 ) {
 
                     if(user.getUserId().equals(userid)){
@@ -291,7 +290,7 @@ public class IotWarnlogController extends BaseController
         List<IotWarnlogResVo> list = iotWarnlogService.selectIotWarnlogList(iotWarnlog);
 
         //取用户名称列表
-        List<IBaseUser> userList = sysUserService.selectUserList(new SysUser());
+        List<SysUser> userList = sysUserService.selectUserList(new SysUser());
 
         //取绑定地块信息
         HashMap<String,String> hmBlockInfo = new HashMap<>();
@@ -361,14 +360,14 @@ public class IotWarnlogController extends BaseController
         IotWarnlogResVo iotWarnlogResVo = iotWarnlogService.selectIotWarnlogByBid(wlBid);
 
         //取角色名称列表
-        List<IBaseRole> roleList = sysRoleService.selectRoleAll();
+        List<SysRole> roleList = sysRoleService.selectRoleAll();
 
         iotWarnlogResVo.setWcRevroleName(getRolenameListByIds(iotWarnlogResVo.getWcRevrole(),roleList));
 
 
 
         //取用户名称列表
-        List<IBaseUser> userList = sysUserService.selectUserList(new SysUser());
+        List<SysUser> userList = sysUserService.selectUserList(new SysUser());
 
         iotWarnlogResVo.setWcRecvuserName(getUsernamesByIds(iotWarnlogResVo.getWcRecvuser(),userList));
 

src/main/java/com/yunfeiyun/agmp/iotm/mq/IotmMqReceiver.java

@@ -2,7 +2,7 @@ package com.yunfeiyun.agmp.iotm.mq;
 
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.framework.mq.MqMsg;
+import com.yunfeiyun.agmp.common.framework.message.MqMsg;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;

src/main/java/com/yunfeiyun/agmp/iotm/mq/IotmMqService.java

@@ -1,7 +1,7 @@
 package com.yunfeiyun.agmp.iotm.mq;
 
 
-import com.yunfeiyun.agmp.common.framework.mq.MqMsg;
+import com.yunfeiyun.agmp.common.framework.message.MqMsg;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.iotm.device.service.IIotCmdtaskService;
 import com.yunfeiyun.agmp.iotm.device.service.IIotDeviceconfigService;