From 58b61cd33690a32e655970e4c79f21d2b285b44d Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 21 Aug 2024 10:59:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/AttendanceEquipmentController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/AttendanceEquipmentController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/AttendanceEquipmentController.java index 56fcd177..724512ef 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/AttendanceEquipmentController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/AttendanceEquipmentController.java @@ -36,6 +36,7 @@ public class AttendanceEquipmentController { JSONObject content = new JSONObject(); content.set("voice_code", -2); result.set("Content", content); + log.info("verifyUser: {}", object); try { String sn = object.getStr("sn"); String userId = object.getStr("user_id"); @@ -54,4 +55,4 @@ public class AttendanceEquipmentController { return result; } } -} \ No newline at end of file +} From 253f7506649e24f86e2706658a179ad46edb9045 Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 21 Aug 2024 14:16:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=80=9F=E8=B0=83?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=87=BA=E9=83=A8=E9=97=A8=E8=B5=84?= =?UTF-8?q?=E4=BA=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/assets/vo/DeptAssetsPageReqVO.java | 8 +++++++- .../resources/mapper/assets/DeptAssetsMapper.xml | 14 +++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java index d574002a..bae6313b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java @@ -22,12 +22,18 @@ public class DeptAssetsPageReqVO extends PageParam { @Schema(description = "资产id", example = "15660") private Long assetsId; + @Schema(description = "资产类型id", example = "5169") + private Long typeId; + @Schema(description = "资产状态 -1无状态 0空闲 1使用中 2维修 3损坏 （资产类型按单件时候有意义）", example = "2") private Integer status; @Schema(description = "库存") private Integer stock; + @Schema(description = "是否过滤库存 0否 1是") + private Integer filterStockFlag; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; @@ -35,4 +41,4 @@ public class DeptAssetsPageReqVO extends PageParam { @Schema(description = "资产名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "15660") @ExcelProperty("资产名称") private String assetsName; -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml index 44cb9d26..ac525277 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml @@ -55,6 +55,12 @@ and a.dept_id = #{vo.deptId} + + and a.stock > 0 + + + and b.type_id = #{vo.typeId} + and a.assets_id = #{vo.assetsId} @@ -84,6 +90,12 @@ and a.dept_id = #{vo.deptId} + + and a.stock > 0 + + + and b.type_id = #{vo.typeId} + and a.assets_id = #{vo.assetsId} @@ -95,4 +107,4 @@ - \ No newline at end of file + From a4259d4080d959c29195767a5eb7b5aed225b1ca Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 21 Aug 2024 17:23:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=88=87=E6=8D=A2=E5=88=B0=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/smartfactory/controller/admin/hik/HikController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/hik/HikController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/hik/HikController.java index fab768b7..c9669ad6 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/hik/HikController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/hik/HikController.java @@ -42,7 +42,7 @@ public class HikController { public CommonResult getMCameraUrl(String cameraCode) { String url = hikService.getPreviewUrlsApiHttps(cameraCode); - String fullUrl = String.format("https://api.znkj.ispt.com.cn/demo/mobile_play.html?url=%s",url ); + String fullUrl = String.format("https://socket.znkjfw.com/demo/mobile_play.html?url=%s",url ); return CommonResult.success(fullUrl); }