From e9d5cf17813a52fe58a5924999655d01532a6b2b Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 26 七月 2025 13:22:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/controller/BasErrorDeviceController.java | 10 ++++++++++
src/main/resources/mapper/LocMastMapper.xml | 14 ++++++++++++++
src/main/webapp/views/operateLog/operateLog.html | 10 ++++++++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 1 +
src/main/java/com/zy/asrs/service/LocMastService.java | 1 +
src/main/java/com/zy/system/controller/OperateLogController.java | 8 ++++----
7 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasErrorDeviceController.java b/src/main/java/com/zy/asrs/controller/BasErrorDeviceController.java
index 066f420..bb68599 100644
--- a/src/main/java/com/zy/asrs/controller/BasErrorDeviceController.java
+++ b/src/main/java/com/zy/asrs/controller/BasErrorDeviceController.java
@@ -44,6 +44,16 @@
errorDeviceParam.setEquipmentNo(locMast.getLocNo());
errorDeviceParamList.add(errorDeviceParam);
}
+
+ List<LocMast> locMastList3 = locMastService.asrLocMastNotInDetl3();
+
+ for (LocMast locMast : locMastList3){
+ ErrorDeviceParam errorDeviceParam = new ErrorDeviceParam();
+ errorDeviceParam.setErrorM("搴撲綅涓篎/D浣嗗瓨鍦ㄥ伐浣滄。妗�");
+ errorDeviceParam.setCategory("搴撲綅");
+ errorDeviceParam.setEquipmentNo(locMast.getLocNo());
+ errorDeviceParamList.add(errorDeviceParam);
+ }
return R.ok(errorDeviceParamList);
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index dda60cd..ddd7c78 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -17,6 +17,7 @@
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
List<LocMast> asrLocMastNotInDetl1();
List<LocMast> asrLocMastNotInDetl2();
+ List<LocMast> asrLocMastNotInDetl3();
List<ErrorDeviceParam> adjacentLocMast();
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 26d994e..50825cc 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -15,6 +15,7 @@
LocMast queryFreeLocMast(Integer row, Short locType1);
List<LocMast> asrLocMastNotInDetl1();
List<LocMast> asrLocMastNotInDetl2();
+ List<LocMast> asrLocMastNotInDetl3();
List<ErrorDeviceParam> adjacentLocMast();
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 3ac882a..e6debf5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -36,6 +36,11 @@
}
@Override
+ public List<LocMast> asrLocMastNotInDetl3() {
+ return this.baseMapper.asrLocMastNotInDetl3();
+ }
+
+ @Override
public List<ErrorDeviceParam> adjacentLocMast() {
return this.baseMapper.adjacentLocMast();
}
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index 8399ad4..567c7c6 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -55,7 +55,7 @@
}
@RequestMapping(value = "/operateLog/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼搴撲綅")
public R edit(OperateLog operateLog) {
if (Cools.isEmpty(operateLog)){
return R.error();
@@ -69,14 +69,14 @@
}
@RequestMapping(value = "/operateLog/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鎵嬪姩娣诲姞鏀瑰簱浣�")
public R add(OperateLog operateLog) {
operateLogService.insert(operateLog);
return R.ok();
}
@RequestMapping(value = "/operateLog/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鎵嬪姩淇敼搴撲綅")
public R update(OperateLog operateLog){
if (Cools.isEmpty(operateLog) || null==operateLog.getId()){
return R.error();
@@ -86,7 +86,7 @@
}
@RequestMapping(value = "/operateLog/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎搴撲綅")
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
return R.error();
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 6413fed..654e059 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -77,6 +77,20 @@
FROM asr_wrk_mast AS d
WHERE a.loc_no = d.loc_no OR a.loc_no = d.source_loc_no
)
+ order by a.loc_no
+ </select>
+
+ <!-- 搴撲綅涓篎\D浣嗗瓨鍦ㄥ伐浣滄。妗�-->
+ <select id="asrLocMastNotInDetl3" resultMap="BaseResultMap">
+ SELECT a.*
+ FROM asr_loc_mast AS a
+ WHERE a.loc_sts IN ('F','D')
+ AND EXISTS (
+ SELECT 1
+ FROM asr_wrk_mast AS d
+ WHERE a.loc_no = d.loc_no OR a.loc_no = d.source_loc_no
+ )
+ order by a.loc_no
</select>
<!-- 娣辨祬搴撲綅涓嶄竴鑷�-->
diff --git a/src/main/webapp/views/operateLog/operateLog.html b/src/main/webapp/views/operateLog/operateLog.html
index 827ece5..1ef2137 100644
--- a/src/main/webapp/views/operateLog/operateLog.html
+++ b/src/main/webapp/views/operateLog/operateLog.html
@@ -30,6 +30,16 @@
</div>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="request" placeholder="璇锋眰鏁版嵁" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="response" placeholder="杩斿洖鏁版嵁" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
--
Gitblit v1.9.1