Trang chủ Khám phá Trợ giúp
Đăng ký Đăng nhập
zgzt
/
el-java
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu kéo về 0 Wiki
Browse Source

update

qiangxuan 1 tháng trước cách đây
mục cha
38c5ef38bb
commit
6aa242a735
5 tập tin đã thay đổi với 1699 bổ sung và 1 xóa
Split View Hiển thị tình trạng sai khác
  1. 330 1
      logs/error-log.html
  2. 286 0
      logs/jeecg-gateway-2025-04-15.0.log
  3. 926 0
      logs/jeecg-lesm-2025-04-15.0.html
  4. 105 0
      logs/jeecg-lesm-2025-04-15.0.log
  5. 52 0
      zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/controller/DeviceBaseInfoController.java

+ 330 - 1
logs/error-log.html
Xem Tập Tin 

@@ -1863,4 +1863,333 @@ TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
 <br />&nbsp;&nbsp;&nbsp;&nbsp;at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
 
 <br />&nbsp;&nbsp;&nbsp;&nbsp;at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
 
 <br />&nbsp;&nbsp;&nbsp;&nbsp;at java.lang.Thread.run(Thread.java:745)
 
-</td></tr>
 
+</td></tr><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 13:45:14 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 13:52:12 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 13:55:58 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 13:58:29 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 14:02:30 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 14:07:41 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 14:13:01 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 14:14:39 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 14:27:24 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Tue Apr 15 14:30:50 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 286 - 0
logs/jeecg-gateway-2025-04-15.0.log


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 926 - 0
logs/jeecg-lesm-2025-04-15.0.html


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 105 - 0
logs/jeecg-lesm-2025-04-15.0.log


+ 52 - 0
zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/controller/DeviceBaseInfoController.java
Xem Tập Tin 

@@ -371,4 +371,56 @@ public class DeviceBaseInfoController extends JeecgController<DeviceBaseInfo, ID
 
 		 }
 
 		 return Result.OK(pageList);
 
 	 }
 
+
 
+	 /**
 
+	  * 添加父设备时，查询可用的设备基本信息
 
+	  * @param deviceBaseInfo
 
+	  * @param pageNo
 
+	  * @param pageSize
 
+	  * @param req
 
+	  * @return
 
+	  */
 
+	 @ApiOperation(value="添加父设备基本信息-分页列表查询", notes="添加父设备基本信息-分页列表查询")
 
+	 @GetMapping(value = "/findParentDeviceList")
 
+	 public Result<IPage<DeviceBaseInfo>> queryPageParentDeviceList(DeviceBaseInfo deviceBaseInfo,
 
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 
+														HttpServletRequest req) {
 
+		 QueryWrapper<DeviceBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(deviceBaseInfo, req.getParameterMap());
 
+		 // 清除可能的额外条件
 
+		 queryWrapper.clear();
 
+		 // 添加 SQL 语句中的条件
 
+		 queryWrapper.notIn("id", deviceBaseInfo.getId())
 
+				 .and(wrapper -> wrapper.eq("sub_device_ids", deviceBaseInfo.getId()).or().isNull("sub_device_ids"))
 
+				 .and(wrapper -> wrapper.notIn("parent_device_ids", deviceBaseInfo.getId()).or().isNull("parent_device_ids"));
 
+		 log.info("QueryWrapper: {}", queryWrapper.getSqlSegment());
 
+		 Page<DeviceBaseInfo> page = new Page<>(pageNo, pageSize);
 
+		 IPage<DeviceBaseInfo> pageList = deviceBaseInfoService.page(page, queryWrapper);
 
+		 return Result.OK(pageList);
 
+	 }
 
+
 
+	 /**
 
+	  * 添加子设备时，查询可用的设备基本信息
 
+	  * @param deviceBaseInfo
 
+	  * @param pageNo
 
+	  * @param pageSize
 
+	  * @param req
 
+	  * @return
 
+	  */
 
+	 @ApiOperation(value="添加子设备基本信息-分页列表查询", notes="添加子设备基本信息-分页列表查询")
 
+	 @GetMapping(value = "/findSubDeviceList")
 
+	 public Result<IPage<DeviceBaseInfo>> queryPageSubDeviceList(DeviceBaseInfo deviceBaseInfo,
 
+																	@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 
+																	@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 
+																	HttpServletRequest req) {
 
+		 QueryWrapper<DeviceBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(deviceBaseInfo, req.getParameterMap());
 
+		 queryWrapper.clear();
 
+		 // 添加 SQL 语句中的条件
 
+		 queryWrapper.notIn("id", deviceBaseInfo.getId())
 
+				 .and(wrapper -> wrapper.eq("parent_device_ids", deviceBaseInfo.getId()).or().isNull("parent_device_ids"))
 
+				 .and(wrapper -> wrapper.notIn("sub_device_ids", deviceBaseInfo.getId()).or().isNull("sub_device_ids"));
 
+		 Page<DeviceBaseInfo> page = new Page<>(pageNo, pageSize);
 
+		 IPage<DeviceBaseInfo> pageList = deviceBaseInfoService.page(page, queryWrapper);
 
+		 return Result.OK(pageList);
 
+	 }
 
 }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác