From 5aa831dffdfb0ca524362e8d649c28babc681ece Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期一, 30 六月 2025 16:43:18 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/service/BasErrLogService.java | 7 +
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 6
src/main/webapp/views/basErrLog/basErrLog.html | 7 +
src/main/java/com/zy/asrs/controller/OpenController.java | 4
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10
src/main/java/com/zy/system/entity/license/LicenseVerify.java | 4
src/main/java/com/zy/core/model/command/CrnCommand.java | 9 +
src/main/resources/mapper/BasErrLogMapper.xml | 69 +++++++++++
src/main/java/com/zy/asrs/controller/BasErrLogController.java | 61 +++++++--
src/main/java/com/zy/asrs/entity/BasErrLog.java | 27 ++++
src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java | 22 +++
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 44 +++++++
src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java | 13 ++
src/main/webapp/static/wms/js/basErrLog/basErrLog.js | 22 +-
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 10
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 44 +++++-
16 files changed, 302 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasErrLogController.java b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
index e64f386..acb85f1 100644
--- a/src/main/java/com/zy/asrs/controller/BasErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
@@ -16,10 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class BasErrLogController extends BaseController {
@@ -40,19 +37,51 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasErrLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- } else {
- wrapper.orderBy("CREATE_TIME", false);
- }
+ try{
+ Integer wrkNo = null;
+ Integer crnNo = null;
+ Integer plcNo = null;
+ Integer status = null;
+ String memo = null;
+ Date modiTimeStart = null, modiTimeEnd = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ modiTimeStart = DateUtils.convert(dates[0]);
+ modiTimeEnd = DateUtils.convert(dates[1]);
+ } else if (entry.getKey().equals("wrk_no")) {
+ wrkNo = Integer.parseInt(val);
+ } else if (entry.getKey().equals("crn_no")) {
+ crnNo = Integer.parseInt(val);
+ } else if (entry.getKey().equals("plc_no")) {
+ plcNo = Integer.parseInt(val);
+ } else if (entry.getKey().equals("status")) {
+ status = Integer.parseInt(val);
+ } else if (entry.getKey().equals("condition")) {
+ memo = val;
+ }
+ }
- List<BasErrLog> basErrLogList = basErrLogService.selectList(wrapper);
- Page<BasErrLog> page = new Page<BasErrLog>(0, 10).setRecords(basErrLogList);
- page.setTotal(basErrLogList.size());
- return R.ok(page);
+// EntityWrapper<BasErrLog> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){
+// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+// } else {
+// wrapper.orderBy("CREATE_TIME", false);
+// }
+
+ List<BasErrLog> basErrLogList = basErrLogService.selectBasErrLogList(wrkNo,crnNo,plcNo,status,memo,modiTimeStart,modiTimeEnd,curr,limit);
+ Page<BasErrLog> page = new Page<BasErrLog>(curr, limit).setRecords(basErrLogList);
+ page.setTotal(basErrLogService.selectBasErrLogListTotal(wrkNo,crnNo,plcNo,status,memo,modiTimeStart,modiTimeEnd));
+ return R.ok(page);
+ } catch (Exception e) {
+ return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage());
+ }
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7c4003f..b669db4 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -346,7 +346,7 @@
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wms/taskCreate", 1, "wms浠诲姟涓嬪彂,params:"+JSON.toJSONString(params));
+ deviceErrorService.addDeviceError("wms/taskCreate", 1, "wms浠诲姟涓嬪彂,浠诲姟鏁�:"+params.size());
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -356,7 +356,7 @@
if (Cools.isEmpty(param)){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鍙傛暟涓虹┖,params:"+JSON.toJSONString(params));
+ deviceErrorService.addDeviceError("wmsErr", 1, "鍙傛暟涓虹┖,param:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 05e592c..990db0d 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -88,11 +88,11 @@
status = Integer.parseInt(val);
}
}
-
- EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+//
+// EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index 218fd43..3bb2ac0 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.core.model.command.CrnCommand;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -202,6 +203,32 @@
this.memo = memo;
}
+
+ public BasErrLog(CrnCommand command,String error,String memo) {
+ Date now = new Date();
+ this.uuid = now.toString();
+ this.wrkNo = command.getTaskNo().intValue();
+ this.startTime = now;
+ this.endTime = now;
+ this.wrkSts = 0L;
+ this.ioType = 0;
+ this.crnNo = command.getLaneNo();
+ this.plcNo = command.getCrnNo();
+ this.locNo = command.getSourcePosX()+"鎺�"+command.getSourcePosY()+"鍒�"+command.getSourcePosZ()+"灞�";
+ this.staNo = 0;
+ this.sourceStaNo = 0;
+ this.sourceLocNo = command.getDestinationPosX()+"鎺�"+command.getDestinationPosY()+"鍒�"+command.getDestinationPosY()+"灞�";
+ this.barcode = "";
+ this.errCode = 0;
+ this.error = error;
+ this.status = 0;
+ this.createTime = now;
+ this.createBy = null;
+ this.updateTime = now;
+ this.updateBy = null;
+ this.memo = memo;
+ }
+
// BasErrLog basErrLog = new BasErrLog(
// null, // 缂栧彿
// null, // 宸ヤ綔鍙�
diff --git a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
index cd49855..5df4798 100644
--- a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
@@ -3,10 +3,32 @@
import com.zy.asrs.entity.BasErrLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
@Mapper
@Repository
public interface BasErrLogMapper extends BaseMapper<BasErrLog> {
+ List<BasErrLog> selectBasErrLogList(@Param("taskNo") Integer taskNo,
+ @Param("crnNo") Integer crnNo,
+ @Param("plcNo") Integer plcNo,
+ @Param("status") Integer status,
+ @Param("memo") String memo,
+ @Param("modiTimeStart") Date modiTimeStart,
+ @Param("modiTimeEnd") Date modiTimeEnd,
+ @Param("pageNumber") Integer curr,
+ @Param("pageSize") Integer limit);
+
+ Long selectBasErrLogListTotal(@Param("taskNo") Integer taskNo,
+ @Param("crnNo") Integer crnNo,
+ @Param("plcNo") Integer plcNo,
+ @Param("status") Integer status,
+ @Param("memo") String memo,
+ @Param("modiTimeStart") Date modiTimeStart,
+ @Param("modiTimeEnd") Date modiTimeEnd);
+
}
diff --git a/src/main/java/com/zy/asrs/service/BasErrLogService.java b/src/main/java/com/zy/asrs/service/BasErrLogService.java
index 3c335c1..969c125 100644
--- a/src/main/java/com/zy/asrs/service/BasErrLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasErrLogService.java
@@ -3,10 +3,17 @@
import com.zy.asrs.entity.BasErrLog;
import com.baomidou.mybatisplus.service.IService;
+import java.util.Date;
+import java.util.List;
+
public interface BasErrLogService extends IService<BasErrLog> {
BasErrLog findLatestByTaskNo(Integer crnNo, Integer taskNo);
BasErrLog findLatest(Integer crnNo);
+ List<BasErrLog> selectBasErrLogList(Integer taskNo, Integer crnNo, Integer plcNo, Integer status,String memo, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ Long selectBasErrLogListTotal(Integer taskNo, Integer crnNo, Integer plcNo, Integer status,String memo,Date modiTimeStart,Date modiTimeEnd);
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
index 817212c..c13ab60 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
@Service("basErrLogService")
@@ -31,4 +32,16 @@
return basErrLogs.get(0);
}
}
+
+
+
+ @Override
+ public List<BasErrLog> selectBasErrLogList(Integer taskNo, Integer crnNo, Integer plcNo, Integer status,String memo,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectBasErrLogList(taskNo,crnNo,plcNo, status,memo,modiTimeStart,modiTimeEnd,curr,limit);
+ }
+
+ @Override
+ public Long selectBasErrLogListTotal(Integer taskNo, Integer crnNo, Integer plcNo, Integer status,String memo,Date modiTimeStart,Date modiTimeEnd) {
+ return this.baseMapper.selectBasErrLogListTotal(taskNo,crnNo,plcNo, status,memo,modiTimeStart,modiTimeEnd);
+ }
}
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 1db045e..fdcb0d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1452,8 +1452,8 @@
null, // 缁撴潫鏃堕棿
taskWrk.getWrkSts().longValue(), // 宸ヤ綔鐘舵��
taskWrk.getIoType(), // 鍏ュ嚭搴撶被鍨�
- crn.getId(), // 鍫嗗灈鏈�
- null, // plc
+ taskWrk.getCrnNo(), // 宸烽亾鍙�
+ crn.getId(), // 鍫嗗灈鏈哄彿
taskWrk.getTargetPoint(), // 鐩爣搴撲綅
0, // 鐩爣绔�
0, // 婧愮珯
@@ -2331,7 +2331,7 @@
log.error("浠诲姟鐢熸垚澶辫触===銆嬪紓甯镐俊鎭細{}", e.getMessage());
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "鎸囦护鐢熸垚澶辫触锛氬紓甯镐俊鎭�"+e.getMessage());
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "鎸囦护鐢熸垚澶辫触");
} catch (Exception e2){
}
}
@@ -2435,7 +2435,7 @@
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "浠诲姟鐢熸垚澶辫触issued1锛氬紓甯镐俊鎭�"+e.getMessage());
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "浠诲姟鐢熸垚澶辫触issued1");
} catch (Exception e2){
}
return false;
@@ -2459,7 +2459,7 @@
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "绔欑偣浠诲姟鐢熸垚澶辫触issued2锛氬紓甯镐俊鎭�"+e.getMessage());
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "绔欑偣浠诲姟鐢熸垚澶辫触issued2");
} catch (Exception e2){
}
}
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index 9454973..219a53c 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -123,4 +123,13 @@
System.out.println("绀兼嫓");
System.out.println(mm);
}
+
+ public String getNowTask() {
+ String souLoc = this.getSourcePosX() + "鎺�" + this.getSourcePosY() + "鍒�" + this.getSourcePosZ() + "灞�";
+ String endLoc = this.getDestinationPosX() + "鎺�" + this.getDestinationPosY() + "鍒�" + this.getDestinationPosY() + "灞�";
+
+ return "浠诲姟鍙�:"+this.taskNo+";璧风偣:"+souLoc+";缁堢偣:"+endLoc+";妯″紡:"+this.taskModeType.name();
+ }
+
+
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 5b59838..3b40137 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -10,8 +10,10 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasErrLog;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasErrLogService;
import com.zy.asrs.service.DeviceErrorService;
import com.zy.core.CrnThread;
import com.zy.core.cache.CrnErrCache;
@@ -267,7 +269,19 @@
return false;
}
CrnErrCache.updateCrnErr(slave.getId(), "-");
-
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("crnWrite", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍫嗗灈鏈烘寚浠や笅鍙�:"+JSON.toJSONString(command.getNowTask()));
+ } catch (Exception e2){
+ }
+ try{
+ BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
+ BasErrLog basErrLog = new BasErrLog(command,"","闈炲紓甯革紝浠诲姟涓嬪彂璁板綍");
+ if (!basErrLogService.insert(basErrLog)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "浠诲姟涓嬪彂璁板綍澶辫触");
+ }
+ } catch (Exception e3){
+ }
// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
@@ -304,6 +318,20 @@
CrnErrCache.updateCrnErr(slave.getId(), "鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�");
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
+
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("crnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+i+";鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�:"+JSON.toJSONString(command.getNowTask()));
+ } catch (Exception e2){
+ }
+ try{
+ BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
+ BasErrLog basErrLog = new BasErrLog(command,"鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�","");
+ if (!basErrLogService.insert(basErrLog)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐ヨ褰曞け璐�");
+ }
+ } catch (Exception e3){
+ }
result = siemensNet.Write("DB100.0", array);
}else{
break;
@@ -325,7 +353,19 @@
log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "commandFinish:"+commandFinish);
log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
CrnErrCache.updateCrnErr(slave.getId(), "涓嬪彂DB100.18 鍥炶澶辫触");
-
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("crnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+signFinish+";涓嬪彂DB100.18 鍥炶澶辫触:"+JSON.toJSONString(command.getNowTask()));
+ } catch (Exception e2){
+ }
+ try{
+ BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
+ BasErrLog basErrLog = new BasErrLog(command,"涓嬪彂DB100.18 鍥炶澶辫触","");
+ if (!basErrLogService.insert(basErrLog)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "涓嬪彂DB100.18 鍥炶澶辫触璁板綍澶辫触");
+ }
+ } catch (Exception e3){
+ }
result = siemensNet.Write("DB100.18", commandFinish);
signFinish++;
}else {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b458a49..a2fd278 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -259,10 +259,10 @@
} catch (Exception e) {
connectDev = false;
- log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.error("dev鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV鏁版嵁璇诲彇绾跨▼寮傚父"+e.getMessage());
+ deviceErrorService.addDeviceError("devErr", slave.getId(), "dev鏁版嵁璇诲彇绾跨▼寮傚父"+e.getMessage());
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -386,12 +386,12 @@
log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
- try{
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.deleteDeviceError("devp", slave.getId());
- } catch (Exception e){
-// log.error("e:"+e.getMessage());
- }
+// try{
+// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+// deviceErrorService.deleteDeviceError("devp", slave.getId());
+// } catch (Exception e){
+//// log.error("e:"+e.getMessage());
+// }
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
// log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -410,6 +410,12 @@
ArrayList<Integer> staNos = getStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
+
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devWrite", staProtocol.getSiteId(), "鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
// //鏇存柊鍛戒护鏃ュ織
// CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
@@ -461,19 +467,33 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
slave.getId(), JSON.toJSON(staProtocol),writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆鍚庤鍙栦换鍔″�间笉涓�鑷�:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
}
} else {
writeCount++;
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
slave.getId(), JSON.toJSON(staProtocol), writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐�:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
}
} else {
writeCount++;
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
slave.getId(), JSON.toJSON(staProtocol),writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆杈撻�佺嚎鍛戒护澶辫触:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
//鏇存柊鎸囦护鏃ュ織
// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
// commandInfoLogService.insert(commandInfoLog);
@@ -489,7 +509,11 @@
}
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
-
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐�:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
//閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
read();//璇诲彇1娆¤澶囩姸鎬�
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index f90c043..68ec88a 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -61,10 +61,10 @@
//鍔犺浇璇佷功
public boolean loadLicense() {
if(!Cools.isEmpty(licensePath)){
- logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
+// logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
if (true){
- logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
+// logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
return true;
}
@@ -87,7 +87,7 @@
//瀹夎璇佷功
LicenseContent install = licenseVerify.install(param);
- logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
+// logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
return install != null;
} catch (Exception e) {
diff --git a/src/main/java/com/zy/system/entity/license/LicenseVerify.java b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
index 2175930..40aea7f 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseVerify.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
@@ -29,7 +29,7 @@
licenseManager.uninstall();
result = licenseManager.install(new File(param.getLicensePath()));
- logger.info(MessageFormat.format("璁稿彲璇佸姞杞芥垚鍔燂紝璁稿彲璇佹湁鏁堟湡锛歿0} - {1}",format.format(result.getNotBefore()),format.format(result.getNotAfter())));
+// logger.info(MessageFormat.format("璁稿彲璇佸姞杞芥垚鍔燂紝璁稿彲璇佹湁鏁堟湡锛歿0} - {1}",format.format(result.getNotBefore()),format.format(result.getNotAfter())));
}catch (Exception e){
logger.error("璁稿彲璇佸姞杞藉け璐ワ紒",e);
}
@@ -51,7 +51,7 @@
}
LicenseContent licenseContent = licenseManager.verify();
- logger.info(MessageFormat.format("璁稿彲璇佹牎楠岄�氳繃锛岃鍙瘉鏈夋晥鏈燂細{0} - {1}",format.format(licenseContent.getNotBefore()),format.format(licenseContent.getNotAfter())));
+// logger.info(MessageFormat.format("璁稿彲璇佹牎楠岄�氳繃锛岃鍙瘉鏈夋晥鏈燂細{0} - {1}",format.format(licenseContent.getNotBefore()),format.format(licenseContent.getNotAfter())));
return true;
}catch (Exception e){
logger.error("璁稿彲璇佹牎楠屽け璐ワ紒",e);
diff --git a/src/main/resources/mapper/BasErrLogMapper.xml b/src/main/resources/mapper/BasErrLogMapper.xml
new file mode 100644
index 0000000..8d939f9
--- /dev/null
+++ b/src/main/resources/mapper/BasErrLogMapper.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasErrLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasErrLog">
+ <id column="ID" property="id" />
+ <result column="UUID" property="uuid" />
+ <result column="WRK_NO" property="wrkNo" />
+ <result column="START_TIME" property="startTime" />
+ <result column="END_TIME" property="endTime" />
+ <result column="WRK_STS" property="wrkSts" />
+ <result column="IO_TYPE" property="ioType" />
+ <result column="CRN_NO" property="crnNo" />
+ <result column="PLC_NO" property="plcNo" />
+ <result column="LOC_NO" property="locNo" />
+ <result column="STA_NO" property="staNo" />
+ <result column="SOURCE_STA_NO" property="sourceStaNo" />
+ <result column="SOURCE_LOC_NO" property="sourceLocNo" />
+ <result column="BARCODE" property="barcode" />
+ <result column="ERR_CODE" property="errCode" />
+ <result column="ERROR" property="error" />
+ <result column="STATUS" property="status" />
+ <result column="CREATE_TIME" property="createTime" />
+ <result column="CREATE_BY" property="createBy" />
+ <result column="UPDATE_TIME" property="updateTime" />
+ <result column="UPDATE_BY" property="updateBy" />
+ <result column="MEMO" property="memo" />
+
+ </resultMap>
+
+ <sql id="batchSeq">
+ <if test="taskNo != null">
+ and WRK_NO = #{taskNo}
+ </if>
+ <if test="crnNo != null">
+ and CRN_NO = #{crnNo}
+ </if>
+ <if test="plcNo != null">
+ and PLC_NO = #{plcNo}
+ </if>
+ <if test="status != null">
+ and STATUS = #{status}
+ </if>
+ <if test="memo != null">
+ and MEMO = #{memo}
+ </if>
+ <if test="modiTimeStart != null ">
+ <if test="modiTimeEnd != null ">
+ and START_TIME between #{modiTimeStart} and #{modiTimeEnd}
+ </if>
+ </if>
+ </sql>
+
+ <select id="selectBasErrLogList" resultMap="BaseResultMap">
+ SELECT * FROM "SOURCE"."asr_bas_err_log"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
+ ORDER BY CREATE_TIME DESC
+ LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+ </select>
+
+ <select id="selectBasErrLogListTotal" resultType="Long">
+ SELECT count(1) FROM "SOURCE"."asr_bas_err_log"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
+ </select>
+
+</mapper>
diff --git a/src/main/webapp/static/wms/js/basErrLog/basErrLog.js b/src/main/webapp/static/wms/js/basErrLog/basErrLog.js
index cdc88ff..ccc6289 100644
--- a/src/main/webapp/static/wms/js/basErrLog/basErrLog.js
+++ b/src/main/webapp/static/wms/js/basErrLog/basErrLog.js
@@ -21,26 +21,26 @@
{type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'uuid', align: 'center',title: '缂栧彿', hide: true}
- ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
- ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃堕棿'}
- ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
- ,{field: 'wrkSts$', align: 'center',title: '浠诲姟鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈�'}
- ,{field: 'plcNo', align: 'center',title: 'plc', hide: true}
+ ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�', hide: false}
+ ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃堕棿', hide: false}
+ ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿', hide: false}
+ ,{field: 'wrkSts$', align: 'center',title: '浠诲姟鐘舵��', hide: false}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', hide: false}
+ ,{field: 'crnNo', align: 'center',title: '宸烽亾鍙�', hide: false}
+ ,{field: 'plcNo', align: 'center',title: '鍫嗗灈鏈哄彿', hide: false}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅', hide: true}
,{field: 'staNo', align: 'center',title: '鐩爣绔�', hide: true}
,{field: 'sourceStaNo', align: 'center',title: '婧愮珯', hide: true}
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
- ,{field: 'error', align: 'center',title: '寮傚父鎻忚堪'}
- ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+ ,{field: 'errCode', align: 'center',title: '寮傚父鐮�', hide: true}
+ ,{field: 'error', align: 'center',title: '寮傚父鎻忚堪', hide: false}
+ ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌', hide: false}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
// ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
diff --git a/src/main/webapp/views/basErrLog/basErrLog.html b/src/main/webapp/views/basErrLog/basErrLog.html
index 3ba715f..b50d0f3 100644
--- a/src/main/webapp/views/basErrLog/basErrLog.html
+++ b/src/main/webapp/views/basErrLog/basErrLog.html
@@ -26,6 +26,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="plc_no" placeholder="宸烽亾鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<select name="status">
<option value="" style="display: none"></option>
<option value="1">寰呭鐞�</option>
@@ -41,7 +46,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="condition" placeholder="澶囨敞" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1