From 630f5050eef4c2fd8dc7aa6ff43c3ceeeedd71e9 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 14:55:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasAgvWrkDetlController.java | 101 --------------------------------------------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++
src/main/java/com/zy/system/entity/User.java | 9 +++-
3 files changed, 14 insertions(+), 104 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvWrkDetlController.java b/src/main/java/com/zy/asrs/controller/BasAgvWrkDetlController.java
index 893d6eb..140b730 100644
--- a/src/main/java/com/zy/asrs/controller/BasAgvWrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/BasAgvWrkDetlController.java
@@ -21,105 +21,4 @@
@RestController
public class BasAgvWrkDetlController extends BaseController {
- @Autowired
- private BasAgvWrkDetlService basAgvWrkDetlService;
-
- @RequestMapping(value = "/basAgvWrkDetl/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basAgvWrkDetlService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basAgvWrkDetl/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(BasAgvWrkDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basAgvWrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/basAgvWrkDetl/add/auth")
- @ManagerAuth
- public R add(BasAgvWrkDetl basAgvWrkDetl) {
- basAgvWrkDetlService.insert(basAgvWrkDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/basAgvWrkDetl/update/auth")
- @ManagerAuth
- public R update(BasAgvWrkDetl basAgvWrkDetl){
- if (Cools.isEmpty(basAgvWrkDetl) || null==basAgvWrkDetl.getId()){
- return R.error();
- }
- basAgvWrkDetlService.updateById(basAgvWrkDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/basAgvWrkDetl/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basAgvWrkDetlService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basAgvWrkDetl/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("basAgvWrkDetl"));
- convert(map, wrapper);
- List<BasAgvWrkDetl> list = basAgvWrkDetlService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/basAgvWrkDetlQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<BasAgvWrkDetl> page = basAgvWrkDetlService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasAgvWrkDetl basAgvWrkDetl : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basAgvWrkDetl.getId());
- map.put("value", basAgvWrkDetl.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/basAgvWrkDetl/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<BasAgvWrkDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basAgvWrkDetlService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasAgvWrkDetl.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 10784d2..8646b5a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1184,7 +1184,7 @@
//mark - 3 - ....
this.locToLoc(crn, crnProtocol,mark);
//棰勮皟搴�
-// this.crnRebackHp(crn, crnProtocol, crnThread);
+ this.crnRebackHp(crn, crnProtocol, crnThread);
}
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
@@ -1202,6 +1202,9 @@
new EntityWrapper<BasCrnp>().eq("crn_no", crnProtocol.getCrnNo())
);
boolean result = true;
+ if(crnProtocol.getCrnNo() == 3){
+ return;
+ }
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
@@ -4118,6 +4121,9 @@
log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�4", slave.getId());
continue;
}
+ if(staProtocol == null){
+ continue;
+ }
if(staProtocol.getWorkNo() == 0){
continue;
}
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index c5086aa..0d86e0c 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -41,7 +41,10 @@
* 鎵嬫満鍙�
*/
private String mobile;
-
+ /**
+ * 鍚嶇О
+ */
+ private String nickname;
/**
* 瀵嗙爜
*/
@@ -140,7 +143,9 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
-
+ public String getNickname() {
+ return nickname;
+ }
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
--
Gitblit v1.9.1