ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
furongxin 2024-08-22 02:09:43 +08:00
commit 10400600b8
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/AttendanceEquipmentController.java
View File

@ -36,6 +36,7 @@ public class AttendanceEquipmentController {
JSONObject content = new JSONObject(); JSONObject content = new JSONObject();
content.set("voice_code", -2); content.set("voice_code", -2);
result.set("Content", content); result.set("Content", content);
log.info("verifyUser: {}", object);
try { try {
String sn = object.getStr("sn"); String sn = object.getStr("sn");
String userId = object.getStr("user_id"); String userId = object.getStr("user_id");

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java
View File

@ -22,12 +22,18 @@ public class DeptAssetsPageReqVO extends PageParam {
@Schema(description = "资产id", example = "15660") @Schema(description = "资产id", example = "15660")
private Long assetsId; private Long assetsId;
@Schema(description = "资产类型id", example = "5169")
private Long typeId;
@Schema(description = "资产状态 -1无状态 0空闲 1使用中 2维修 3损坏 （资产类型按单件时候有意义）", example = "2") @Schema(description = "资产状态 -1无状态 0空闲 1使用中 2维修 3损坏 （资产类型按单件时候有意义）", example = "2")
private Integer status; private Integer status;
@Schema(description = "库存") @Schema(description = "库存")
private Integer stock; private Integer stock;
@Schema(description = "是否过滤库存 0否 1是")
private Integer filterStockFlag;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;

12
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml
View File

@ -55,6 +55,12 @@
<if test="vo.deptId != null"> <if test="vo.deptId != null">
and a.dept_id = #{vo.deptId} and a.dept_id = #{vo.deptId}
</if> </if>
<if test="vo.filterStockFlag != null and vo.filterStockFlag == 1">
and a.stock > 0
</if>
<if test="vo.typeId != null">
and b.type_id = #{vo.typeId}
</if>
<if test="vo.assetsId != null"> <if test="vo.assetsId != null">
and a.assets_id = #{vo.assetsId} and a.assets_id = #{vo.assetsId}
</if> </if>
@ -84,6 +90,12 @@
<if test="vo.deptId != null"> <if test="vo.deptId != null">
and a.dept_id = #{vo.deptId} and a.dept_id = #{vo.deptId}
</if> </if>
<if test="vo.filterStockFlag != null and vo.filterStockFlag == 1">
and a.stock > 0
</if>
<if test="vo.typeId != null">
and b.type_id = #{vo.typeId}
</if>
<if test="vo.assetsId != null"> <if test="vo.assetsId != null">
and a.assets_id = #{vo.assetsId} and a.assets_id = #{vo.assetsId}
</if> </if>

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/hik/HikController.java
View File

@ -42,7 +42,7 @@ public class HikController {
public CommonResult<String> getMCameraUrl(String cameraCode) { public CommonResult<String> getMCameraUrl(String cameraCode) {
String url = hikService.getPreviewUrlsApiHttps(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); return CommonResult.success(fullUrl);
} }