From a288efbac8d731488f582da50d39c4b5e0419920 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 27 十月 2025 15:25:29 +0800
Subject: [PATCH] #配置信号
---
src/main/java/com/zy/asrs/controller/BasAgvMastController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvMastController.java b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
index 21aed78..ea3e419 100644
--- a/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
@@ -1,17 +1,13 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
+import com.core.common.*;
import com.zy.asrs.entity.BasAgvMast;
import com.zy.asrs.service.BasAgvMastService;
import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +39,7 @@
convert(param, wrapper);
allLike(BasAgvMast.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("modi_time",false);
return R.ok(basAgvMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -62,6 +59,10 @@
@RequestMapping(value = "/basAgvMast/add/auth")
@ManagerAuth
public R add(BasAgvMast basAgvMast) {
+ SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
+ long nextId = snowflakeIdWorker.nextId();
+ basAgvMast.setTimestamp(nextId);
+ basAgvMast.setDevpId(1);
basAgvMastService.insert(basAgvMast);
return R.ok();
}
--
Gitblit v1.9.1