添加设备日志类型筛选

common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java

@@ -21,6 +21,7 @@ public class MessageProducer implements IMessageProduceService {
     @Autowired
     private RabbitTemplate rabbitTemplate;
 
+
     public void syncAccessSend(AccessLogPdu accessLogPdu) {
         //new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
         //rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));

log-manager/src/main/bin/start.sh

@@ -61,6 +61,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
 				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
+				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=211092 \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

log-manager/src/main/java/com/mortals/xhx/module/error/web/ErrorLogController.java

 package com.mortals.xhx.module.error.web;
 import cn.hutool.core.util.IdUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
@@ -63,4 +64,8 @@ public class ErrorLogController extends BaseCRUDJsonBodyMappingController<ErrorL
     public String save(@RequestBody ErrorLogEntity entity) {
         return super.save(entity);
     }
+
+
+
+
 }
\ No newline at end of file

log-manager/src/main/java/com/mortals/xhx/module/operate/web/OperateLogController.java

 package com.mortals.xhx.module.operate.web;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
@@ -10,8 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.operate.model.OperateLogEntity;
 import com.mortals.xhx.module.operate.service.OperateLogService;
@@ -20,32 +25,34 @@ import com.mortals.framework.util.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 平台用户操作日志业务
-*
-* @author zxfei
-* @date 2022-08-17
-*/
+ * 平台用户操作日志业务
+ *
+ * @author zxfei
+ * @date 2022-08-17
+ */
 @RestController
 @RequestMapping("operate/log")
-public class OperateLogController extends BaseCRUDJsonBodyMappingController<OperateLogService,OperateLogEntity,Long> {
+public class OperateLogController extends BaseCRUDJsonBodyMappingController<OperateLogService, OperateLogEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public OperateLogController(){
-        super.setModuleDesc( "平台用户操作日志业务");
+    public OperateLogController() {
+        super.setModuleDesc("平台用户操作日志业务");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "operType", paramService.getParamBySecondOrganize("OperateLog","operType"));
-        this.addDict(model, "platformMark", paramService.getParamBySecondOrganize("OperateLog","platformMark"));
+        this.addDict(model, "operType", paramService.getParamBySecondOrganize("OperateLog", "operType"));
+        this.addDict(model, "platformMark", paramService.getParamBySecondOrganize("OperateLog", "platformMark"));
 
         super.init(model, context);
     }
@@ -61,9 +68,16 @@ public class OperateLogController extends BaseCRUDJsonBodyMappingController<Oper
     @Override
     @UnAuth
     public String save(@RequestBody OperateLogEntity entity) {
+        return super.save(entity);
+    }
 
+    public static void main(String[] args) throws JsonProcessingException {
+        String json = "{\"content\":\"查询平台用户操作日志业务 【成功】\",\"ip\":\"192.168.0.57\",\"logDate\":1687232793556,\"loginName\":\"admin\",\"operType\":1,\"platformMark\":\"log-manager\",\"requestUrl\":\"/logservice/operate/log/list\",\"userId\":1,\"userName\":\"系统管理员\"}";
 
+        ObjectMapper objectMapper = new ObjectMapper();
+        OperateLogEntity person = objectMapper.readValue(json, OperateLogEntity.class);
+
+        System.out.println(person.toString());
 
-        return super.save(entity);
     }
 }
\ No newline at end of file