更新！11

OneCardIotClient/src/main/java/com/zhongshu/iot/client/type/OperationLogBusType.java

@@ -12,6 +12,7 @@ public enum OperationLogBusType {
     IotTemple("产品管理"),
     IotThing("物模型相关"),
     Common("通用"),
+    DockerMeta("容器管理"),
     ;
 
     @Getter

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/DeviceInfoDao.java

@@ -23,7 +23,7 @@ public interface DeviceInfoDao extends DeviceInfoDaoExtend, org.springframework.
 
     long countByMqttUserNameAndIsDeleteAndDeviceCategory(String mqttUserName, Boolean isDelete, DeviceCategory deviceCategory);
 
-    List<DeviceInfo> findByRegistTypeIn(List<RegistType> registTypes);
+    List<DeviceInfo> findByDeviceCategoryIn(List<DeviceCategory> deviceCategories);
 
     Long countByProductCodeAndIsDelete(String productCode, Boolean isDelete);
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/JMXSyncService.java

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.server.core.service.device;
 
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceState;
-import com.github.microservice.types.deviceUse.RegistType;
 import com.zhongshu.iot.server.core.dao.mqtt.*;
 import com.zhongshu.iot.server.core.dataConfig.MqttConfig;
 import com.zhongshu.iot.server.core.domain.iot.device.*;
@@ -509,10 +509,11 @@ public class JMXSyncService {
     /**
      * 同步所有直连设备的权限
      *
-     * @return
+     * @returns
      */
     public ResultContent refreshAllDirectDevice() {
-        List<DeviceInfo> deviceInfos = deviceInfoDao.findByRegistTypeIn(List.of(RegistType.DirectConnection));
+        List<DeviceInfo> deviceInfos = deviceInfoDao.findByDeviceCategoryIn(
+                List.of(DeviceCategory.DC));
         if (ObjectUtils.isNotEmpty(deviceInfos)) {
             syncDevicesSecurity(deviceInfos);
         }

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/docker/DockerMetaService.java

@@ -2,8 +2,10 @@ package com.zhongshu.iot.server.core.service.docker;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.zhongshu.iot.client.model.docker.*;
+import com.zhongshu.iot.client.type.OperationLogBusType;
 import com.zhongshu.iot.server.core.dao.docker.AkSkConfigDao;
 import com.zhongshu.iot.server.core.dao.docker.DockerMetaDao;
 import com.zhongshu.iot.server.core.dao.docker.DockerMetaLastTimeDao;
@@ -11,10 +13,10 @@ import com.zhongshu.iot.server.core.domain.docker.AkSkConfig;
 import com.zhongshu.iot.server.core.domain.docker.DockerMeta;
 import com.zhongshu.iot.server.core.domain.docker.DockerMetaLastTime;
 import com.zhongshu.iot.server.core.service.base.SuperService;
+import com.zhongshu.iot.server.core.service.user.OperationLogsService;
 import com.zhongshu.iot.server.core.util.SecurityUtil;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.github.microservice.net.ResultContent;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -49,6 +51,9 @@ public class DockerMetaService extends SuperService {
     @Autowired
     private AkSkConfigDao akSkConfigTimeDao;
 
+    @Autowired
+    private OperationLogsService operationLogsService;
+
     /**
      * 添加docker元数据
      *
@@ -86,6 +91,8 @@ public class DockerMetaService extends SuperService {
         }
         dockerMetaDao.save(dockerMeta);
         updateLastTime(groupCode);
+
+        operationLogsService.addLogs(String.format("编辑或添加了容器信息【%s】", dockerMeta.getName()), OperationLogBusType.DockerMeta, dockerMeta);
         return ResultContent.buildSuccess();
     }
 
@@ -102,6 +109,7 @@ public class DockerMetaService extends SuperService {
         }
         updateLastTime(dockerMeta.getGroupCode());
         dockerMetaDao.delete(dockerMeta);
+        operationLogsService.addLogs(String.format("删除了容器信息【%s】", dockerMeta.getName()), OperationLogBusType.DockerMeta, dockerMeta);
         return ResultContent.buildSuccess();
     }
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotTemplate2DeviceService.java

@@ -14,6 +14,7 @@ import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate2Device;
 import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;
+import com.zhongshu.iot.server.core.service.user.OperationLogsService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +53,9 @@ public class IotTemplate2DeviceService {
     @Autowired
     private DeviceInfoDao deviceInfoDao;
 
+    @Autowired
+    private OperationLogsService operationLogsService;
+
     /**
      * 绑定 物模型和设备的关系
      *

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotThing2DeviceService.java

@@ -6,6 +6,7 @@ import com.github.microservice.busInfoModel.thing.IotThing2DeviceSearch;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.deviceUse.ThingType;
+import com.zhongshu.iot.client.type.OperationLogBusType;
 import com.zhongshu.iot.server.core.dao.iot.IotThing2DeviceDao;
 import com.zhongshu.iot.server.core.dao.iot.IotThingDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
@@ -15,6 +16,7 @@ import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;
 import com.zhongshu.iot.server.core.service.device.ProjectInfoService;
+import com.zhongshu.iot.server.core.service.user.OperationLogsService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -54,6 +56,9 @@ public class IotThing2DeviceService extends SuperService {
     @Autowired
     private IotThingDao iotThingDao;
 
+    @Autowired
+    private OperationLogsService operationLogsService;
+
     /**
      * 绑定物模型和设备
      *
@@ -139,6 +144,7 @@ public class IotThing2DeviceService extends SuperService {
         }
         iotThing2DeviceDao.deleteById(id);
         iotThingService.updateThingDeviceCount(entity.getIotThingId());
+        operationLogsService.addLogs(String.format("物模型【%s】解绑了设备【%s】", iotThing.getName(), entity.getDeviceId()), OperationLogBusType.IotThing, entity);
         return ResultContent.buildSuccess();
     }
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/util/test/Test153AddUser.java

@@ -40,7 +40,7 @@ public class Test153AddUser {
                 for (int i = 0; i < 10; i++) {
                     int num = random.nextInt(1000);
                     log.info("添加用户----------------------- {} {}", i, num);
-                    String name = "mqttUser" + i;
+                    String name = "mqttUser" + num;
                     try {
                         String str = addressControl.listUser(name);
                         if (JMXUtil.mqttUserIsExit(str)) {
@@ -53,7 +53,7 @@ public class Test153AddUser {
                     String roleName = name;
                     String passWord = name;
                     try {
-                        addressControl.addUser(name, passWord, roleName, true);
+                        addressControl.addUser(name, passWord, roleName, false);
                         String addressMatch = MqttTopicUtils.buildDeviceAllTopic(name);
 //                        addressMatch = "/#";
 //                        addressControl.removeSecuritySettings(addressMatch);