修改日志记录

device-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java

@@ -8,6 +8,7 @@ import com.mortals.xhx.base.system.oper.service.OperLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 
@@ -30,6 +31,7 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService {
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
                              String content, String ip, Date logDate) {
         super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate);
+        if(ObjectUtils.isEmpty(userId)) return;
         operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
         OperateLogPdu operateLogPdu = new OperateLogPdu();
         operateLogPdu.initAttrValue();
@@ -43,13 +45,10 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService {
         operateLogPdu.setContent(content);
         operateLogPdu.setOperType(1);
         messageProducer.syncOperSend(operateLogPdu);
-
     }
 
     @Override
     public void doHandlerLog(String platformMark, String loginName, String requestUrl, String content, String ip) {
-        // operLogService.insertOperLog(ip, requestUrl, null, "", loginName,
-        // content);
         this.doHandlerLog(platformMark, null, "", loginName, requestUrl, content, ip, new Date());
 
 

device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageProducer.java

@@ -82,6 +82,5 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        System.out.println(111);
     }
 }

device-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -104,15 +104,12 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
         OperLogEntity operLogEntity = new OperLogEntity();
         operLogEntity.setIp(ip);
         operLogEntity.setLogDate(new Date());
-
-        operLogEntity.setPlatformMark(GlobalSysInfo.getPropertyValue(SysConstains.PROP_PLATFORM_MARK));
-        //operLogEntity.setOperType(operType.getValue());
+        operLogEntity.setPlatformMark(GlobalSysInfo.getPropertyValue(SysConstains.PROP_PLATFORM_MARK)==null?"unknow":GlobalSysInfo.getPropertyValue(SysConstains.PROP_PLATFORM_MARK));
         operLogEntity.setRequestUrl(requestUrl);
         operLogEntity.setLoginName(loginName);
         operLogEntity.setUserId(userId);
         operLogEntity.setUserName(userName);
         operLogEntity.setContent(content);
-
         save(operLogEntity, null);
     }
     private void formatterLogContent(OperLogEntity operLogEntity, String content, String id, OperTypeEnum operType) {

device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceRestartTaskImpl.java

@@ -52,7 +52,7 @@ public class DeviceRestartTaskImpl implements ITaskExcuteService {
             List<DeviceEntity> deviceEntities = deviceService.find(new DeviceQuery().productCode(productCode));
             for (DeviceEntity device : deviceEntities) {
                 try {
-                    Thread.sleep(2000);
+                    Thread.sleep(1000);
                 } catch (InterruptedException e) {
                 }
                 TbQueueMsgHeaders header = new DefaultTbQueueMsgHeaders();