boyue2025/xiongan-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/xiongan-meeting.git synced 2025-06-21 04:59:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改了对应bug

Browse Source
This commit is contained in:
chendaze 2024-05-07 10:05:32 +08:00
parent f65168f08f
commit d2764af4f7
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ics-admin/src/main/java/com/ics/admin/controller/PolicyBannerController.java
View File

@ -50,6 +50,7 @@ public class PolicyBannerController extends BaseController {
@PostMapping("save")
public R addSave(@RequestBody PolicyBanner policyBanner) {
ValidatorUtils.validateEntity(policyBanner);
policyBanner.setParkId(25L);
return toAjax(policyBannerService.insertPolicyBanner(policyBanner));
}

1
ics-admin/src/main/java/com/ics/admin/controller/PolicyController.java
View File

@ -50,6 +50,7 @@ public class PolicyController extends BaseController {
@PostMapping("save")
public R addSave(@RequestBody Policy policy) {
ValidatorUtils.validateEntity(policy);
policy.setParkId(25L);
return toAjax(policyService.insertPolicy(policy));
}

14
ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java
View File

@ -185,13 +185,15 @@ public class EquipmentController extends BaseController {
int i = equipmentService.insertEquipment(equipment);
Assert.isTrue(i > 0, "添加失败");
boolean ping = DeviceUtils.ping(equipment.getIp(), 1, 2000);
if (ping){
equipment.setEquipmentNum(String.valueOf((new Date()).getTime()));
equipment.setEquipmentNum(String.valueOf((new Date()).getTime()));
String s = DeviceUtils.setDeviceInfo(equipment.getEquipmentNum(), equipment.getEquipmentName(), equipment.getIp());
JSONObject jsonObject = JSONUtil.parseObj(s);
Integer status = (Integer) jsonObject.get("status");
Assert.isTrue(status == 0, "未找到对应设备");
String s = DeviceUtils.setDeviceInfo(equipment.getEquipmentNum(), equipment.getEquipmentName(), equipment.getIp());
JSONObject jsonObject = JSONUtil.parseObj(s);
Integer status = (Integer) jsonObject.get("status");
Assert.isTrue(status == 0, "未找到对应设备");
}
if (equipment.getRoomId() != null) {

1
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
View File

@ -107,6 +107,7 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
queryWrapper.eq(roomContent.getTenantId() !=null,"tenant_id", roomContent.getTenantId());
queryWrapper.eq(roomContent.getRoomId() !=null,"room_id", roomContent.getRoomId());
queryWrapper.in(roomContent.getRoomIds() !=null,"room_id", roomContent.getRoomIds());
queryWrapper.orderByAsc("create_time");
return roomContentMapper.selectList(queryWrapper);
}

2
ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml
View File

@ -50,6 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tenantId != null and tenantId != ''"> AND tenant_id =#{tenantId}</if>
and is_show = 0
</where>
order by create_time asc
</select>
<select id="selectRoomContentById" parameterType="Long" resultMap="RoomContentResult">

2
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
View File

@ -657,7 +657,7 @@ public class ApiRoomContentController extends BaseController {
Calendar end = Calendar.getInstance();
end.setTime(endTime);
return date.after(begin) && date.before(end);
return date.compareTo(begin) >=0 && date.compareTo(end) <=0;
}