Forráskód Böngészése

feat:“脱机操作添加日志”

soobin 1 éve
szülő
commit
0e86895b88

+ 1 - 0
src/main/java/com/szwl/constant/AuditEnum.java

@@ -15,6 +15,7 @@ public enum AuditEnum implements IEnum<String> {
     UPDATE("UPDATE","修改"),
     DELETE("DELETE","删除"),
     LOGIN("LOGIN","登录"),
+    OFFLINE("OFFLINE","脱机"),
     PAY_ORDER("PAY_ORDER", "支付订单");
 
     private String code;

+ 11 - 1
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -9,10 +9,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.szwl.annotation.Audit;
+import com.szwl.constant.AuditEnum;
 import com.szwl.constant.ResponseCodesEnum;
+import com.szwl.manager.TokenManager;
 import com.szwl.model.bean.*;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.bo.UserDetailBO;
 import com.szwl.model.entity.*;
 import com.szwl.model.param.PasswordParam;
 import com.szwl.model.query.StatisticsParam;
@@ -75,6 +79,9 @@ public class TEquipmentController {
     TOrderService tOrderService;
     @Autowired
     TAdminEquipmentService tAdminEquipmentService;
+
+    TokenManager tokenManager;
+
     private int j;
 
     private static final int TIMEOUT = 30000;  // 超时时间为30秒
@@ -724,14 +731,17 @@ public class TEquipmentController {
     //脱机
     @ApiOperation(value = "脱机")
     @PostMapping("/tuoji")
+    @Audit(type = AuditEnum.OFFLINE, content = "#loginUser.name + '对设备' +  #equipment.clientId + '进行了脱机操作'")
     public ResponseEntity<?> tuoji(@RequestBody TEquipment equipment) {
+        //获取当前操作人员
+        UserDetailBO loginUser = tokenManager.getLoginUserDetails();
         if (equipment.getId() == null) {
             return ResponseEntity.status(HttpStatus.OK)
                     .body(new ResultMessage().setCode(false).setData("").setMessage(""));
         }
         TEquipment tEquipment = tEquipmentService.getById(equipment.getId());
         tEquipmentService.sentMessage(tEquipment.getClientId(), PushUtils.buildJson("tuoji", "0").toString());
-        if ("xxx".equals(tEquipment.getClientId().substring(tEquipment.getClientId().length() - 3, tEquipment.getClientId().length()))) {
+        if ("xxx".equals(tEquipment.getClientId().substring(tEquipment.getClientId().length() - 3))) {
             return ResponseEntity.status(HttpStatus.OK)
                     .body(new ResultMessage().setCode(true).setData("").setMessage("发送成功!"));
         }