diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java index c857a3f..e9b22a0 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java @@ -185,276 +185,37 @@ public class CustomerStaffController extends BaseController { Customer customer1 = customerService.selectCustomerById(icsCustomerId); log.info("parkId为:",customer1.getParkId().toString()); - if (customer1.getParkId() == 26){ - IcsCustomerStaff customerStaff = icsCustomerStaffService.selectUserByMobile(icsCustomerStaff.getMobile()); - if (customerStaff != null){ - icsCustomerStaff.setId(customerStaff.getId()); - int i = icsCustomerStaffService.updateIcsCustomerStaff(icsCustomerStaff); - StaffCustomer staffCustomer = new StaffCustomer(); - staffCustomer.setIcsCustomerId(icsCustomerStaff.getIcsCustomerId()); - staffCustomer.setStaffId(customerStaff.getId()); - staffCustomer.setParkId(customer1.getParkId()); - staffCustomer.setTenantId(customer1.getTenantId()); - List staffCustomers = staffCustomerService.selectStaffCustomerList(staffCustomer); - if (staffCustomers.isEmpty()) { - staffCustomerService.insertStaffCustomer(staffCustomer); - } - return toAjax(i); - }else { - icsCustomerStaff.setDataType("1"); - icsCustomerStaff.setParkId(customer1.getParkId()); - icsCustomerStaff.setTenantId(customer1.getTenantId()); - int i = icsCustomerStaffService.insertIcsCustomerStaff(icsCustomerStaff); - Assert.isTrue(i > 0, "添加失败"); - //新增用户和企业 id - StaffCustomer staffCustomer = new StaffCustomer(); - staffCustomer.setIcsCustomerId(icsCustomerStaff.getIcsCustomerId()); - staffCustomer.setStaffId(icsCustomerStaff.getId()); - staffCustomer.setParkId(customer1.getParkId()); - staffCustomer.setTenantId(customer1.getTenantId()); - staffCustomerService.insertStaffCustomer(staffCustomer); - return toAjax(i); - } - } - - - - - IcsCustomerStaff customerStaff = icsCustomerStaffService.selectUserByMobile(icsCustomerStaff.getMobile()); - if (customerStaff != null) { - if (icsCustomerStaff.getId() == null) { - ArrayList ids = new ArrayList<>(); - - Customer customer = customerService.selectCustomerById(icsCustomerStaff.getIcsCustomerId()); - if (null != customer) { - String roomId = customer.getRoomId(); - String buildId = customer.getBuildId(); - - List result = new ArrayList<>(); - - // 按照逗号分割 - List buildIds = StrUtil.split(buildId, ','); - - List roomIds = StrUtil.split(roomId, ','); - List collect = roomIds.stream().map(Long::valueOf).collect(toList()); - List buildCollect = buildIds.stream().map(Long::valueOf).collect(toList()); - result.addAll(buildCollect); - result.addAll(collect); - //获取了房间集合，循环对应集合， - for (Long id : result) { - List roomEquipment = roomEquipmentService.selectListByRoomId(id); - if (CollUtil.isNotEmpty(roomEquipment)) { - for (RoomEquipment roomEquipment1 : roomEquipment) { -// ids.add(detailEquipment.getEquipmentId()); - ids.add(roomEquipment1.getEquipmentId()); - - } - } - List detailEquipments = detailEquipmentService.selectByRoomId(id); - if (CollUtil.isNotEmpty(detailEquipments)) { - for (DetailEquipment detailEquipment : detailEquipments) { - ids.add(detailEquipment.getEquipmentId()); - } - } - } - } - if (CollUtil.isNotEmpty(ids)) { - for (Long id : ids) { - UserEquipment userEquipment = new UserEquipment(); - userEquipment.setEquipmentId(id); - userEquipment.setUserId(customerStaff.getId()); - userEquipment.setStartTime(customer.getStartDate()); - userEquipment.setEndDate(customer.getEndDate()); - - List equipments = userEquipmentService.selectUserEquipmentList(userEquipment); - if (CollUtil.isEmpty(equipments)) { - userEquipmentService.insertUserEquipment(userEquipment); - } - } - } - } - Long customerId1 = icsCustomerStaff.getIcsCustomerId(); - Customer customer = customerService.selectCustomerById(customerId1); - - customerStaff.setName(icsCustomerStaff.getName()); - customerStaff.setMobile(icsCustomerStaff.getMobile()); - customerStaff.setGender(icsCustomerStaff.getGender()); - customerStaff.setPhoto(icsCustomerStaff.getPhoto()); - customerStaff.setAvatar(icsCustomerStaff.getAvatar()); - customerStaff.setUsername(icsCustomerStaff.getUsername()); - customerStaff.setCardNo(icsCustomerStaff.getCardNo()); - customerStaff.setAddress(icsCustomerStaff.getAddress()); - customerStaff.setEmail(icsCustomerStaff.getEmail()); - customerStaff.setDegree(icsCustomerStaff.getDegree()); - customerStaff.setUrgent(icsCustomerStaff.getUrgent()); - //如果修改了照片，根据企业找到对应的房间，根据房间找到对应的设备，添加用户照片进入设备中 - - if (null != customer) { - String roomId = customer.getRoomId(); - String buildId = customer.getBuildId(); - - List result = new ArrayList<>(); - - List buildIds = StrUtil.split(buildId, ','); - - List roomIds = StrUtil.split(roomId, ','); - List collect = roomIds.stream().map(Long::valueOf).collect(toList()); - List buildCollect = buildIds.stream().map(Long::valueOf).collect(toList()); - result.addAll(buildCollect); - // - result.addAll(collect); - //获取了房间集合，循环对应集合， - for (Long aLong : result) { - //根据楼层获取设备id - List detailEquipments = detailEquipmentService.selectByRoomId(aLong); - for (DetailEquipment detailEquipment : detailEquipments) { - //根据设备id获取设备 - Equipment equipment = equipmentService.selectEquipmentById(detailEquipment.getEquipmentId()); - if (equipment != null) { - if (equipment.getType() == 0){ - String persons = DeviceUtils.queryPersons(equipment.getIp(), String.valueOf(customerStaff.getId())); - JSONObject jsonObject = JSONUtil.parseObj(persons); - Integer amount = (Integer) jsonObject.get("amount"); - if (amount <= 0) { - log.info("添加用户信息++++++"); - DevicePersonDto devicePersonDto = new DevicePersonDto(); - ArrayList facesDtos = new ArrayList<>(); - devicePersonDto.setPersonId(String.valueOf(customerStaff.getId())); - devicePersonDto.setName(customerStaff.getName()); - devicePersonDto.setPhone(String.valueOf(customerStaff.getMobile())); - devicePersonDto.setCertificateType("111"); - devicePersonDto.setCertificateNumber(customerStaff.getCardNo()); - //添加人员类型 - devicePersonDto.setPersonType("whitelist"); - //添加访客时间 - FacesDto facesDto = new FacesDto(); - facesDto.setFaceId(String.valueOf(customerStaff.getId())); - String photoUrl = url + customerStaff.getPhoto(); - log.info("ip地址为：" + equipment.getIp()); - - String faceData = BASE64_PREFIX + UrlToBase64Util.imageUrlToBase64(photoUrl); - log.info("人脸为：" + faceData); - - facesDto.setData(faceData); - facesDtos.add(facesDto); - devicePersonDto.setFaces(facesDtos); - log.info("人员信息为：" + devicePersonDto.toString()); - String s = DeviceUtils.addPersons(equipment.getIp(), devicePersonDto); - log.info("添加人员返回结果：" + s); - } else { - log.info("修改用户信息"); - //更新用户信息 - if (icsCustomerStaff.getPhoto() != null) { - if (!icsCustomerStaff.getPhoto().equals(customer.getPhone())) { - DevicePersonDto devicePersonDto = new DevicePersonDto(); - devicePersonDto.setPersonId(String.valueOf(customerStaff.getId())); - ArrayList facesDtos = new ArrayList<>(); - FacesDto facesDto = new FacesDto(); - String photoUrl = url + icsCustomerStaff.getPhoto(); - String faceData = BASE64_PREFIX + UrlToBase64Util.imageUrlToBase64(photoUrl); - facesDto.setData(faceData); - facesDto.setFaceId(String.valueOf(customerStaff.getId())); - facesDtos.add(facesDto); - devicePersonDto.setFaces(facesDtos); - DeviceUtils.modifyFaces(equipment.getIp(), devicePersonDto); - } - } - } - } - - } - } - - - //根据房间id获取设备id - List roomEquipments = roomEquipmentService.selectListByRoomId(aLong); - for (RoomEquipment roomEquipment : roomEquipments) { - //根据设备id获取设备 - Equipment equipment = equipmentService.selectEquipmentById(roomEquipment.getEquipmentId()); - if (equipment != null) { - if (equipment.getType() == 0){ - String persons = DeviceUtils.queryPersons(equipment.getIp(), String.valueOf(customerStaff.getId())); - JSONObject jsonObject = JSONUtil.parseObj(persons); - Integer amount = (Integer) jsonObject.get("amount"); - if (amount <= 0) { - DevicePersonDto devicePersonDto = new DevicePersonDto(); - ArrayList facesDtos = new ArrayList<>(); - devicePersonDto.setPersonId(String.valueOf(customerStaff.getId())); - devicePersonDto.setName(customerStaff.getName()); - devicePersonDto.setPhone(String.valueOf(customerStaff.getMobile())); - devicePersonDto.setCertificateType("111"); - devicePersonDto.setCertificateNumber(customerStaff.getCardNo()); - //添加人员类型 - devicePersonDto.setPersonType("whitelist"); - //添加访客时间 - FacesDto facesDto = new FacesDto(); - facesDto.setFaceId(String.valueOf(customerStaff.getId())); - String photoUrl = url + customerStaff.getPhoto(); - String faceData = BASE64_PREFIX + UrlToBase64Util.imageUrlToBase64(photoUrl); - - facesDto.setData(faceData); - facesDtos.add(facesDto); - devicePersonDto.setFaces(facesDtos); - String s = DeviceUtils.addPersons(equipment.getIp(), devicePersonDto); - log.info("添加人员返回结果：" + s); - } else { - //更新用户信息 - if (icsCustomerStaff.getPhoto() != null) { - if (!icsCustomerStaff.getPhoto().equals(customer.getPhone())) { - DevicePersonDto devicePersonDto = new DevicePersonDto(); - devicePersonDto.setPersonId(String.valueOf(customerStaff.getId())); - ArrayList facesDtos = new ArrayList<>(); - FacesDto facesDto = new FacesDto(); - String photoUrl = url + icsCustomerStaff.getPhoto(); - String faceData = BASE64_PREFIX + UrlToBase64Util.imageUrlToBase64(photoUrl); - facesDto.setData(faceData); - facesDto.setFaceId(String.valueOf(customerStaff.getId())); - facesDtos.add(facesDto); - devicePersonDto.setFaces(facesDtos); - DeviceUtils.modifyFaces(equipment.getIp(), devicePersonDto); - } - } - } - } - - } - } - } - } - customerStaff.setParkId(customer1.getParkId()); - customerStaff.setTenantId(customer1.getTenantId()); - int i = icsCustomerStaffService.updateIcsCustomerStaff(customerStaff); - Assert.isTrue(i > 0, "更新失败"); - + if (customerStaff != null){ + icsCustomerStaff.setId(customerStaff.getId()); + int i = icsCustomerStaffService.updateIcsCustomerStaff(icsCustomerStaff); StaffCustomer staffCustomer = new StaffCustomer(); staffCustomer.setIcsCustomerId(icsCustomerStaff.getIcsCustomerId()); staffCustomer.setStaffId(customerStaff.getId()); + staffCustomer.setParkId(customer1.getParkId()); + staffCustomer.setTenantId(customer1.getTenantId()); List staffCustomers = staffCustomerService.selectStaffCustomerList(staffCustomer); - if (staffCustomers.size() == 0) { + if (staffCustomers.isEmpty()) { staffCustomerService.insertStaffCustomer(staffCustomer); } - + return toAjax(i); + }else { + icsCustomerStaff.setDataType("1"); + icsCustomerStaff.setParkId(customer1.getParkId()); + icsCustomerStaff.setTenantId(customer1.getTenantId()); + int i = icsCustomerStaffService.insertIcsCustomerStaff(icsCustomerStaff); + Assert.isTrue(i > 0, "添加失败"); + //新增用户和企业 id + StaffCustomer staffCustomer = new StaffCustomer(); + staffCustomer.setIcsCustomerId(icsCustomerStaff.getIcsCustomerId()); + staffCustomer.setStaffId(icsCustomerStaff.getId()); + staffCustomer.setParkId(customer1.getParkId()); + staffCustomer.setTenantId(customer1.getTenantId()); + staffCustomerService.insertStaffCustomer(staffCustomer); return toAjax(i); } - Customer customer = customerService.selectCustomerById(icsCustomerStaff.getIcsCustomerId()); - if (null != customer){ - icsCustomerStaff.setParkId(customer.getParkId()); - icsCustomerStaff.setTenantId(customer.getTenantId()); - } - icsCustomerStaff.setDataType("1"); - int i = icsCustomerStaffService.insertIcsCustomerStaff(icsCustomerStaff); - Assert.isTrue(i > 0, "添加失败"); - //新增用户和企业 id - StaffCustomer staffCustomer = new StaffCustomer(); - staffCustomer.setIcsCustomerId(icsCustomerStaff.getIcsCustomerId()); - staffCustomer.setStaffId(customerStaff.getStaffId()); - staffCustomer.setParkId(customer.getParkId()); - staffCustomer.setTenantId(customer.getTenantId()); - staffCustomerService.insertStaffCustomer(staffCustomer); - return toAjax(i); } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/WisdomDeviceController.java b/ics-admin/src/main/java/com/ics/admin/controller/WisdomDeviceController.java deleted file mode 100644 index 3901d2b..0000000 --- a/ics-admin/src/main/java/com/ics/admin/controller/WisdomDeviceController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ics.admin.controller; - -import cn.hutool.core.collection.CollUtil; -import com.ics.admin.domain.WisdomRoom; -import com.ics.admin.service.IWisdomRoomService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.WisdomDevice; -import com.ics.admin.service.IWisdomDeviceService; -import org.wf.jwtp.annotation.Ignore; -import org.wf.jwtp.annotation.RequiresPermissions; - -import java.util.List; - -/** - * 智能设备 提供者 - * - * @author chen - * @date 2024-08-21 - */ -@RestController -@RequestMapping("/wisdom/wisdomDevice") -public class WisdomDeviceController extends BaseController { - - @Autowired - private IWisdomDeviceService wisdomDeviceService; - - @Autowired - private IWisdomRoomService wisdomRoomService; - - /** - * 查询智能设备 - */ - @GetMapping("get/{id}") - public WisdomDevice get(@PathVariable("id") Long id) { - return wisdomDeviceService.selectWisdomDeviceById(id); - } - - /** - * 查询智能设备列表 - */ - @Ignore -// @RequiresPermissions("wisdom:wisdomDevice:list") - @GetMapping("list") - public R list(WisdomDevice wisdomDevice) { - startPage(); - List wisdomDevices = wisdomDeviceService.selectWisdomDeviceList(wisdomDevice); - if (CollUtil.isNotEmpty(wisdomDevices)){ - for (WisdomDevice device : wisdomDevices) { - WisdomRoom wisdomRoom = wisdomRoomService.selectWisdomRoomById(device.getWisdomRoomId()); - if (wisdomRoom != null) device.setContentName(wisdomRoom.getMeetingName()); - } - } - return result(wisdomDevices); - } - - - /** - * 新增保存智能设备 - */ -// @RequiresPermissions("wisdom:wisdomDevice:add") - @Ignore - @PostMapping("save") - public R addSave(@RequestBody WisdomDevice wisdomDevice) { - return toAjax(wisdomDeviceService.insertWisdomDevice(wisdomDevice)); - } - - /** - * 修改保存智能设备 - */ -// @RequiresPermissions("wisdom:wisdomDevice:edit") - @Ignore - @PostMapping("update") - public R editSave(@RequestBody WisdomDevice wisdomDevice) { - return toAjax(wisdomDeviceService.updateWisdomDevice(wisdomDevice)); - } - - /** - * 删除智能设备 - */ -// @RequiresPermissions("wisdom:wisdomDevice:remove") - @Ignore - @PostMapping("remove") - public R remove(String ids) { - return toAjax(wisdomDeviceService.deleteWisdomDeviceByIds(ids)); - } - -} diff --git a/ics-admin/src/main/java/com/ics/admin/controller/WisdomPanelController.java b/ics-admin/src/main/java/com/ics/admin/controller/WisdomPanelController.java deleted file mode 100644 index 1519427..0000000 --- a/ics-admin/src/main/java/com/ics/admin/controller/WisdomPanelController.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.ics.admin.controller; - -import com.ics.admin.service.IWisdomRoomService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.WisdomPanel; -import com.ics.admin.service.IWisdomPanelService; -import org.wf.jwtp.annotation.Ignore; -import org.wf.jwtp.annotation.RequiresPermissions; - -import java.util.List; - -/** - * 情景面板 提供者 - * - * @author ics - * @date 2024-08-22 - */ -@RestController -@RequestMapping("wisdomPanel") -public class WisdomPanelController extends BaseController { - - @Autowired - private IWisdomPanelService wisdomPanelService; - - @Autowired - private IWisdomRoomService wisdomRoomService; - - /** - * 查询情景面板 - */ - @GetMapping("get/{id}") - public WisdomPanel get(@PathVariable("id") Long id) { - return wisdomPanelService.selectWisdomPanelById(id); - } - - /** - * 查询情景面板列表 - */ - @Ignore - @GetMapping("list") - public R list(WisdomPanel wisdomPanel) { - startPage(); - List wisdomPanels = wisdomPanelService.selectWisdomPanelList(wisdomPanel); - for (WisdomPanel panel : wisdomPanels) { - panel.setMeetingName(wisdomRoomService.selectWisdomRoomById(panel.getWisdomRoom()).getMeetingName()); - } - - return result(wisdomPanels); - } - - - /** - * 新增保存情景面板 - */ -// @RequiresPermissions("admin:panel:add") - @Ignore - @PostMapping("save") - public R addSave(@RequestBody WisdomPanel wisdomPanel) { - return toAjax(wisdomPanelService.insertWisdomPanel(wisdomPanel)); - } - - /** - * 修改保存情景面板 - */ - @RequiresPermissions("admin:panel:edit") - @PostMapping("update") - public R editSave(@RequestBody WisdomPanel wisdomPanel) { - return toAjax(wisdomPanelService.updateWisdomPanel(wisdomPanel)); - } - - /** - * 删除情景面板 - */ - @RequiresPermissions("admin:panel:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(wisdomPanelService.deleteWisdomPanelByIds(ids)); - } - -} diff --git a/ics-admin/src/main/java/com/ics/admin/controller/WisdomPanelEquipmentController.java b/ics-admin/src/main/java/com/ics/admin/controller/WisdomPanelEquipmentController.java deleted file mode 100644 index 8f82424..0000000 --- a/ics-admin/src/main/java/com/ics/admin/controller/WisdomPanelEquipmentController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ics.admin.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.WisdomPanelEquipment; -import com.ics.admin.service.IWisdomPanelEquipmentService; -import org.wf.jwtp.annotation.RequiresPermissions; - -/** - * 窗帘关联 提供者 - * - * @author ics - * @date 2024-08-22 - */ -@RestController -@RequestMapping("panelEquipment") -public class WisdomPanelEquipmentController extends BaseController { - - @Autowired - private IWisdomPanelEquipmentService wisdomPanelEquipmentService; - - /** - * 查询窗帘关联 - */ - @GetMapping("get/{id}") - public WisdomPanelEquipment get(@PathVariable("id") Long id) { - return wisdomPanelEquipmentService.selectWisdomPanelEquipmentById(id); - } - - /** - * 查询窗帘关联列表 - */ - @RequiresPermissions("admin:equipment:list") - @GetMapping("list") - public R list(WisdomPanelEquipment wisdomPanelEquipment) { - startPage(); - return result(wisdomPanelEquipmentService.selectWisdomPanelEquipmentList(wisdomPanelEquipment)); - } - - - /** - * 新增保存窗帘关联 - */ - @RequiresPermissions("admin:equipment:add") - @PostMapping("save") - public R addSave(@RequestBody WisdomPanelEquipment wisdomPanelEquipment) { - return toAjax(wisdomPanelEquipmentService.insertWisdomPanelEquipment(wisdomPanelEquipment)); - } - - /** - * 修改保存窗帘关联 - */ - @RequiresPermissions("admin:equipment:edit") - @PostMapping("update") - public R editSave(@RequestBody WisdomPanelEquipment wisdomPanelEquipment) { - return toAjax(wisdomPanelEquipmentService.updateWisdomPanelEquipment(wisdomPanelEquipment)); - } - - /** - * 删除窗帘关联 - */ - @RequiresPermissions("admin:equipment:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(wisdomPanelEquipmentService.deleteWisdomPanelEquipmentByIds(ids)); - } - -} diff --git a/ics-admin/src/main/java/com/ics/admin/controller/WisdomRoomController.java b/ics-admin/src/main/java/com/ics/admin/controller/WisdomRoomController.java deleted file mode 100644 index c620ff2..0000000 --- a/ics-admin/src/main/java/com/ics/admin/controller/WisdomRoomController.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.ics.admin.controller; - -import com.ics.admin.domain.WisdomStaff; -import com.ics.admin.service.IIcsCustomerStaffService; -import com.ics.admin.service.IWisdomStaffService; -import com.ics.common.core.domain.IcsCustomerStaff; -import com.ics.common.utils.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.WisdomRoom; -import com.ics.admin.service.IWisdomRoomService; -import org.wf.jwtp.annotation.Ignore; -import org.wf.jwtp.annotation.RequiresPermissions; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * 智能房间 提供者 - * - * @author ics - * @date 2024-08-21 - */ -@RestController -@RequestMapping("/admin/wisdomRoom") -public class WisdomRoomController extends BaseController { - - @Autowired - private IWisdomRoomService wisdomRoomService; - - @Autowired - private IWisdomStaffService wisdomStaffService; - - @Autowired - private IIcsCustomerStaffService customerStaffService; - - /** - * 查询智能房间 - */ - @GetMapping("get/{id}") - public WisdomRoom get(@PathVariable("id") Long id) { - return wisdomRoomService.selectWisdomRoomById(id); - } - - /** - * 查询智能房间列表 - */ - @Ignore -// @RequiresPermissions("wisdom:wisdomRoom:list") - @GetMapping("list") - public R list(WisdomRoom wisdomRoom) { - startPage(); - List wisdomRooms = wisdomRoomService.selectList(wisdomRoom); - for (WisdomRoom room : wisdomRooms) { - List collect = wisdomStaffService.selectWisdomStaffByRoomId(room.getId()); - room.setStaffId(collect); - IcsCustomerStaff icsCustomerStaff =new IcsCustomerStaff(); - icsCustomerStaff.setIcsCustomerId(85L); - room.setStaffLists(customerStaffService.selectCustomerStaff(icsCustomerStaff)); - } - return result(wisdomRooms); - } - - - /** - * 新增保存智能房间 - */ -// @RequiresPermissions("wisdom:wisdomRoom:add") - @Ignore - @PostMapping("save") - public R addSave(@RequestBody WisdomRoom wisdomRoom) { - int i = wisdomRoomService.insertWisdomRoom(wisdomRoom); - Long id = wisdomRoom.getId(); - WisdomStaff wisdomStaff = new WisdomStaff(); - for (Long s : wisdomRoom.getStaffId()) { - wisdomStaff.setWisdomRoomId(id); - wisdomStaff.setDataType("0"); - wisdomStaff.setStaffId(s); - wisdomStaffService.insertWisdomStaff(wisdomStaff); - } - return toAjax(i); - } - - /** - * 修改保存智能房间 - */ -// @RequiresPermissions("wisdom:wisdomRoom:edit") - @Ignore - @PostMapping("update") - public R editSave(@RequestBody WisdomRoom wisdomRoom) { - int i = wisdomRoomService.updateWisdomRoom(wisdomRoom); - WisdomStaff wisdomStaff = new WisdomStaff(); - List ids = wisdomStaffService.selectWisdomStaffListByRoomId(wisdomRoom.getId()); - String joinStr = StringUtils.join(ids, ","); - if (ids.size()>0) wisdomStaffService.deleteWisdomStaffByIds(joinStr); - for (Long s : wisdomRoom.getStaffId()) { - wisdomStaff.setWisdomRoomId(wisdomRoom.getId()); - wisdomStaff.setDataType("0"); - wisdomStaff.setStaffId(s); - wisdomStaffService.insertWisdomStaff(wisdomStaff); - } - return toAjax(i); - } - - /** - * 删除智能房间 - */ -// @RequiresPermissions("wisdom:wisdomRoom:remove") - @Ignore - @PostMapping("remove") - public R remove(String ids) { - return toAjax(wisdomRoomService.deleteWisdomRoomByIds(ids)); - } - - /** - * 用户列表 - */ -// @RequiresPermissions("wisdom:wisdomRoom:view") - @Ignore - @GetMapping("selectStaff") - public R selectStaff() { - IcsCustomerStaff icsCustomerStaff =new IcsCustomerStaff(); - icsCustomerStaff.setIcsCustomerId(85L); - List customerStaffs = customerStaffService.selectCustomerStaffList(icsCustomerStaff); - - return R.data(customerStaffs); - } - -} diff --git a/ics-admin/src/main/java/com/ics/admin/controller/WisdomStaffController.java b/ics-admin/src/main/java/com/ics/admin/controller/WisdomStaffController.java deleted file mode 100644 index d2ab92b..0000000 --- a/ics-admin/src/main/java/com/ics/admin/controller/WisdomStaffController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ics.admin.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.WisdomStaff; -import com.ics.admin.service.IWisdomStaffService; -import org.wf.jwtp.annotation.RequiresPermissions; - -/** - * 房间用户关联 提供者 - * - * @author ics - * @date 2024-08-21 - */ -@RestController -@RequestMapping("staff") -public class WisdomStaffController extends BaseController { - - @Autowired - private IWisdomStaffService wisdomStaffService; - - /** - * 查询房间用户关联 - */ - @GetMapping("get/{id}") - public WisdomStaff get(@PathVariable("id") Long id) { - return wisdomStaffService.selectWisdomStaffById(id); - } - - /** - * 查询房间用户关联列表 - */ - @RequiresPermissions("admin:staff:list") - @GetMapping("list") - public R list(WisdomStaff wisdomStaff) { - startPage(); - return result(wisdomStaffService.selectWisdomStaffList(wisdomStaff)); - } - - - /** - * 新增保存房间用户关联 - */ - @RequiresPermissions("admin:staff:add") - @PostMapping("save") - public R addSave(@RequestBody WisdomStaff wisdomStaff) { - return toAjax(wisdomStaffService.insertWisdomStaff(wisdomStaff)); - } - - /** - * 修改保存房间用户关联 - */ - @RequiresPermissions("admin:staff:edit") - @PostMapping("update") - public R editSave(@RequestBody WisdomStaff wisdomStaff) { - return toAjax(wisdomStaffService.updateWisdomStaff(wisdomStaff)); - } - - /** - * 删除房间用户关联 - */ - @RequiresPermissions("admin:staff:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(wisdomStaffService.deleteWisdomStaffByIds(ids)); - } - -} diff --git a/ics-admin/src/main/java/com/ics/admin/domain/WisdomDevice.java b/ics-admin/src/main/java/com/ics/admin/domain/WisdomDevice.java deleted file mode 100644 index 2bb8dbf..0000000 --- a/ics-admin/src/main/java/com/ics/admin/domain/WisdomDevice.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * 智能设备对象 tb_wisdom_device - * - * @author chen - * @date 2024-08-21 - */ -@Data -@TableName("tb_wisdom_device") -public class WisdomDevice extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 设备分类 */ - private String type; - - private String typeName; - - /** 设备名称 */ - private String equipmentName; - - /** 设备状态 0在线 1损坏 2离线 */ - private Long status; - - /** 设备编号 */ - private String equipmentNum; - - /** 设备图片 */ - private String pic; - - /** $column.columnComment */ - private String ip; - - /** 园区ID */ - private Long parkId; - - /** 会议室id */ - private Long wisdomRoomId; - - /** 会议室名称 */ - private String contentName; - -} diff --git a/ics-admin/src/main/java/com/ics/admin/domain/WisdomPanel.java b/ics-admin/src/main/java/com/ics/admin/domain/WisdomPanel.java deleted file mode 100644 index 6cd106f..0000000 --- a/ics-admin/src/main/java/com/ics/admin/domain/WisdomPanel.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * 情景面板对象 tb_wisdom_panel - * - * @author ics - * @date 2024-08-22 - */ -@Data -@TableName("tb_wisdom_panel") -public class WisdomPanel extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 面板名称 */ - private String panelName; - - /** 按钮id */ - private Integer buttonId; - - /** 房间id */ - private Long wisdomRoom; - - @TableField(exist = false) - private String meetingName; - - /** 控制面板id */ - private String panelId; - - private String img; - - private String imgOpen; - -} diff --git a/ics-admin/src/main/java/com/ics/admin/domain/WisdomPanelEquipment.java b/ics-admin/src/main/java/com/ics/admin/domain/WisdomPanelEquipment.java deleted file mode 100644 index ab7bea2..0000000 --- a/ics-admin/src/main/java/com/ics/admin/domain/WisdomPanelEquipment.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * 窗帘关联对象 tb_wisdom_panel_equipment - * - * @author ics - * @date 2024-08-22 - */ -@Data -@TableName("tb_wisdom_panel_equipment") -public class WisdomPanelEquipment extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 面板id */ - private Long panelId; - - /** 设备id */ - private Long equipmentId; - - /** 类型，open，close */ - private String type; - -} diff --git a/ics-admin/src/main/java/com/ics/admin/domain/WisdomRoom.java b/ics-admin/src/main/java/com/ics/admin/domain/WisdomRoom.java deleted file mode 100644 index 0fe41d3..0000000 --- a/ics-admin/src/main/java/com/ics/admin/domain/WisdomRoom.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import com.ics.common.core.domain.IcsCustomerStaff; -import lombok.Data; -import java.util.Date; -import java.util.List; - -/** - * 智能房间对象 tb_wisdom_room - * - * @author ics - * @date 2024-08-21 - */ -@Data -@TableName("tb_wisdom_room") -public class WisdomRoom extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 类型（会议室、办公室、茶室、路演厅） */ - private String type; - - /** 名称 */ - private String meetingName; - - /** 开始时间 */ - private Date startTime; - - /** 结束时间 */ - private Date endDate; - - /** 金额备注 */ - private String remake; - - private String img; - - /** 园区ID */ - private Long parkId; - - @TableField(exist = false) - private List staffId; - - @TableField(exist = false) - private Integer deviceNum; - - @TableField(exist = false) - private Integer panelNum; - - - @TableField(exist = false) - private List staffLists; - - @TableField(exist = false) - private Long staffIds; -} diff --git a/ics-admin/src/main/java/com/ics/admin/domain/WisdomStaff.java b/ics-admin/src/main/java/com/ics/admin/domain/WisdomStaff.java deleted file mode 100644 index e0b9521..0000000 --- a/ics-admin/src/main/java/com/ics/admin/domain/WisdomStaff.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -import java.util.Date; - -/** - * 房间用户关联对象 tb_wisdom_staff - * - * @author ics - * @date 2024-08-21 - */ -@Data -@TableName("tb_wisdom_staff") -public class WisdomStaff extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 房间id */ - private Long wisdomRoomId; - - /** 用户id */ - private Long staffId; - - /** 园区ID */ - private Long parkId; - - private Date startTime; - - private Date endDate; - - private String dataType; - - private Long reservationId; - -} diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomDeviceMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/WisdomDeviceMapper.java deleted file mode 100644 index f4fe7f0..0000000 --- a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomDeviceMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.WisdomDevice; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 智能设备Mapper接口 - * - * @author chen - * @date 2024-08-21 - */ -@Mapper -public interface WisdomDeviceMapper extends BaseMapper { - /** - * 查询智能设备 - * - * @param id 智能设备ID - * @return 智能设备 - */ - WisdomDevice selectWisdomDeviceById(Long id); - - /** - * 查询智能设备列表 - * - * @param wisdomDevice 智能设备 - * @return 智能设备集合 - */ - List selectWisdomDeviceList(WisdomDevice wisdomDevice); - - /** - * 新增智能设备 - * - * @param wisdomDevice 智能设备 - * @return 结果 - */ - int insertWisdomDevice(WisdomDevice wisdomDevice); - - /** - * 修改智能设备 - * - * @param wisdomDevice 智能设备 - * @return 结果 - */ - int updateWisdomDevice(WisdomDevice wisdomDevice); - - /** - * 删除智能设备 - * - * @param id 智能设备ID - * @return 结果 - */ - int deleteWisdomDeviceById(Long id); - - /** - * 批量删除智能设备 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomDeviceByIds(String[] ids); -} diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomPanelEquipmentMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/WisdomPanelEquipmentMapper.java deleted file mode 100644 index f1110a5..0000000 --- a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomPanelEquipmentMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.WisdomPanelEquipment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 窗帘关联Mapper接口 - * - * @author ics - * @date 2024-08-22 - */ -@Mapper -public interface WisdomPanelEquipmentMapper extends BaseMapper { - /** - * 查询窗帘关联 - * - * @param id 窗帘关联ID - * @return 窗帘关联 - */ - WisdomPanelEquipment selectWisdomPanelEquipmentById(Long id); - - /** - * 查询窗帘关联列表 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 窗帘关联集合 - */ - List selectWisdomPanelEquipmentList(WisdomPanelEquipment wisdomPanelEquipment); - - /** - * 新增窗帘关联 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 结果 - */ - int insertWisdomPanelEquipment(WisdomPanelEquipment wisdomPanelEquipment); - - /** - * 修改窗帘关联 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 结果 - */ - int updateWisdomPanelEquipment(WisdomPanelEquipment wisdomPanelEquipment); - - /** - * 删除窗帘关联 - * - * @param id 窗帘关联ID - * @return 结果 - */ - int deleteWisdomPanelEquipmentById(Long id); - - /** - * 批量删除窗帘关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomPanelEquipmentByIds(String[] ids); -} diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomPanelMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/WisdomPanelMapper.java deleted file mode 100644 index cac68ad..0000000 --- a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomPanelMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.WisdomPanel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 情景面板Mapper接口 - * - * @author ics - * @date 2024-08-22 - */ -@Mapper -public interface WisdomPanelMapper extends BaseMapper { - /** - * 查询情景面板 - * - * @param id 情景面板ID - * @return 情景面板 - */ - WisdomPanel selectWisdomPanelById(Long id); - - /** - * 查询情景面板列表 - * - * @param wisdomPanel 情景面板 - * @return 情景面板集合 - */ - List selectWisdomPanelList(WisdomPanel wisdomPanel); - - /** - * 新增情景面板 - * - * @param wisdomPanel 情景面板 - * @return 结果 - */ - int insertWisdomPanel(WisdomPanel wisdomPanel); - - /** - * 修改情景面板 - * - * @param wisdomPanel 情景面板 - * @return 结果 - */ - int updateWisdomPanel(WisdomPanel wisdomPanel); - - /** - * 删除情景面板 - * - * @param id 情景面板ID - * @return 结果 - */ - int deleteWisdomPanelById(Long id); - - /** - * 批量删除情景面板 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomPanelByIds(String[] ids); -} diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomRoomMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/WisdomRoomMapper.java deleted file mode 100644 index 086344e..0000000 --- a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomRoomMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.WisdomRoom; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 智能房间Mapper接口 - * - * @author ics - * @date 2024-08-21 - */ -@Mapper -public interface WisdomRoomMapper extends BaseMapper { - /** - * 查询智能房间 - * - * @param id 智能房间ID - * @return 智能房间 - */ - WisdomRoom selectWisdomRoomById(Long id); - - /** - * 查询智能房间列表 - * - * @param wisdomRoom 智能房间 - * @return 智能房间集合 - */ - List selectWisdomRoomList(WisdomRoom wisdomRoom); - - /** - * 新增智能房间 - * - * @param wisdomRoom 智能房间 - * @return 结果 - */ - int insertWisdomRoom(WisdomRoom wisdomRoom); - - /** - * 修改智能房间 - * - * @param wisdomRoom 智能房间 - * @return 结果 - */ - int updateWisdomRoom(WisdomRoom wisdomRoom); - - /** - * 删除智能房间 - * - * @param id 智能房间ID - * @return 结果 - */ - int deleteWisdomRoomById(Long id); - - /** - * 批量删除智能房间 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomRoomByIds(String[] ids); -} diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomStaffMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/WisdomStaffMapper.java deleted file mode 100644 index 6e8b5f6..0000000 --- a/ics-admin/src/main/java/com/ics/admin/mapper/WisdomStaffMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.WisdomStaff; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 房间用户关联Mapper接口 - * - * @author ics - * @date 2024-08-21 - */ -@Mapper -public interface WisdomStaffMapper extends BaseMapper { - /** - * 查询房间用户关联 - * - * @param id 房间用户关联ID - * @return 房间用户关联 - */ - WisdomStaff selectWisdomStaffById(Long id); - - /** - * 查询房间用户关联列表 - * - * @param wisdomStaff 房间用户关联 - * @return 房间用户关联集合 - */ - List selectWisdomStaffList(WisdomStaff wisdomStaff); - - /** - * 新增房间用户关联 - * - * @param wisdomStaff 房间用户关联 - * @return 结果 - */ - int insertWisdomStaff(WisdomStaff wisdomStaff); - - /** - * 修改房间用户关联 - * - * @param wisdomStaff 房间用户关联 - * @return 结果 - */ - int updateWisdomStaff(WisdomStaff wisdomStaff); - - /** - * 删除房间用户关联 - * - * @param id 房间用户关联ID - * @return 结果 - */ - int deleteWisdomStaffById(Long id); - - /** - * 批量删除房间用户关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomStaffByIds(String[] ids); -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/IWisdomDeviceService.java b/ics-admin/src/main/java/com/ics/admin/service/IWisdomDeviceService.java deleted file mode 100644 index aec9354..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/IWisdomDeviceService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.WisdomDevice; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * 智能设备Service接口 - * - * @author chen - * @date 2024-08-21 - */ -public interface IWisdomDeviceService extends IService { - /** - * 查询智能设备 - * - * @param id 智能设备ID - * @return 智能设备 - */ - WisdomDevice selectWisdomDeviceById(Long id); - - /** - * 查询智能设备列表 - * - * @param wisdomDevice 智能设备 - * @return 智能设备集合 - */ - List selectWisdomDeviceList(WisdomDevice wisdomDevice); - - /** - * 新增智能设备 - * - * @param wisdomDevice 智能设备 - * @return 结果 - */ - int insertWisdomDevice(WisdomDevice wisdomDevice); - - /** - * 修改智能设备 - * - * @param wisdomDevice 智能设备 - * @return 结果 - */ - int updateWisdomDevice(WisdomDevice wisdomDevice); - - /** - * 批量删除智能设备 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomDeviceByIds(String ids); - - /** - * 删除智能设备信息 - * - * @param id 智能设备ID - * @return 结果 - */ - int deleteWisdomDeviceById(Long id); -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/IWisdomPanelEquipmentService.java b/ics-admin/src/main/java/com/ics/admin/service/IWisdomPanelEquipmentService.java deleted file mode 100644 index fbef744..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/IWisdomPanelEquipmentService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.WisdomPanelEquipment; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * 窗帘关联Service接口 - * - * @author ics - * @date 2024-08-22 - */ -public interface IWisdomPanelEquipmentService extends IService { - /** - * 查询窗帘关联 - * - * @param id 窗帘关联ID - * @return 窗帘关联 - */ - WisdomPanelEquipment selectWisdomPanelEquipmentById(Long id); - - /** - * 查询窗帘关联列表 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 窗帘关联集合 - */ - List selectWisdomPanelEquipmentList(WisdomPanelEquipment wisdomPanelEquipment); - - /** - * 新增窗帘关联 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 结果 - */ - int insertWisdomPanelEquipment(WisdomPanelEquipment wisdomPanelEquipment); - - /** - * 修改窗帘关联 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 结果 - */ - int updateWisdomPanelEquipment(WisdomPanelEquipment wisdomPanelEquipment); - - /** - * 批量删除窗帘关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomPanelEquipmentByIds(String ids); - - /** - * 删除窗帘关联信息 - * - * @param id 窗帘关联ID - * @return 结果 - */ - int deleteWisdomPanelEquipmentById(Long id); - - List selectWisdomPanelEquipmentByPanelId(Long panelId); - -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/IWisdomPanelService.java b/ics-admin/src/main/java/com/ics/admin/service/IWisdomPanelService.java deleted file mode 100644 index 8d9f7b5..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/IWisdomPanelService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.WisdomPanel; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * 情景面板Service接口 - * - * @author ics - * @date 2024-08-22 - */ -public interface IWisdomPanelService extends IService { - /** - * 查询情景面板 - * - * @param id 情景面板ID - * @return 情景面板 - */ - WisdomPanel selectWisdomPanelById(Long id); - - /** - * 查询情景面板列表 - * - * @param wisdomPanel 情景面板 - * @return 情景面板集合 - */ - List selectWisdomPanelList(WisdomPanel wisdomPanel); - - /** - * 新增情景面板 - * - * @param wisdomPanel 情景面板 - * @return 结果 - */ - int insertWisdomPanel(WisdomPanel wisdomPanel); - - /** - * 修改情景面板 - * - * @param wisdomPanel 情景面板 - * @return 结果 - */ - int updateWisdomPanel(WisdomPanel wisdomPanel); - - /** - * 批量删除情景面板 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomPanelByIds(String ids); - - /** - * 删除情景面板信息 - * - * @param id 情景面板ID - * @return 结果 - */ - int deleteWisdomPanelById(Long id); -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/IWisdomRoomService.java b/ics-admin/src/main/java/com/ics/admin/service/IWisdomRoomService.java deleted file mode 100644 index 0fca2d7..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/IWisdomRoomService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.WisdomRoom; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * 智能房间Service接口 - * - * @author ics - * @date 2024-08-21 - */ -public interface IWisdomRoomService extends IService { - /** - * 查询智能房间 - * - * @param id 智能房间ID - * @return 智能房间 - */ - WisdomRoom selectWisdomRoomById(Long id); - - /** - * 查询智能房间列表 - * - * @param wisdomRoom 智能房间 - * @return 智能房间集合 - */ - List selectWisdomRoomList(WisdomRoom wisdomRoom); - - /** - * 新增智能房间 - * - * @param wisdomRoom 智能房间 - * @return 结果 - */ - int insertWisdomRoom(WisdomRoom wisdomRoom); - - /** - * 修改智能房间 - * - * @param wisdomRoom 智能房间 - * @return 结果 - */ - int updateWisdomRoom(WisdomRoom wisdomRoom); - - /** - * 批量删除智能房间 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomRoomByIds(String ids); - - /** - * 删除智能房间信息 - * - * @param id 智能房间ID - * @return 结果 - */ - int deleteWisdomRoomById(Long id); - - List selectList(WisdomRoom wisdomRoom); -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/IWisdomStaffService.java b/ics-admin/src/main/java/com/ics/admin/service/IWisdomStaffService.java deleted file mode 100644 index 42bd4d9..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/IWisdomStaffService.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.WisdomStaff; -import com.baomidou.mybatisplus.extension.service.IService; -import com.ics.common.core.domain.IcsCustomerStaff; - -import java.util.List; - -/** - * 房间用户关联Service接口 - * - * @author ics - * @date 2024-08-21 - */ -public interface IWisdomStaffService extends IService { - /** - * 查询房间用户关联 - * - * @param id 房间用户关联ID - * @return 房间用户关联 - */ - WisdomStaff selectWisdomStaffById(Long id); - - /** - * 查询房间用户关联列表 - * - * @param wisdomStaff 房间用户关联 - * @return 房间用户关联集合 - */ - List selectWisdomStaffList(WisdomStaff wisdomStaff); - - /** - * 新增房间用户关联 - * - * @param wisdomStaff 房间用户关联 - * @return 结果 - */ - int insertWisdomStaff(WisdomStaff wisdomStaff); - - /** - * 修改房间用户关联 - * - * @param wisdomStaff 房间用户关联 - * @return 结果 - */ - int updateWisdomStaff(WisdomStaff wisdomStaff); - - /** - * 批量删除房间用户关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteWisdomStaffByIds(String ids); - - /** - * 删除房间用户关联信息 - * - * @param id 房间用户关联ID - * @return 结果 - */ - int deleteWisdomStaffById(Long id); - - int deleteWisdomStaffByRoomId(Long id); - - List selectWisdomStaffListByRoomId(Long id); - - List selectWisdomStaffByRoomId(Long id); - - Integer selectByUserIdAndRoomId(Integer loginStaffId, String dataType); - - List selectListByUserIdAndRoomId(Integer loginStaffId, String s); - - int selectOneByUserIdAndRoomId(Long userId, Long wisdomRoomId); - - List selectListByReservationId(Long id); - - Integer selectListByReservationIdAndUserId(Long reservationId, Long participantId); - - Integer deleteWisdomStaffByReservationId(Long id); -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomDeviceServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomDeviceServiceImpl.java deleted file mode 100644 index 5c7590b..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomDeviceServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.WisdomDeviceMapper; -import com.ics.admin.domain.WisdomDevice; -import com.ics.admin.service.IWisdomDeviceService; - -/** - * 智能设备Service业务层处理 - * - * @author chen - * @date 2024-08-21 - */ -@Service -public class WisdomDeviceServiceImpl extends ServiceImpl implements IWisdomDeviceService { - @Autowired - private WisdomDeviceMapper wisdomDeviceMapper; - - /** - * 查询智能设备 - * - * @param id 智能设备ID - * @return 智能设备 - */ - @Override - public WisdomDevice selectWisdomDeviceById(Long id) { - return wisdomDeviceMapper.selectById(id); - } - - /** - * 查询智能设备列表 - * - * @param wisdomDevice 智能设备 - * @return 智能设备 - */ - @Override - public List selectWisdomDeviceList(WisdomDevice wisdomDevice) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(wisdomDevice.getWisdomRoomId() !=null,"wisdom_room_id",wisdomDevice.getWisdomRoomId()); - queryWrapper.eq(wisdomDevice.getType() !=null,"type",wisdomDevice.getType()); - return wisdomDeviceMapper.selectList(queryWrapper); - } - - /** - * 新增智能设备 - * - * @param wisdomDevice 智能设备 - * @return 结果 - */ - @Override - public int insertWisdomDevice(WisdomDevice wisdomDevice) { - return wisdomDeviceMapper.insert(wisdomDevice); - } - - /** - * 修改智能设备 - * - * @param wisdomDevice 智能设备 - * @return 结果 - */ - @Override - public int updateWisdomDevice(WisdomDevice wisdomDevice) { - return wisdomDeviceMapper.updateById(wisdomDevice); - } - - /** - * 删除智能设备对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWisdomDeviceByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return wisdomDeviceMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除智能设备信息 - * - * @param id 智能设备ID - * @return 结果 - */ - @Override - public int deleteWisdomDeviceById(Long id) { - return wisdomDeviceMapper.deleteWisdomDeviceById(id); - } -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomPanelEquipmentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomPanelEquipmentServiceImpl.java deleted file mode 100644 index a9908a8..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomPanelEquipmentServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.WisdomPanelEquipmentMapper; -import com.ics.admin.domain.WisdomPanelEquipment; -import com.ics.admin.service.IWisdomPanelEquipmentService; - -/** - * 窗帘关联Service业务层处理 - * - * @author ics - * @date 2024-08-22 - */ -@Service -public class WisdomPanelEquipmentServiceImpl extends ServiceImpl implements IWisdomPanelEquipmentService { - @Autowired - private WisdomPanelEquipmentMapper wisdomPanelEquipmentMapper; - - /** - * 查询窗帘关联 - * - * @param id 窗帘关联ID - * @return 窗帘关联 - */ - @Override - public WisdomPanelEquipment selectWisdomPanelEquipmentById(Long id) { - return wisdomPanelEquipmentMapper.selectById(id); - } - - /** - * 查询窗帘关联列表 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 窗帘关联 - */ - @Override - public List selectWisdomPanelEquipmentList(WisdomPanelEquipment wisdomPanelEquipment) { - QueryWrapper queryWrapper = new QueryWrapper(); - return wisdomPanelEquipmentMapper.selectList(queryWrapper); - } - - /** - * 新增窗帘关联 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 结果 - */ - @Override - public int insertWisdomPanelEquipment(WisdomPanelEquipment wisdomPanelEquipment) { - return wisdomPanelEquipmentMapper.insert(wisdomPanelEquipment); - } - - /** - * 修改窗帘关联 - * - * @param wisdomPanelEquipment 窗帘关联 - * @return 结果 - */ - @Override - public int updateWisdomPanelEquipment(WisdomPanelEquipment wisdomPanelEquipment) { - return wisdomPanelEquipmentMapper.updateById(wisdomPanelEquipment); - } - - /** - * 删除窗帘关联对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWisdomPanelEquipmentByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return wisdomPanelEquipmentMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除窗帘关联信息 - * - * @param id 窗帘关联ID - * @return 结果 - */ - @Override - public int deleteWisdomPanelEquipmentById(Long id) { - return wisdomPanelEquipmentMapper.deleteWisdomPanelEquipmentById(id); - } - - @Override - public List selectWisdomPanelEquipmentByPanelId(Long panelId) { - - QueryWrapper wrapper = new QueryWrapper().eq("panel_id", panelId); - return wisdomPanelEquipmentMapper.selectList(wrapper); - } -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomPanelServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomPanelServiceImpl.java deleted file mode 100644 index d9eeccd..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomPanelServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.WisdomPanelMapper; -import com.ics.admin.domain.WisdomPanel; -import com.ics.admin.service.IWisdomPanelService; - -/** - * 情景面板Service业务层处理 - * - * @author ics - * @date 2024-08-22 - */ -@Service -public class WisdomPanelServiceImpl extends ServiceImpl implements IWisdomPanelService { - @Autowired - private WisdomPanelMapper wisdomPanelMapper; - - /** - * 查询情景面板 - * - * @param id 情景面板ID - * @return 情景面板 - */ - @Override - public WisdomPanel selectWisdomPanelById(Long id) { - return wisdomPanelMapper.selectById(id); - } - - /** - * 查询情景面板列表 - * - * @param wisdomPanel 情景面板 - * @return 情景面板 - */ - @Override - public List selectWisdomPanelList(WisdomPanel wisdomPanel) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(wisdomPanel.getWisdomRoom() !=null,"wisdom_room",wisdomPanel.getWisdomRoom()); - return wisdomPanelMapper.selectList(queryWrapper); - } - - /** - * 新增情景面板 - * - * @param wisdomPanel 情景面板 - * @return 结果 - */ - @Override - public int insertWisdomPanel(WisdomPanel wisdomPanel) { - return wisdomPanelMapper.insert(wisdomPanel); - } - - /** - * 修改情景面板 - * - * @param wisdomPanel 情景面板 - * @return 结果 - */ - @Override - public int updateWisdomPanel(WisdomPanel wisdomPanel) { - return wisdomPanelMapper.updateById(wisdomPanel); - } - - /** - * 删除情景面板对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWisdomPanelByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return wisdomPanelMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除情景面板信息 - * - * @param id 情景面板ID - * @return 结果 - */ - @Override - public int deleteWisdomPanelById(Long id) { - return wisdomPanelMapper.deleteWisdomPanelById(id); - } -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomRoomServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomRoomServiceImpl.java deleted file mode 100644 index 8718a30..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomRoomServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.WisdomRoomMapper; -import com.ics.admin.domain.WisdomRoom; -import com.ics.admin.service.IWisdomRoomService; - -/** - * 智能房间Service业务层处理 - * - * @author ics - * @date 2024-08-21 - */ -@Service -public class WisdomRoomServiceImpl extends ServiceImpl implements IWisdomRoomService { - @Autowired - private WisdomRoomMapper wisdomRoomMapper; - - /** - * 查询智能房间 - * - * @param id 智能房间ID - * @return 智能房间 - */ - @Override - public WisdomRoom selectWisdomRoomById(Long id) { - return wisdomRoomMapper.selectById(id); - } - - /** - * 查询智能房间列表 - * - * @param wisdomRoom 智能房间 - * @return 智能房间 - */ - @Override - public List selectWisdomRoomList(WisdomRoom wisdomRoom) { - return wisdomRoomMapper.selectWisdomRoomList(wisdomRoom); - } - - /** - * 新增智能房间 - * - * @param wisdomRoom 智能房间 - * @return 结果 - */ - @Override - public int insertWisdomRoom(WisdomRoom wisdomRoom) { - return wisdomRoomMapper.insert(wisdomRoom); - } - - /** - * 修改智能房间 - * - * @param wisdomRoom 智能房间 - * @return 结果 - */ - @Override - public int updateWisdomRoom(WisdomRoom wisdomRoom) { - return wisdomRoomMapper.updateById(wisdomRoom); - } - - /** - * 删除智能房间对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWisdomRoomByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return wisdomRoomMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除智能房间信息 - * - * @param id 智能房间ID - * @return 结果 - */ - @Override - public int deleteWisdomRoomById(Long id) { - return wisdomRoomMapper.deleteWisdomRoomById(id); - } - - @Override - public List selectList(WisdomRoom wisdomRoom) { - - QueryWrapper queryWrapper = new QueryWrapper<>(); - return wisdomRoomMapper.selectList(queryWrapper); - } -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java deleted file mode 100644 index b1e6617..0000000 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ics.admin.mapper.IcsCustomerStaffMapper; -import com.ics.common.core.domain.IcsCustomerStaff; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.WisdomStaffMapper; -import com.ics.admin.domain.WisdomStaff; -import com.ics.admin.service.IWisdomStaffService; - -/** - * 房间用户关联Service业务层处理 - * - * @author ics - * @date 2024-08-21 - */ -@Service -public class WisdomStaffServiceImpl extends ServiceImpl implements IWisdomStaffService { - @Autowired - private WisdomStaffMapper wisdomStaffMapper; - - @Autowired - private IcsCustomerStaffMapper icsCustomerStaffMapper; - - /** - * 查询房间用户关联 - * - * @param id 房间用户关联ID - * @return 房间用户关联 - */ - @Override - public WisdomStaff selectWisdomStaffById(Long id) { - return wisdomStaffMapper.selectById(id); - } - - /** - * 查询房间用户关联列表 - * - * @param wisdomStaff 房间用户关联 - * @return 房间用户关联 - */ - @Override - public List selectWisdomStaffList(WisdomStaff wisdomStaff) { - QueryWrapper queryWrapper = new QueryWrapper(); - return wisdomStaffMapper.selectList(queryWrapper); - } - - /** - * 新增房间用户关联 - * - * @param wisdomStaff 房间用户关联 - * @return 结果 - */ - @Override - public int insertWisdomStaff(WisdomStaff wisdomStaff) { - return wisdomStaffMapper.insert(wisdomStaff); - } - - /** - * 修改房间用户关联 - * - * @param wisdomStaff 房间用户关联 - * @return 结果 - */ - @Override - public int updateWisdomStaff(WisdomStaff wisdomStaff) { - return wisdomStaffMapper.updateById(wisdomStaff); - } - - /** - * 删除房间用户关联对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWisdomStaffByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return wisdomStaffMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除房间用户关联信息 - * - * @param id 房间用户关联ID - * @return 结果 - */ - @Override - public int deleteWisdomStaffById(Long id) { - return wisdomStaffMapper.deleteWisdomStaffById(id); - } - - @Override - public int deleteWisdomStaffByRoomId(Long id) { - - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("wisdom_room_id",id); - return wisdomStaffMapper.delete(updateWrapper); - } - - @Override - public List selectWisdomStaffListByRoomId(Long id) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("wisdom_room_id",id); - List wisdomStaffs = wisdomStaffMapper.selectList(wrapper); - return wisdomStaffs.stream().map(WisdomStaff::getId).collect(Collectors.toList()); - } - - @Override - public List selectWisdomStaffByRoomId(Long id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("wisdom_room_id",id); - wrapper.groupBy("staff_id"); - List wisdomStaffs = wisdomStaffMapper.selectList(wrapper); - List collect = wisdomStaffs.stream().map(WisdomStaff::getStaffId).collect(Collectors.toList()); - return collect; - } - - @Override - public Integer selectByUserIdAndRoomId(Integer loginStaffId,String dataType) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("staff_id",loginStaffId); - wrapper.eq(dataType !=null,"data_type",dataType); - return wisdomStaffMapper.selectCount(wrapper); - } - - @Override - public List selectListByUserIdAndRoomId(Integer loginStaffId, String dataType) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("staff_id",loginStaffId); - wrapper.eq(dataType !=null,"data_type",dataType); - return wisdomStaffMapper.selectList(wrapper); - } - - @Override - public int selectOneByUserIdAndRoomId(Long userId, Long wisdomRoomId) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("staff_id",userId); - wrapper.eq("wisdom_room_id",wisdomRoomId); - return wisdomStaffMapper.selectCount(wrapper); - } - - @Override - public List selectListByReservationId(Long id) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("reservation_id",id); - List wisdomStaffs = wisdomStaffMapper.selectList(wrapper); - List longStream = wisdomStaffs.stream().map(WisdomStaff::getStaffId).collect(Collectors.toList()); - if(longStream.size() == 0){ - return new ArrayList<>(); - } - List customerStaffs = icsCustomerStaffMapper.selectBatchIds(longStream); - return customerStaffs; - - } - - @Override - public Integer selectListByReservationIdAndUserId(Long reservationId, Long participantId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("reservation_id",reservationId); - wrapper.eq("staff_id",participantId); - return wisdomStaffMapper.selectCount(wrapper); - - } - - @Override - public Integer deleteWisdomStaffByReservationId(Long id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("reservation_id",id); - return wisdomStaffMapper.delete(wrapper); - } -} diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationPersonServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationPersonServiceImpl.java index 60648b8..5edc06c 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationPersonServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationPersonServiceImpl.java @@ -133,20 +133,23 @@ public class ReservationPersonServiceImpl extends ServiceImpl selectListByParticipantId(Long userId,Long parkId,Integer page,Integer limit) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("participant_id",userId); - queryWrapper.eq("park_id",parkId); - List list = reservationPersonMapper.selectList(queryWrapper); - List collect = list.stream().map(item -> { - return item.getReservationId(); - }).collect(Collectors.toList()); - if (CollUtil.isEmpty(collect)){ - IPage iPage = new Page<>(page,limit); - return iPage ; - } + +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("participant_id",userId); +// queryWrapper.eq("park_id",parkId); +// List list = reservationPersonMapper.selectList(queryWrapper); +// List collect = list.stream().map(item -> { +// return item.getReservationId(); +// }).collect(Collectors.toList()); +// if (CollUtil.isEmpty(collect)){ +// IPage iPage = new Page<>(page,limit); +// return iPage ; +// } IPage iPage = new Page<>(page,limit); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.in("id",collect); +// wrapper.in("id",collect); + wrapper.eq("user_id",userId); + wrapper.eq("park_id",parkId); wrapper.orderByDesc("start_time"); IPage iPage1 = reservationMapper.selectPage(iPage, wrapper); List records = iPage1.getRecords(); diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java index e6078c3..332606e 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java @@ -246,9 +246,9 @@ public class ReservationServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if (!staff.getDataType().equals("7")){ - queryWrapper.eq("user_id",reservation.getUserId()); - } +// if (!staff.getDataType().equals("7")){ +// } + queryWrapper.eq("user_id",reservation.getUserId()); queryWrapper.eq("park_id",reservation.getParkId()); queryWrapper.orderByDesc("start_time"); diff --git a/ics-admin/src/main/resources/mapper/admin/WisdomDeviceMapper.xml b/ics-admin/src/main/resources/mapper/admin/WisdomDeviceMapper.xml deleted file mode 100644 index cc3dd05..0000000 --- a/ics-admin/src/main/resources/mapper/admin/WisdomDeviceMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT id, type, equipment_name,type_name, status,wisdom_room_id, equipment_num, pic, delete_flag, create_by, create_time, update_by, update_time, ip, tenant_id, park_id, content_id, content_name FROM tb_wisdom_device - - - - - - - - INSERT INTO tb_wisdom_device - - type, - equipment_name, - status, - equipment_num, - pic, - delete_flag, - create_by, - create_time, - update_by, - update_time, - ip, - tenant_id, - type_name, - wisdom_room_id, - park_id, - content_id, - content_name, - - - #{type}, - #{equipmentName}, - #{status}, - #{equipmentNum}, - #{pic}, - #{deleteFlag}, - #{typeName}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{ip}, - #{wisdom_room_id}, - #{tenantId}, - #{parkId}, - #{contentId}, - #{contentName}, - - - - - UPDATE tb_wisdom_device - - type = #{type}, - equipment_name = #{equipmentName}, - status = #{status}, - equipment_num = #{equipmentNum}, - pic = #{pic}, - delete_flag = #{deleteFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - type_name = #{typeName}, - update_by = #{updateBy}, - update_time = #{updateTime}, - ip = #{ip}, - wisdom_room_id = #{wisdomRoomId}, - tenant_id = #{tenantId}, - park_id = #{parkId}, - content_id = #{contentId}, - content_name = #{contentName}, - - WHERE id = #{id} - - - - DELETE FROM tb_wisdom_device WHERE id = #{id} - - - - DELETE FROM tb_wisdom_device where id in - - #{id} - - - - \ No newline at end of file diff --git a/ics-admin/src/main/resources/mapper/admin/WisdomPanelEquipmentMapper.xml b/ics-admin/src/main/resources/mapper/admin/WisdomPanelEquipmentMapper.xml deleted file mode 100644 index c281ec1..0000000 --- a/ics-admin/src/main/resources/mapper/admin/WisdomPanelEquipmentMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - SELECT id, panel_id, equipment_id, create_time, type FROM tb_wisdom_panel_equipment - - - - - - - - INSERT INTO tb_wisdom_panel_equipment - - panel_id, - equipment_id, - create_time, - type, - - - #{panelId}, - #{equipmentId}, - #{createTime}, - #{type}, - - - - - UPDATE tb_wisdom_panel_equipment - - panel_id = #{panelId}, - equipment_id = #{equipmentId}, - create_time = #{createTime}, - type = #{type}, - - WHERE id = #{id} - - - - DELETE FROM tb_wisdom_panel_equipment WHERE id = #{id} - - - - DELETE FROM tb_wisdom_panel_equipment where id in - - #{id} - - - - \ No newline at end of file diff --git a/ics-admin/src/main/resources/mapper/admin/WisdomPanelMapper.xml b/ics-admin/src/main/resources/mapper/admin/WisdomPanelMapper.xml deleted file mode 100644 index 2546428..0000000 --- a/ics-admin/src/main/resources/mapper/admin/WisdomPanelMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT id, panel_name, create_time, button_id, wisdom_room, panel_id FROM tb_wisdom_panel - - - - - - - - INSERT INTO tb_wisdom_panel - - panel_name, - create_time, - button_id, - wisdom_room, - img, - img_open, - panel_id, - - - #{panelName}, - #{createTime}, - #{buttonId}, - #{wisdomRoom}, - #{img}, - #{imgOpen}, - #{panelId}, - - - - - UPDATE tb_wisdom_panel - - panel_name = #{panelName}, - create_time = #{createTime}, - button_id = #{buttonId}, - wisdom_room = #{wisdomRoom}, - img = #{img}, - img_open = #{imgOpen}, - panel_id = #{panelId}, - - WHERE id = #{id} - - - - DELETE FROM tb_wisdom_panel WHERE id = #{id} - - - - DELETE FROM tb_wisdom_panel where id in - - #{id} - - - - \ No newline at end of file diff --git a/ics-admin/src/main/resources/mapper/admin/WisdomRoomMapper.xml b/ics-admin/src/main/resources/mapper/admin/WisdomRoomMapper.xml deleted file mode 100644 index 9a39d0b..0000000 --- a/ics-admin/src/main/resources/mapper/admin/WisdomRoomMapper.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - SELECT id, type, meeting_name, start_time, end_date,img, create_by, create_time, update_by, update_time, version, delete_flag, remake, tenant_id, park_id FROM tb_wisdom_room - - - - - - - - INSERT INTO tb_wisdom_room - - type, - meeting_name, - start_time, - end_date, - create_by, - create_time, - update_by, - update_time, - version, - delete_flag, - img, - remake, - tenant_id, - park_id, - - - #{type}, - #{meetingName}, - #{startTime}, - #{endDate}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{version}, - #{img}, - #{deleteFlag}, - #{remake}, - #{tenantId}, - #{parkId}, - - - - - UPDATE tb_wisdom_room - - type = #{type}, - meeting_name = #{meetingName}, - start_time = #{startTime}, - end_date = #{endDate}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - version = #{version}, - img = #{img}, - delete_flag = #{deleteFlag}, - remake = #{remake}, - tenant_id = #{tenantId}, - park_id = #{parkId}, - - WHERE id = #{id} - - - - DELETE FROM tb_wisdom_room WHERE id = #{id} - - - - DELETE FROM tb_wisdom_room where id in - - #{id} - - - - \ No newline at end of file diff --git a/ics-admin/src/main/resources/mapper/admin/WisdomStaffMapper.xml b/ics-admin/src/main/resources/mapper/admin/WisdomStaffMapper.xml deleted file mode 100644 index 9ad0a44..0000000 --- a/ics-admin/src/main/resources/mapper/admin/WisdomStaffMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - SELECT id, wisdom_room_id, staff_id,data_type,reservation_id, delete_flag,start_time,end_date, create_by, create_time, update_by, update_time, tenant_id, park_id FROM tb_wisdom_staff - - - - - - - - INSERT INTO tb_wisdom_staff - - id, - wisdom_room_id, - staff_id, - delete_flag, - create_by, - create_time, - start_time, - data_type, - reservation_id, - end_date, - update_by, - update_time, - tenant_id, - park_id, - - - #{id}, - #{wisdomRoomId}, - #{staffId}, - #{deleteFlag}, - #{createBy}, - #{createTime}, - #{dataType}, - #{startTime}, - #{reservationId}, - #{endDate}, - #{updateBy}, - #{updateTime}, - #{tenantId}, - #{parkId}, - - - - - UPDATE tb_wisdom_staff - - wisdom_room_id = #{wisdomRoomId}, - staff_id = #{staffId}, - delete_flag = #{deleteFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - start_time = #{startTime}, - data_type = #{dataType}, - reservation_id = #{reservationId}, - end_date = #{endDate}, - update_by = #{updateBy}, - update_time = #{updateTime}, - tenant_id = #{tenantId}, - park_id = #{parkId}, - - WHERE id = #{id} - - - - DELETE FROM tb_wisdom_staff WHERE id = #{id} - - - - DELETE FROM tb_wisdom_staff where id in - - #{id} - - - - \ No newline at end of file diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml index 9452de0..9455840 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml @@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DATE_FORMAT( start_time, '%Y-%m-%d %H:%i:%S' ) > DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%S' ))) and room_content_id =#{id} + and `stauts` = 1 ORDER BY start_time ASC @@ -82,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE DATE_FORMAT( start_time, '%Y-%m-%d' ) = DATE_FORMAT(now(), '%Y-%m-%d' ) - and `stauts` = 1 and `park_id` = '26' + and `stauts` = 1 and `park_id` = '27' diff --git a/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java b/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java index 96fc589..3f2beaf 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java @@ -110,39 +110,32 @@ public class WxLoginAPIController extends BaseController { // R ajax = R.ok(); // 校验用户是否存在 - StaffOpen staffOpen = staffOpenService.selectStaffOpenByOpenId(openid); - // 用户存在直接获取token - if (staffOpen != null) { - IcsCustomerStaff sysUser = icsCustomerStaffService.selectIcsCustomerStaffById(staffOpen.getStaffId()); - if (null != sysUser) { - if (parkId != null) { - Park park = parkService.selectParkById(Long.valueOf(parkId)); - sysUser.setParkName(park.getName()); - } - log.info("parkId:{}",parkId); - if (parkId != null && parkId.equals("26")){ - List staffCustomers = staffCustomerService.selectStaffCustomerByStaffIdAndParkId(sysUser.getId(),parkId); - log.info("用户信息为staffCustomers+++++++++++++++:{}",staffCustomers); - if (CollUtil.isEmpty(staffCustomers)) { - throw new RuntimeException("外部人员注册，请联系管理员"); - } - } - User user = new User(); - PublishFactory.recordLoginInfo(sysUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); - BeanUtils.copyBeanProp(user, sysUser); - Map token = tokenService.createToken(user); - ajax.put(Constants.TOKEN, token); - ajax.put("user", sysUser); - ajax.put("openid", openid); - return ajax; + IcsCustomerStaff sysUser = icsCustomerStaffService.selectUserByOpenid(openid); + if (null != sysUser) { + if (null != sysUser.getParkId()) { + Park park = parkService.selectParkById(sysUser.getParkId()); + sysUser.setParkName(park.getName()); } + log.info("parkId:{}",parkId); + List staffCustomers = staffCustomerService.selectStaffCustomerByStaffIdAndParkId(sysUser.getId(), String.valueOf(sysUser.getParkId())); + if (CollUtil.isEmpty(staffCustomers)) { + return R.error("外部人员注册，请联系管理员"); + } + + User user = new User(); + PublishFactory.recordLoginInfo(sysUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); + BeanUtils.copyBeanProp(user, sysUser); + Map token = tokenService.createToken(user); + ajax.put(Constants.TOKEN, token); + ajax.put("user", sysUser); ajax.put("openid", openid); return ajax; - } else { // 用户不存在返回openid进行注册登录 + }else { ajax.put("openid", openid); return ajax; } + } @@ -160,7 +153,7 @@ public class WxLoginAPIController extends BaseController { throw new RuntimeException("请传递code"); } if (StringUtils.isBlank(openid)) { - if (parkId.equals("26")){ + if (parkId.equals("26")) { throw new RuntimeException("外部人员注册，请联系管理员"); } throw new RuntimeException("请传递openid"); @@ -183,7 +176,7 @@ public class WxLoginAPIController extends BaseController { return R.error("外部人员注册，请联系管理员"); } else { - List staffCustomers = staffCustomerService.selectStaffCustomerByStaffIdAndParkId(customerStaff1.getId(),parkId); + List staffCustomers = staffCustomerService.selectStaffCustomerByStaffIdAndParkId(customerStaff1.getId(), parkId); if (CollUtil.isEmpty(staffCustomers)) { Assert.isTrue(false, "外部人员注册，请联系管理员"); return R.error("外部人员注册，请联系管理员"); @@ -248,56 +241,14 @@ public class WxLoginAPIController extends BaseController { icsCustomerStaff.setMobile(phoneNumber); IcsCustomerStaff customerStaff = icsCustomerStaffService.selectUserByMobile(phoneNumber); if (customerStaff != null) { - - StaffOpen staffOpen = staffOpenService.selectStaffOpenByStaffIdAndOpenId(customerStaff.getId(),openid); - - if (staffOpen != null) { - // 根据 用户绑定的企业 绑定对应的设备 - ArrayList ids = new ArrayList<>(); - Customer customer = customerService.selectCustomerById(customerStaff.getIcsCustomerId()); - if (null != customer) { - String roomId = customer.getRoomId(); - List roomIds = StrUtil.split(roomId, ','); - List collect = roomIds.stream().map(Long::valueOf).collect(Collectors.toList()); - //获取了房间集合，循环对应集合， - for (Long id : collect) { - List roomEquipment = roomEquipmentService.selectByRoomId(id); - if (CollUtil.isNotEmpty(roomEquipment)) { - for (RoomEquipment equipment : roomEquipment) { - ids.add(equipment.getEquipmentId()); - } - } - List detailEquipments = detailEquipmentService.selectByRoomId(id); - if (CollUtil.isNotEmpty(detailEquipments)) { - for (DetailEquipment detailEquipment : detailEquipments) { - ids.add(detailEquipment.getEquipmentId()); - } - } - } - } - if (CollUtil.isNotEmpty(ids)) { - for (Long id : ids) { - UserEquipment userEquipment = new UserEquipment(); - userEquipment.setEquipmentId(id); - userEquipment.setUserId(customerStaff.getId()); - userEquipment.setStartTime(customer.getStartDate()); - userEquipment.setEndDate(customer.getEndDate()); - userEquipmentService.insertUserEquipment(userEquipment); - } - } - }else { - StaffOpen staffOpen1 = new StaffOpen(); - staffOpen1.setOpenid(openid); - staffOpen1.setStaffId(customerStaff.getId()); -// staffOpen1.setParkId(Long.valueOf(parkId)); -// staffOpen1.setTenantId(Long.valueOf(tenantId)); - staffOpenService.insertStaffOpen(staffOpen1); - } - if (parkId != null) { - Park park = parkService.selectParkById(Long.valueOf(parkId)); + if (customerStaff.getParkId() != null) { + Park park = parkService.selectParkById(customerStaff.getParkId()); customerStaff.setParkName(park.getName()); } - + List staffCustomers = staffCustomerService.selectStaffCustomerByStaffIdAndParkId(customerStaff.getId(), String.valueOf(customerStaff.getParkId())); + if (CollUtil.isEmpty(staffCustomers)) { + return R.error("外部人员注册，请联系管理员"); + } User user = new User(); PublishFactory.recordLoginInfo(customerStaff.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); @@ -314,50 +265,20 @@ public class WxLoginAPIController extends BaseController { icsCustomerStaff.setUsername(phoneNumber); icsCustomerStaff.setGender("0"); icsCustomerStaff.setStatus("0"); + icsCustomerStaff.setParkId(27L); icsCustomerStaff.setOpenid(openid); int i = icsCustomerStaffService.insertIcsCustomerStaff(icsCustomerStaff); - StaffOpen staffOpen1 = new StaffOpen(); - staffOpen1.setOpenid(openid); - staffOpen1.setStaffId(icsCustomerStaff.getId()); -// staffOpen1.setParkId(Long.valueOf(parkId)); -// staffOpen1.setTenantId(Long.valueOf(tenantId)); - staffOpenService.insertStaffOpen(staffOpen1); + List staffCustomers = staffCustomerService.selectStaffCustomerByStaffIdAndParkId(icsCustomerStaff.getId(), String.valueOf(icsCustomerStaff.getParkId())); + if (CollUtil.isEmpty(staffCustomers)) { + return R.error("外部人员注册，请联系管理员"); + } Map token = tokenService.createStaffToken(icsCustomerStaff); R ajax = R.ok(); ajax.put(Constants.TOKEN, token); ajax.put("user", icsCustomerStaff); ajax.put("openid", openid); - - -// IcsCustomerStaff customerStaff1 = icsCustomerStaffService.selectUserByMobile(phoneNumber); -// //如果手机号等于null 就新增用户 -// if (null == customerStaff1) { -// icsCustomerStaff.setUsername(phoneNumber); -// icsCustomerStaff.setDataType(Constants.CUSTOMER_VISIT); -// icsCustomerStaff.setOpenid(openid); -// icsCustomerStaff.setGender("0"); -// icsCustomerStaff.setStatus("0"); -// int i = icsCustomerStaffService.insertIcsCustomerStaff(icsCustomerStaff); -// Map token = tokenService.createStaffToken(icsCustomerStaff); -// R ajax = R.ok(); -// ajax.put(Constants.TOKEN, token); -// ajax.put("user", icsCustomerStaff); -// ajax.put("openid", openid); -// return ajax; -// } else { -// String openid1 = customerStaff1.getOpenid(); -// customerStaff1.setOpenid(openid1 + "," + openid); -// icsCustomerStaffService.updateIcsCustomerStaff(customerStaff1); -// User user = new User(); -// PublishFactory.recordLoginInfo(customerStaff1.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); -// BeanUtils.copyBeanProp(user, customerStaff1); -// Map token = tokenService.createToken(user); -// R ajax = R.ok(); -// ajax.put(Constants.TOKEN, token); -// ajax.put("user", user); -// ajax.put("openid", openid); return ajax; } } catch (Exception e) { diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java index 77ba8a9..b112e07 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java @@ -6,13 +6,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.ics.admin.domain.WisdomDevice; -import com.ics.admin.domain.WisdomStaff; import com.ics.admin.domain.meeting.*; import com.ics.admin.domain.meeting.vo.DeviceData; -import com.ics.admin.service.IWisdomDeviceService; -import com.ics.admin.service.IWisdomRoomService; -import com.ics.admin.service.IWisdomStaffService; import com.ics.admin.service.meeting.*; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.R; @@ -56,14 +51,7 @@ public class ApiEquipmentController extends BaseController { @Autowired private RedisTemplate redisTemplate; - @Autowired - private IWisdomRoomService wisdomRoomService; - @Autowired - private IWisdomDeviceService wisdomDeviceService; - - @Autowired - private IWisdomStaffService wisdomStaffService; String smallWxAccessTokenKey = "nantong-"; @@ -233,64 +221,8 @@ public class ApiEquipmentController extends BaseController { return R.ok("开门成功"); } - @RequiresPermissions("member:center:view") - @GetMapping("/scanChangyangOpenDoor") - public R scanChangyangOpenDoor(RoomRecord roomRecord) { - WisdomDevice wisdomDevice = new WisdomDevice(); - log.info("2222222222222222222222会议室的id为{}", roomRecord.getRoomId()); - - //大会议室 52 茶室 53 小会议室 54 - if (roomRecord.getRoomId() == 237L) { - wisdomDevice.setEquipmentNum("238"); - } else if (roomRecord.getRoomId() == 238L) { - - wisdomDevice.setEquipmentNum("240"); - } else if (roomRecord.getRoomId() == 239L) { - wisdomDevice.setEquipmentNum("239"); - } else if (roomRecord.getRoomId() == 242L) { - wisdomDevice.setEquipmentNum("192.168.1.201"); - wisdomDevice.setType("开门控制器"); - } else if (roomRecord.getRoomId() == 243L) { - wisdomDevice.setEquipmentNum("192.168.1.34"); - wisdomDevice.setType("开门控制器"); - } - - - Integer count = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(roomRecord.getUserId())), null); - if (count == 0) return R.error("该用户没有权限开锁"); - Integer count1 = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(roomRecord.getUserId())), "0"); - if (count1 == 0) { - List list = wisdomStaffService.selectListByUserIdAndRoomId(Integer.parseInt(String.valueOf(roomRecord.getUserId())), "1"); - int num = 0; - for (WisdomStaff wisdomStaff : list) { - Date startTime = wisdomStaff.getStartTime(); - Date endDate = wisdomStaff.getEndDate(); - Date offset = DateUtil.offset(startTime, DateField.MINUTE, -10); - Date offset1 = DateUtil.offset(endDate, DateField.MINUTE, -10); - boolean in = DateUtil.isIn(new Date(), offset, offset1); - if (in) { - num++; - } - } - if (num <= 0) return R.error("该用户没有权限开锁"); - if (wisdomDevice.getType() != null && wisdomDevice.getType().equals("开门控制器")) { - WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); - } else { - SignUtils.lock(wisdomDevice.getEquipmentNum()); - } - - } else { - if (wisdomDevice.getType() != null && wisdomDevice.getType().equals("开门控制器")) { - WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); - } else { - SignUtils.lock(wisdomDevice.getEquipmentNum()); - } - } - return R.ok("开门成功"); - } - /** * 扫描二维码开门 用户id 和设备id diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiReservationController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiReservationController.java new file mode 100644 index 0000000..e7995d6 --- /dev/null +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiReservationController.java @@ -0,0 +1,225 @@ +package com.ics.controller.mobile.meeting; + +import java.text.DecimalFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.ArrayList; +import java.util.stream.Collectors; + +import cn.hutool.core.date.DateUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.ics.common.core.controller.BaseController; +import com.ics.admin.service.meeting.IReservationService; +import com.ics.common.core.domain.R; +import com.ics.admin.domain.meeting.Reservation; +import com.ics.admin.domain.meeting.RoomContent; +import com.ics.admin.service.IRoomService; +import com.ics.admin.service.meeting.IRoomContentService; +import com.ics.admin.domain.Room; +import org.wf.jwtp.annotation.Ignore; +import org.wf.jwtp.annotation.RequiresPermissions; + +/** + * 预约记录 提供者 + * + * @author chen + * @date 2024-02-25 + */ +@Slf4j +@RestController +@RequestMapping("/api/reservation") +public class ApiReservationController extends BaseController { + + @Autowired + private IReservationService reservationService; + + @Autowired + private IRoomContentService roomContentService; + + @Autowired + private IRoomService roomService; + + /** + * 获取今日会议室预约数据 + * + * @return 会议室预约数据 + */ + @RequiresPermissions("member:center:view") + @GetMapping("/today") + public R getTodayReservations() { + try { + + // 获取当前用户ID + Long currentUserId = getCurrentUserId(); + System.out.println(); + // 获取今日预约列表 + List todayReservations = reservationService.selectReservationListByDay(); + + // 按会议室分组的预约数据 + Map>> roomBookingData = new HashMap<>(); + + // 处理预约数据 + for (Reservation reservation : todayReservations) { + // 获取会议室内容 + Long roomContentId = reservation.getRoomContentId(); + if (roomContentId == null) { + continue; + } + + RoomContent roomContent = roomContentService.selectRoomContentById(roomContentId); + if (roomContent == null || roomContent.getRoomId() == null) { + continue; + } + + // 获取会议室 + Room room = roomService.selectRoomById(roomContent.getRoomId()); + if (room == null) { + continue; + } + + // 会议室名称作为key + String roomKey = room.getName(); + + // 确保Map中有当前会议室的数据结构 + if (!roomBookingData.containsKey(roomKey)) { + Map> bookingInfo = new HashMap<>(); + bookingInfo.put("myBookings", new ArrayList<>()); + bookingInfo.put("otherBookings", new ArrayList<>()); + roomBookingData.put(roomKey, bookingInfo); + } + + // 判断是当前用户的预约还是其他用户的预约 + String bookingType = reservation.getUserId().equals(currentUserId) ? "myBookings" : "otherBookings"; + + // 将预约时间转换为小时格式（例如：9.0, 9.5, 10.0 等） + Date startTime = reservation.getStartTime(); + Date endTime = reservation.getEndDate(); + + if (startTime != null && endTime != null) { + List timeSlots = convertToTimeSlots(startTime, endTime); + roomBookingData.get(roomKey).get(bookingType).addAll(timeSlots); + } + } + + // 将结果转换为需要的格式 + Map> finalRoomBookingData = new HashMap<>(); + for (Map.Entry>> entry : roomBookingData.entrySet()) { + Map roomData = new HashMap<>(); + + List myBookings = entry.getValue().get("myBookings"); + List otherBookings = entry.getValue().get("otherBookings"); + + roomData.put("myBookings", myBookings.stream().mapToDouble(Double::doubleValue).toArray()); + roomData.put("otherBookings", otherBookings.stream().mapToDouble(Double::doubleValue).toArray()); + + finalRoomBookingData.put(entry.getKey(), roomData); + } + + // 如果数据库没有足够数据，添加一些虚拟数据用于演示 + // if (finalRoomBookingData.isEmpty() || finalRoomBookingData.size() < 6) { + // addDemoData(finalRoomBookingData); + // } + + return R.ok().put("data", finalRoomBookingData); + } catch (Exception e) { + log.error("获取今日会议室预约数据失败", e); + return R.error("获取今日会议室预约数据失败"); + } + } + + /** + * 将开始时间和结束时间转换为0.5小时为单位的时间槽列表 + * 例如：9:00-10:30 转换为 [9.0, 9.5, 10.0] + */ + private List convertToTimeSlots(Date startTime, Date endTime) { + List timeSlots = new ArrayList<>(); + + Calendar startCal = Calendar.getInstance(); + startCal.setTime(startTime); + + Calendar endCal = Calendar.getInstance(); + endCal.setTime(endTime); + + // 取整到最近的半小时 + int startHour = startCal.get(Calendar.HOUR_OF_DAY); + int startMinute = startCal.get(Calendar.MINUTE); + + double currentTimeSlot = startHour; + if (startMinute >= 30) { + currentTimeSlot += 0.5; + } + + // 将结束时间向上取整到最近的半小时 + int endHour = endCal.get(Calendar.HOUR_OF_DAY); + int endMinute = endCal.get(Calendar.MINUTE); + + double endTimeSlot = endHour; + if (endMinute > 0) { + endTimeSlot += 0.5; + } + + // 添加所有时间槽 + while (currentTimeSlot < endTimeSlot) { + timeSlots.add(currentTimeSlot); + currentTimeSlot += 0.5; + } + + return timeSlots; + } + + /** + * 添加演示数据 + */ + private void addDemoData(Map> finalRoomBookingData) { + if (!finalRoomBookingData.containsKey("401")) { + Map room401 = new HashMap<>(); + room401.put("myBookings", new double[]{16, 16.5, 17}); + room401.put("otherBookings", new double[]{10, 10.5, 11, 11.5, 12}); + finalRoomBookingData.put("401", room401); + } + + if (!finalRoomBookingData.containsKey("709")) { + Map room709 = new HashMap<>(); + room709.put("myBookings", new double[]{15, 15.5, 16}); + room709.put("otherBookings", new double[]{9, 9.5, 10, 10.5, 11}); + finalRoomBookingData.put("709", room709); + } + + if (!finalRoomBookingData.containsKey("705")) { + Map room705 = new HashMap<>(); + room705.put("myBookings", new double[]{18, 18.5, 19}); + room705.put("otherBookings", new double[]{9, 9.5, 10, 10.5, 11}); + finalRoomBookingData.put("705", room705); + } + + if (!finalRoomBookingData.containsKey("302")) { + Map room302 = new HashMap<>(); + room302.put("myBookings", new double[]{14, 14.5, 15}); + room302.put("otherBookings", new double[]{11, 11.5, 12, 17, 17.5, 18}); + finalRoomBookingData.put("302", room302); + } + + if (!finalRoomBookingData.containsKey("305")) { + Map room305 = new HashMap<>(); + room305.put("myBookings", new double[]{9, 9.5, 10}); + room305.put("otherBookings", new double[]{14, 14.5, 15, 15.5, 16, 16.5, 17}); + finalRoomBookingData.put("305", room305); + } + + if (!finalRoomBookingData.containsKey("407")) { + Map room407 = new HashMap<>(); + room407.put("myBookings", new double[]{12, 12.5, 13}); + room407.put("otherBookings", new double[]{9, 9.5, 10, 16, 16.5, 17}); + finalRoomBookingData.put("407", room407); + } + } +} + diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java index a218100..ee8b3b1 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java @@ -87,8 +87,7 @@ public class ApiRoomContentController extends BaseController { @Autowired private IRoomServeService roomServeService; - @Autowired - private IWisdomStaffService wisdomStaffService; + /** @@ -264,35 +263,7 @@ public class ApiRoomContentController extends BaseController { } } } - //新增预约人 门锁权限 - WisdomStaff wisdomStaff = new WisdomStaff(); - if (reservation.getRoomContentId() == 52L) wisdomStaff.setWisdomRoomId(3L); - if (reservation.getRoomContentId() == 53L) wisdomStaff.setWisdomRoomId(4L); - if (reservation.getRoomContentId() == 54L) wisdomStaff.setWisdomRoomId(6L); - wisdomStaff.setStaffId(reservation.getUserId()); - wisdomStaff.setStartTime(reservation.getStartTime()); - wisdomStaff.setEndDate(reservation.getEndDate()); - wisdomStaff.setReservationId(reservation.getId()); - wisdomStaff.setDataType("1"); - int i = wisdomStaffService.insertWisdomStaff(wisdomStaff); - //新增参会人和对应门锁权限 - List reservationPerson = reservation.getReservationPersonList(); - - for (ReservationPerson person : reservationPerson) { - //新增预约人 门锁权限 - WisdomStaff wisdomStaff1 = new WisdomStaff(); - if (reservation.getRoomContentId() == 52L) wisdomStaff1.setWisdomRoomId(3L); - if (reservation.getRoomContentId() == 53L) wisdomStaff1.setWisdomRoomId(4L); - if (reservation.getRoomContentId() == 54L) wisdomStaff1.setWisdomRoomId(6L); - wisdomStaff1.setStaffId(person.getUserId()); - wisdomStaff1.setStartTime(reservation.getStartTime()); - wisdomStaff1.setEndDate(reservation.getEndDate()); - wisdomStaff1.setReservationId(reservation.getId()); - wisdomStaff1.setDataType("1"); - - int count = wisdomStaffService.insertWisdomStaff(wisdomStaff1); - } Long id = reservation.getId(); return toAjax(save).put("reservationId", id); @@ -504,15 +475,7 @@ public class ApiRoomContentController extends BaseController { reservation.setAvatar(icsCustomerStaff.getAvatar()); } - List wisdomStaffs = wisdomStaffService.selectListByReservationId(id); - List reservationPeople = new ArrayList<>(); - for (IcsCustomerStaff wisdomStaff : wisdomStaffs) { - ReservationPerson reservationPerson = new ReservationPerson(); - reservationPerson.setUserId(wisdomStaff.getId()); - reservationPerson.setUserName(wisdomStaff.getUsername()); - reservationPeople.add(reservationPerson); - } - reservation.setReservationPersonList(reservationPeople); + Ticket ticket = ticketService.selectTicketById(reservation.getTicketId()); if (null != ticket) { @@ -580,11 +543,7 @@ public class ApiRoomContentController extends BaseController { @PostMapping("/addVisitor") public R addVisitor(@RequestBody ReservationPerson reservationPerson) { - if (reservationPerson.getParkId() == 26L) { - Long reservationId = reservationPerson.getReservationId(); - Integer count = wisdomStaffService.selectListByReservationIdAndUserId(reservationId, reservationPerson.getParticipantId()); - if (count <= 0) return R.error("您没有参会权限"); - } + reservationPerson.setStatus("1"); reservationPerson.setJoinTime(new Date()); @@ -761,51 +720,7 @@ public class ApiRoomContentController extends BaseController { } - @RequiresPermissions("member:center:view") - @PostMapping("updatePersonList") - public R updatePersonList(@RequestBody Reservation reservation) { - List customerStaffs = wisdomStaffService.selectListByReservationId(reservation.getId()); - if(CollUtil.isNotEmpty(customerStaffs)) { - Integer integer = wisdomStaffService.deleteWisdomStaffByReservationId(reservation.getId()); - if (integer == 0) return R.error("删除失败"); - } - - - //新增预约人 门锁权限 - WisdomStaff wisdomStaff = new WisdomStaff(); - if (reservation.getRoomContentId() == 52L) wisdomStaff.setWisdomRoomId(3L); - if (reservation.getRoomContentId() == 53L) wisdomStaff.setWisdomRoomId(4L); - if (reservation.getRoomContentId() == 54L) wisdomStaff.setWisdomRoomId(6L); - wisdomStaff.setStaffId(reservation.getUserId()); - wisdomStaff.setStartTime(reservation.getStartTime()); - wisdomStaff.setEndDate(reservation.getEndDate()); - wisdomStaff.setReservationId(reservation.getId()); - wisdomStaff.setDataType("1"); - - int i = wisdomStaffService.insertWisdomStaff(wisdomStaff); - - List reservationPerson = reservation.getReservationPersonList(); - - for (ReservationPerson person : reservationPerson) { - int count = wisdomStaffService.selectListByReservationIdAndUserId(reservation.getId(),person.getUserId() ); - if (count ==0){ - //新增预约人 门锁权限 - WisdomStaff wisdomStaff1 = new WisdomStaff(); - if (reservation.getRoomContentId() == 52L) wisdomStaff1.setWisdomRoomId(3L); - if (reservation.getRoomContentId() == 53L) wisdomStaff1.setWisdomRoomId(4L); - if (reservation.getRoomContentId() == 54L) wisdomStaff1.setWisdomRoomId(6L); - wisdomStaff1.setStaffId(person.getUserId()); - wisdomStaff1.setStartTime(reservation.getStartTime()); - wisdomStaff1.setEndDate(reservation.getEndDate()); - wisdomStaff1.setReservationId(reservation.getId()); - wisdomStaff1.setDataType("1"); - - int num = wisdomStaffService.insertWisdomStaff(wisdomStaff1); - } - } - return R.ok(); - } public static boolean timeIsInRound(String str1, String start, String end) { diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java index 5c7ea83..5a893b8 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ics.admin.domain.BuildingDetail; +import com.ics.admin.domain.Customer; import com.ics.admin.domain.Park; import com.ics.admin.domain.Room; import com.ics.admin.domain.meeting.*; @@ -124,6 +125,30 @@ public class ApiRoomController extends BaseController { List parkList = parkService.selectParkList(park); return R.data(parkList); } + + /** + * 查询企业 + */ + @Ignore + @PostMapping ("selectCustomerListByParkId") + public R selectCustomerList(@RequestBody HashMap map) { + Long parkId = map.get("parkId"); + Customer customer1 = new Customer(); + customer1.setParkId(parkId); + return R.data(customerService.selectCustomerList(customer1)); + } + + + /** + * 查询企业 + */ + @Ignore + @PostMapping ("selectCustomerList") + public R selectCustomerList(@RequestBody RoomContent roomContent) { + + Customer customer = customerService.selectCustomerById(roomContent.getCustomerId()); + return R.data(customer); + } } diff --git a/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java b/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java deleted file mode 100644 index d3f8c12..0000000 --- a/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java +++ /dev/null @@ -1,265 +0,0 @@ -package com.ics.controller.mobile.wisdom; - - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.ics.admin.domain.*; -import com.ics.admin.domain.meeting.Reservation; -import com.ics.admin.service.*; -import com.ics.admin.service.meeting.IReservationService; -import com.ics.common.core.controller.BaseController; -import com.ics.common.core.domain.R; -import com.ics.common.utils.device.SignUtils; -import com.ics.common.utils.device.WisDomDeviceUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.wf.jwtp.annotation.Ignore; -import org.wf.jwtp.annotation.RequiresPermissions; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@RestController -@Slf4j -@RequestMapping("/api/wisdom") -public class WisdomApiController extends BaseController { - - - @Autowired - private IWisdomRoomService wisdomRoomService; - - @Autowired - private IWisdomDeviceService wisdomDeviceService; - - @Autowired - private IWisdomStaffService wisdomStaffService; - - @Autowired - private IIcsCustomerStaffService customerStaffService; - - @Autowired - private IWisdomPanelService wisdomPanelService; - - @Autowired - private IWisdomPanelEquipmentService wisdomPanelEquipmentService; - - @Autowired - private IReservationService iReservationService; - - - /** - * 获取所有房间信息 - */ - @RequiresPermissions("member:center:view") - @RequestMapping("/getAllRoomInfo") - public R getAllRoomInfo(WisdomRoom wisdomRoom) { - - long currentUserId = getLoginStaffId(); - wisdomRoom.setStaffIds(currentUserId); - - List wisdomRooms = wisdomRoomService.selectWisdomRoomList(wisdomRoom); - for (WisdomRoom room : wisdomRooms) { - WisdomDevice wisdomDevice = new WisdomDevice(); - wisdomDevice.setWisdomRoomId(room.getId()); - List wisdomDevices = wisdomDeviceService.selectWisdomDeviceList(wisdomDevice); - room.setDeviceNum(wisdomDevices.size()); - WisdomPanel wisdomPanel = new WisdomPanel(); - wisdomPanel.setWisdomRoom(room.getId()); - List wisdomPanels = wisdomPanelService.selectWisdomPanelList(wisdomPanel); - room.setPanelNum(wisdomPanels.size()); - } - return R.data(wisdomRooms); - } - - /** - * 根据房间获取对应设备列表 - */ - - @RequiresPermissions("member:center:view") - @RequestMapping("/getAllDeviceInfoByRoomId") - public R getAllDeviceInfoByRoomId(Long id) { - - long currentUserId = getLoginStaffId(); - - //获取用户id 判断会议预约还是管理员 - Integer integer = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(currentUserId)), "0"); - if (integer > 0) { - WisdomDevice wisdomDevice = new WisdomDevice(); - wisdomDevice.setWisdomRoomId(id); - List wisdomDevices = wisdomDeviceService.selectWisdomDeviceList(wisdomDevice); - return R.data(wisdomDevices); - } else { - Integer count = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(currentUserId)), "1"); - if (count <= 0) return R.error("您没有权限查看该房间设备"); - WisdomDevice wisdomDevice = new WisdomDevice(); - wisdomDevice.setWisdomRoomId(id); - if (id == 3 || id == 4) { - wisdomDevice.setType("门锁"); - } else if (id == 18 || id == 19) { - wisdomDevice.setType("开门控制器"); - } - List wisdomDevices = wisdomDeviceService.selectWisdomDeviceList(wisdomDevice); - return R.data(wisdomDevices); - } - } - - /** - * 根据房间获取对应情景列表 - */ - - @RequiresPermissions("member:center:view") - @GetMapping("/getAllPanelInfoByRoomId") - public R getAllPanelInfoByRoomId(Long id) { - long currentUserId = getLoginStaffId(); - Integer integer = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(currentUserId)), "0"); - if (integer <= 0) return R.data(new ArrayList<>()); - WisdomPanel wisdomPanel = new WisdomPanel(); - wisdomPanel.setWisdomRoom(id); - List wisdomPanels = wisdomPanelService.selectWisdomPanelList(wisdomPanel); - return R.data(wisdomPanels); - } - - @RequiresPermissions("member:center:view") - @GetMapping("getDeviceInfo") - public R getDeviceInfo(Long id) { - WisdomDevice wisdomDevice = wisdomDeviceService.selectWisdomDeviceById(id); - if (wisdomDevice == null) return R.error("设备不存在"); - - if (wisdomDevice.getType().equals("开门控制器")) { - return R.ok(); - } - JSONObject deviceStatus = WisDomDeviceUtils.getDeviceStatus(wisdomDevice.getEquipmentNum(), wisdomDevice.getTypeName()); - - return R.ok(deviceStatus); - } - - - /** - * 根据设备id调用对接接口 - */ - - @RequiresPermissions("member:center:view") -// @Ignore - @RequestMapping("/callApiByDeviceId") - public R callApiByDeviceId(@RequestBody DeviceVo deviceVo) { - - WisdomDevice wisdomDevice = wisdomDeviceService.selectWisdomDeviceById(deviceVo.getDeviceId()); - if (wisdomDevice.getType().equals("灯条")) - WisDomDeviceUtils.deviceControl(wisdomDevice.getEquipmentNum(), deviceVo.getActionArg()); - if (wisdomDevice.getType().equals("调光灯")) { - Boolean aBoolean = deviceVo.getBir() == null ? WisDomDeviceUtils.dimmingOpenControl(wisdomDevice.getEquipmentNum(), deviceVo.getActionArg()) : WisDomDeviceUtils.dimmingControl(wisdomDevice.getEquipmentNum(), deviceVo.getBir(), deviceVo.getColourTemperature()); - if (!aBoolean) return R.error("调光灯操作失败"); - } - if (wisdomDevice.getType().equals("插座")) - WisDomDeviceUtils.socketControl(wisdomDevice.getEquipmentNum(), deviceVo.getActionArg()); - if (wisdomDevice.getType().equals("雾化玻璃")) - WisDomDeviceUtils.deviceControl(wisdomDevice.getEquipmentNum(), deviceVo.getActionArg()); - - //todo 窗帘接口 - if (wisdomDevice.getType().equals("窗帘")) - WisDomDeviceUtils.openCover(wisdomDevice.getEquipmentNum(), deviceVo.getCoverType()); - if (wisdomDevice.getType().equals("门锁")) { - Integer loginStaffId = this.getLoginStaffId(); - //获取用户id 判断改用户是否可以开锁 - - Integer count = wisdomStaffService.selectByUserIdAndRoomId(loginStaffId, null); - if (count == 0) return R.error("该用户没有权限开锁"); - Integer count1 = wisdomStaffService.selectByUserIdAndRoomId(loginStaffId, "0"); - if (count1 == 0) { - List list = wisdomStaffService.selectListByUserIdAndRoomId(loginStaffId, "1"); - int num = 0; - for (WisdomStaff wisdomStaff : list) { - Date startTime = wisdomStaff.getStartTime(); - Date endDate = wisdomStaff.getEndDate(); - Date offset = DateUtil.offset(startTime, DateField.MINUTE, -10); - Date offset1 = DateUtil.offset(endDate, DateField.MINUTE, -10); - boolean in = DateUtil.isIn(new Date(), offset, offset1); - if (in) { - num++; - } - } - if (num <= 0) return R.error("该用户没有权限开锁"); - SignUtils.lock(wisdomDevice.getEquipmentNum()); - } else { -// WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); - - SignUtils.lock(wisdomDevice.getEquipmentNum()); - } - } - if (wisdomDevice.getType().equals("开门控制器")) - WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); - return R.ok(); - } - - /** - * 根据情景面板id 调用对接 - */ - @RequiresPermissions("member:center:view") - @RequestMapping("/callApiByPanelId") - public R callApiByPanelId(@RequestBody WisdomPanel panelVo) { - WisdomPanel wisdomPanel = wisdomPanelService.selectWisdomPanelById(panelVo.getId()); - if (wisdomPanel != null) { - Boolean aBoolean = WisDomDeviceUtils.shortControl(wisdomPanel.getPanelId(), wisdomPanel.getButtonId()); - //设备 窗帘 - - - List list = wisdomPanelEquipmentService.selectWisdomPanelEquipmentByPanelId(wisdomPanel.getId()); - if (CollUtil.isNotEmpty(list)) { - //如果设备id不等于空 - for (WisdomPanelEquipment panelEquipment : list) { - WisdomDevice equipment = wisdomDeviceService.getById(panelEquipment.getEquipmentId()); - if (null != equipment) { - Boolean aBoolean1 = WisDomDeviceUtils.openCover(equipment.getEquipmentNum(), panelEquipment.getType()); - } - } - } - } - return R.ok(); - } - - - @Ignore - @RequestMapping("/meetingOpen") - public R meetingOpen() { - //获取当天所有预约的会议室 - List reservations = iReservationService.selectReservationListByDay(); - - for (Reservation reservation : reservations) { - Date date = new Date(); - - Date next = DateUtil.offsetMinute(date, 15); - String format = DateUtil.format(next, "HH:mm"); - Date startTime = reservation.getStartTime(); - String format1 = DateUtil.format(startTime, "HH:mm"); - log.info("时间为===============" + (format.equals(format1))); - if (format.equals(format1)) { - log.info("结果为------------"); - //大会议室 - if (reservation.getRoomContentId() == 52L) { - Boolean aBoolean = WisDomDeviceUtils.shortControl("312", 1); - log.info("大会议室情景结果为：" + aBoolean); - } else if (reservation.getRoomContentId() == 53L) {//茶室 - Boolean aBoolean = WisDomDeviceUtils.shortControl("286", 1); - log.info("茶室情景结果为：" + aBoolean); - } else if (reservation.getRoomContentId() == 54L) { //小会议室 - WisDomDeviceUtils.deviceControl("244", true); - WisDomDeviceUtils.deviceControl("245", true); - WisDomDeviceUtils.deviceControl("246", true); - log.info("小会议室情景结果为："); - } - } - } - return R.ok(); - } - - - -} diff --git a/ics-web/src/main/resources/application-dev.yml b/ics-web/src/main/resources/application-dev.yml index d09117d..95df2b1 100644 --- a/ics-web/src/main/resources/application-dev.yml +++ b/ics-web/src/main/resources/application-dev.yml @@ -20,9 +20,9 @@ spring: # url: jdbc:mysql://192.168.0.50:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: boyuekeji2023 - url: jdbc:mysql://222.184.49.22:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://8.130.174.239:3306/xiongan-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: boyue1!Z + password: chenze-s&qPXhQ7CMQ0 # 从库数据源 slave: #从数据源开关/默认关闭 @@ -71,20 +71,22 @@ dfs: # 此处改成自己服务器存储位置 #path: /Users/lihongyuan/IdeaProjects/saas-ics/ics/ # domain: http://222.184.49.22:9227 -# path: D:/ruoyi/uploadPath - domain: http://192.168.0.11:9227 - path: D:/博越/ruoyi/uploadPath + path: D:/ruoyi/uploadPath/upload +# path: /usr/local/uploadPath/ +# domain: http://8.130.174.239:9227/SaaS-ICS + domain: http://192.168.0.15:9227 +# path: D:/博越/ruoyi/uploadPath # 公众号配置(必填) wx: miniapp: # appid: wx22f0f66d57ce48f7 # appid: wxd9f93ef41a607dd5 - appid: wx5582a07c1fbbcf06 + appid: wx88be95fc1c9f5c66 appids: # secret: 3fe3c634a223cbdbfb7c8b7263031808 # secret: 417507767334672bc46bb6eb3bf1c29b - secret: ad24130a8919c613efd9538f69abafd3 + secret: 729428ea3d4f65ccff1b2e552e00ba09 token: aesKey: msgDataFormat: JSON # 消息格式，XML或者JSON. @@ -137,6 +139,7 @@ mybatis-plus: weixin: appid: wx5582a07c1fbbcf06 # appid mch-serial-no: 5899B7D34B161F9E24EFFCD50E95245521CA40AB # 证书序列号 +# private-key-path: /opt/pay/apiclient_key.pem # 证书路径 private-key-path: D:/博越/cert/dbd/apiclient_key.pem # 证书路径 mch-id: 1665472343 # 商户号 key: CHANGYANGKONGGUhenanjianandianzi # APIv3密钥 diff --git a/ics-web/src/main/resources/application.yml b/ics-web/src/main/resources/application.yml index 68c0260..c4cf4dd 100644 --- a/ics-web/src/main/resources/application.yml +++ b/ics-web/src/main/resources/application.yml @@ -1,5 +1,6 @@ server: port: 9227 + undertow: # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 # 每块buffer的空间大小,越小的空间被利用越充分，不要设置太大，以免影响其他应用，合适即可 @@ -27,7 +28,7 @@ spring: main: allow-bean-definition-overriding: true profiles: - active: prod + active: dev jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 diff --git a/ics/2021/12/28/bdff66eadaf892cead36282c6eed3418.png b/ics/2021/12/28/bdff66eadaf892cead36282c6eed3418.png deleted file mode 100644 index 1bd6f79..0000000 Binary files a/ics/2021/12/28/bdff66eadaf892cead36282c6eed3418.png and /dev/null differ diff --git a/ics/2022/06/09/6629269388f68b55f5e3c49a89ff42f6.png b/ics/2022/06/09/6629269388f68b55f5e3c49a89ff42f6.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/09/6629269388f68b55f5e3c49a89ff42f6.png and /dev/null differ diff --git a/ics/2022/06/09/bc5cc0faa42f2372139db5bb2847ad3f.png b/ics/2022/06/09/bc5cc0faa42f2372139db5bb2847ad3f.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/09/bc5cc0faa42f2372139db5bb2847ad3f.png and /dev/null differ diff --git a/ics/2022/06/09/c9453a308ce546b132d4979cbeff5939.jpeg b/ics/2022/06/09/c9453a308ce546b132d4979cbeff5939.jpeg deleted file mode 100644 index 349a26f..0000000 Binary files a/ics/2022/06/09/c9453a308ce546b132d4979cbeff5939.jpeg and /dev/null differ diff --git a/ics/2022/06/10/08a16e02494caa40e3281d32d235f8b0.png b/ics/2022/06/10/08a16e02494caa40e3281d32d235f8b0.png deleted file mode 100644 index 51d9d7f..0000000 Binary files a/ics/2022/06/10/08a16e02494caa40e3281d32d235f8b0.png and /dev/null differ diff --git a/ics/2022/06/10/091b6a68915b162a419a8eff6bcbdc8a.png b/ics/2022/06/10/091b6a68915b162a419a8eff6bcbdc8a.png deleted file mode 100644 index 1bd6f79..0000000 Binary files a/ics/2022/06/10/091b6a68915b162a419a8eff6bcbdc8a.png and /dev/null differ diff --git a/ics/2022/06/10/11f9cf02d4a47cd3a77ec280218c2642.png b/ics/2022/06/10/11f9cf02d4a47cd3a77ec280218c2642.png deleted file mode 100644 index 1bd6f79..0000000 Binary files a/ics/2022/06/10/11f9cf02d4a47cd3a77ec280218c2642.png and /dev/null differ diff --git a/ics/2022/06/10/19425570873babb1c02b26832837b0b9.png b/ics/2022/06/10/19425570873babb1c02b26832837b0b9.png deleted file mode 100644 index 66371c2..0000000 Binary files a/ics/2022/06/10/19425570873babb1c02b26832837b0b9.png and /dev/null differ diff --git a/ics/2022/06/10/2827f30b218ad9849452b76dde5eb927.png b/ics/2022/06/10/2827f30b218ad9849452b76dde5eb927.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/10/2827f30b218ad9849452b76dde5eb927.png and /dev/null differ diff --git a/ics/2022/06/10/3399ed05d82c46fe13c030997c8a9998.png b/ics/2022/06/10/3399ed05d82c46fe13c030997c8a9998.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/10/3399ed05d82c46fe13c030997c8a9998.png and /dev/null differ diff --git a/ics/2022/06/10/33dab8cfa854902e7a86ae735dcd460a.png b/ics/2022/06/10/33dab8cfa854902e7a86ae735dcd460a.png deleted file mode 100644 index e724d91..0000000 Binary files a/ics/2022/06/10/33dab8cfa854902e7a86ae735dcd460a.png and /dev/null differ diff --git a/ics/2022/06/10/380150e250e04f9ee82933442f445a2e.png b/ics/2022/06/10/380150e250e04f9ee82933442f445a2e.png deleted file mode 100644 index 51bca65..0000000 Binary files a/ics/2022/06/10/380150e250e04f9ee82933442f445a2e.png and /dev/null differ diff --git a/ics/2022/06/10/38d381a72bd421553946c24a094f64d8.png b/ics/2022/06/10/38d381a72bd421553946c24a094f64d8.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/10/38d381a72bd421553946c24a094f64d8.png and /dev/null differ diff --git a/ics/2022/06/10/3bc5edaf9b5594ff7cc3fc931c3c4541.png b/ics/2022/06/10/3bc5edaf9b5594ff7cc3fc931c3c4541.png deleted file mode 100644 index 01486ef..0000000 Binary files a/ics/2022/06/10/3bc5edaf9b5594ff7cc3fc931c3c4541.png and /dev/null differ diff --git a/ics/2022/06/10/44577ba44ee038230e8215a1206c91db.png b/ics/2022/06/10/44577ba44ee038230e8215a1206c91db.png deleted file mode 100644 index 51d9d7f..0000000 Binary files a/ics/2022/06/10/44577ba44ee038230e8215a1206c91db.png and /dev/null differ diff --git a/ics/2022/06/10/4690371cbd76f4e5427e40d3e3620846.png b/ics/2022/06/10/4690371cbd76f4e5427e40d3e3620846.png deleted file mode 100644 index 1bd6f79..0000000 Binary files a/ics/2022/06/10/4690371cbd76f4e5427e40d3e3620846.png and /dev/null differ diff --git a/ics/2022/06/10/6756a0cc996fddfae711e2722abbda57.png b/ics/2022/06/10/6756a0cc996fddfae711e2722abbda57.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/10/6756a0cc996fddfae711e2722abbda57.png and /dev/null differ diff --git a/ics/2022/06/10/6f7b7109a0ecd90cee7f68a124a283c8.png b/ics/2022/06/10/6f7b7109a0ecd90cee7f68a124a283c8.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/10/6f7b7109a0ecd90cee7f68a124a283c8.png and /dev/null differ diff --git a/ics/2022/06/10/71696380e389b772c9d9cb2bed86c7a7.png b/ics/2022/06/10/71696380e389b772c9d9cb2bed86c7a7.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/10/71696380e389b772c9d9cb2bed86c7a7.png and /dev/null differ diff --git a/ics/2022/06/10/7ab14ba62ca3c212a2f6291c38bfe082.png b/ics/2022/06/10/7ab14ba62ca3c212a2f6291c38bfe082.png deleted file mode 100644 index 51d9d7f..0000000 Binary files a/ics/2022/06/10/7ab14ba62ca3c212a2f6291c38bfe082.png and /dev/null differ diff --git a/ics/2022/06/10/823bc5faa578a02df22c4f69815b5f3b.png b/ics/2022/06/10/823bc5faa578a02df22c4f69815b5f3b.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/10/823bc5faa578a02df22c4f69815b5f3b.png and /dev/null differ diff --git a/ics/2022/06/10/96ec9bd128fac583679115c4acc60e8d.png b/ics/2022/06/10/96ec9bd128fac583679115c4acc60e8d.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/10/96ec9bd128fac583679115c4acc60e8d.png and /dev/null differ diff --git a/ics/2022/06/10/9a421e71e45cfa09d8c5aea52ee3401b.png b/ics/2022/06/10/9a421e71e45cfa09d8c5aea52ee3401b.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/10/9a421e71e45cfa09d8c5aea52ee3401b.png and /dev/null differ diff --git a/ics/2022/06/10/a42506e7d5e4fc23466baa45c88d804f.png b/ics/2022/06/10/a42506e7d5e4fc23466baa45c88d804f.png deleted file mode 100644 index e724d91..0000000 Binary files a/ics/2022/06/10/a42506e7d5e4fc23466baa45c88d804f.png and /dev/null differ diff --git a/ics/2022/06/10/bb1dcf99c3469fe1a54fa08829407856.png b/ics/2022/06/10/bb1dcf99c3469fe1a54fa08829407856.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/10/bb1dcf99c3469fe1a54fa08829407856.png and /dev/null differ diff --git a/ics/2022/06/10/c378718107cb9a49d97f291d8a1ba3b4.png b/ics/2022/06/10/c378718107cb9a49d97f291d8a1ba3b4.png deleted file mode 100644 index e724d91..0000000 Binary files a/ics/2022/06/10/c378718107cb9a49d97f291d8a1ba3b4.png and /dev/null differ diff --git a/ics/2022/06/10/dc1f77dd2cd814c9226ddb2b89e2580e.png b/ics/2022/06/10/dc1f77dd2cd814c9226ddb2b89e2580e.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/10/dc1f77dd2cd814c9226ddb2b89e2580e.png and /dev/null differ diff --git a/ics/2022/06/10/ddf84c9ed1897521b18d7cc391207971.png b/ics/2022/06/10/ddf84c9ed1897521b18d7cc391207971.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/10/ddf84c9ed1897521b18d7cc391207971.png and /dev/null differ diff --git a/ics/2022/06/10/e58256a581b8e3729997b158a20f1719.png b/ics/2022/06/10/e58256a581b8e3729997b158a20f1719.png deleted file mode 100644 index 51bca65..0000000 Binary files a/ics/2022/06/10/e58256a581b8e3729997b158a20f1719.png and /dev/null differ diff --git a/ics/2022/06/10/eb92921a22bbdc629cbd4a8d5f76ac3d.png b/ics/2022/06/10/eb92921a22bbdc629cbd4a8d5f76ac3d.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/10/eb92921a22bbdc629cbd4a8d5f76ac3d.png and /dev/null differ diff --git a/ics/2022/06/10/ec99834a977a4a2e7d4ec98da48f5009.png b/ics/2022/06/10/ec99834a977a4a2e7d4ec98da48f5009.png deleted file mode 100644 index 51d9d7f..0000000 Binary files a/ics/2022/06/10/ec99834a977a4a2e7d4ec98da48f5009.png and /dev/null differ diff --git a/ics/2022/06/10/ed608330559497ff23a2883427f933d2.jpg b/ics/2022/06/10/ed608330559497ff23a2883427f933d2.jpg deleted file mode 100644 index 99781dd..0000000 Binary files a/ics/2022/06/10/ed608330559497ff23a2883427f933d2.jpg and /dev/null differ diff --git a/ics/2022/06/10/ef468afa11f9fa5400dc936e029c54d5.png b/ics/2022/06/10/ef468afa11f9fa5400dc936e029c54d5.png deleted file mode 100644 index 122a471..0000000 Binary files a/ics/2022/06/10/ef468afa11f9fa5400dc936e029c54d5.png and /dev/null differ diff --git a/ics/2022/06/10/fc6c2269787316affd8d80229db53fac.png b/ics/2022/06/10/fc6c2269787316affd8d80229db53fac.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/10/fc6c2269787316affd8d80229db53fac.png and /dev/null differ diff --git a/ics/2022/06/10/fdc7938f9e0a5476473bb7fadb33b4b7.png b/ics/2022/06/10/fdc7938f9e0a5476473bb7fadb33b4b7.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/10/fdc7938f9e0a5476473bb7fadb33b4b7.png and /dev/null differ diff --git a/ics/2022/06/11/023e8576d431c24971d02239455cf218.png b/ics/2022/06/11/023e8576d431c24971d02239455cf218.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/11/023e8576d431c24971d02239455cf218.png and /dev/null differ diff --git a/ics/2022/06/11/0577038679d712d8799b010ac7134db5.jpg b/ics/2022/06/11/0577038679d712d8799b010ac7134db5.jpg deleted file mode 100644 index 3353508..0000000 Binary files a/ics/2022/06/11/0577038679d712d8799b010ac7134db5.jpg and /dev/null differ diff --git a/ics/2022/06/11/05940f87b9570691ac127a3e99572bdb.jpg b/ics/2022/06/11/05940f87b9570691ac127a3e99572bdb.jpg deleted file mode 100644 index 14b35f0..0000000 Binary files a/ics/2022/06/11/05940f87b9570691ac127a3e99572bdb.jpg and /dev/null differ diff --git a/ics/2022/06/11/0b5fea3b10c2cd91297bc1f810b40dad.png b/ics/2022/06/11/0b5fea3b10c2cd91297bc1f810b40dad.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/0b5fea3b10c2cd91297bc1f810b40dad.png and /dev/null differ diff --git a/ics/2022/06/11/0bcac8c720e8b4ae1f0ab656f2e59d44.png b/ics/2022/06/11/0bcac8c720e8b4ae1f0ab656f2e59d44.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/0bcac8c720e8b4ae1f0ab656f2e59d44.png and /dev/null differ diff --git a/ics/2022/06/11/225ed1e1aa875b99e4eafcf9bd6a2f1a.png b/ics/2022/06/11/225ed1e1aa875b99e4eafcf9bd6a2f1a.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/225ed1e1aa875b99e4eafcf9bd6a2f1a.png and /dev/null differ diff --git a/ics/2022/06/11/40444a6919507101aea5bfbaa2df4ea6.png b/ics/2022/06/11/40444a6919507101aea5bfbaa2df4ea6.png deleted file mode 100644 index 51d9d7f..0000000 Binary files a/ics/2022/06/11/40444a6919507101aea5bfbaa2df4ea6.png and /dev/null differ diff --git a/ics/2022/06/11/56012a353e28a7f4b068f4fd8e5c14f6.png b/ics/2022/06/11/56012a353e28a7f4b068f4fd8e5c14f6.png deleted file mode 100644 index 3c2f7f5..0000000 Binary files a/ics/2022/06/11/56012a353e28a7f4b068f4fd8e5c14f6.png and /dev/null differ diff --git a/ics/2022/06/11/65e7967ba9d3de21517671a68560d404.png b/ics/2022/06/11/65e7967ba9d3de21517671a68560d404.png deleted file mode 100644 index 51bca65..0000000 Binary files a/ics/2022/06/11/65e7967ba9d3de21517671a68560d404.png and /dev/null differ diff --git a/ics/2022/06/11/6ab5f780031692eb67def3b7bd75fd94.png b/ics/2022/06/11/6ab5f780031692eb67def3b7bd75fd94.png deleted file mode 100644 index 819efb2..0000000 Binary files a/ics/2022/06/11/6ab5f780031692eb67def3b7bd75fd94.png and /dev/null differ diff --git a/ics/2022/06/11/6b5a13d08f3b23140d1fdb34c30b9f9f.png b/ics/2022/06/11/6b5a13d08f3b23140d1fdb34c30b9f9f.png deleted file mode 100644 index e724d91..0000000 Binary files a/ics/2022/06/11/6b5a13d08f3b23140d1fdb34c30b9f9f.png and /dev/null differ diff --git a/ics/2022/06/11/73da3741eefa0ad5855b767b87269f6c.png b/ics/2022/06/11/73da3741eefa0ad5855b767b87269f6c.png deleted file mode 100644 index 5a90338..0000000 Binary files a/ics/2022/06/11/73da3741eefa0ad5855b767b87269f6c.png and /dev/null differ diff --git a/ics/2022/06/11/75141fb12dba095b2fbe015d35015384.png b/ics/2022/06/11/75141fb12dba095b2fbe015d35015384.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/11/75141fb12dba095b2fbe015d35015384.png and /dev/null differ diff --git a/ics/2022/06/11/8baca05fd40c59a44009d59b51eb7401.png b/ics/2022/06/11/8baca05fd40c59a44009d59b51eb7401.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/8baca05fd40c59a44009d59b51eb7401.png and /dev/null differ diff --git a/ics/2022/06/11/8f508b039a9b75daee66f21394eb8159.png b/ics/2022/06/11/8f508b039a9b75daee66f21394eb8159.png deleted file mode 100644 index 01486ef..0000000 Binary files a/ics/2022/06/11/8f508b039a9b75daee66f21394eb8159.png and /dev/null differ diff --git a/ics/2022/06/11/92e6478816fb4acd4075fade3f9a4c8a.jpg b/ics/2022/06/11/92e6478816fb4acd4075fade3f9a4c8a.jpg deleted file mode 100644 index ff227f3..0000000 Binary files a/ics/2022/06/11/92e6478816fb4acd4075fade3f9a4c8a.jpg and /dev/null differ diff --git a/ics/2022/06/11/a6d60e0b48dcda659508803a409f8c16.png b/ics/2022/06/11/a6d60e0b48dcda659508803a409f8c16.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/11/a6d60e0b48dcda659508803a409f8c16.png and /dev/null differ diff --git a/ics/2022/06/11/ae8a4826ea4034a58db89cf2d1e49e9d.png b/ics/2022/06/11/ae8a4826ea4034a58db89cf2d1e49e9d.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/11/ae8a4826ea4034a58db89cf2d1e49e9d.png and /dev/null differ diff --git a/ics/2022/06/11/b5f130f228b0d38f95d1d9c5ef0e8426.png b/ics/2022/06/11/b5f130f228b0d38f95d1d9c5ef0e8426.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/11/b5f130f228b0d38f95d1d9c5ef0e8426.png and /dev/null differ diff --git a/ics/2022/06/11/b61a7acfccaedb52bece4f53a49e97ea.png b/ics/2022/06/11/b61a7acfccaedb52bece4f53a49e97ea.png deleted file mode 100644 index 51d9d7f..0000000 Binary files a/ics/2022/06/11/b61a7acfccaedb52bece4f53a49e97ea.png and /dev/null differ diff --git a/ics/2022/06/11/b90908e91d0cbeaa4b47c583af08a363.png b/ics/2022/06/11/b90908e91d0cbeaa4b47c583af08a363.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/b90908e91d0cbeaa4b47c583af08a363.png and /dev/null differ diff --git a/ics/2022/06/11/bcd93ea2c80d46092329c39023c6ebf8.png b/ics/2022/06/11/bcd93ea2c80d46092329c39023c6ebf8.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/11/bcd93ea2c80d46092329c39023c6ebf8.png and /dev/null differ diff --git a/ics/2022/06/11/c38d7b85602abe0f88a1b493873d4d52.png b/ics/2022/06/11/c38d7b85602abe0f88a1b493873d4d52.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/c38d7b85602abe0f88a1b493873d4d52.png and /dev/null differ diff --git a/ics/2022/06/11/cbee9cb91c22495119d970120b97656d.png b/ics/2022/06/11/cbee9cb91c22495119d970120b97656d.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/06/11/cbee9cb91c22495119d970120b97656d.png and /dev/null differ diff --git a/ics/2022/06/11/d6015ca95491f56b4f455c7add5ee1db.png b/ics/2022/06/11/d6015ca95491f56b4f455c7add5ee1db.png deleted file mode 100644 index 819efb2..0000000 Binary files a/ics/2022/06/11/d6015ca95491f56b4f455c7add5ee1db.png and /dev/null differ diff --git a/ics/2022/06/11/daf42b9b3786ba47bcfd27fe878172b9.png b/ics/2022/06/11/daf42b9b3786ba47bcfd27fe878172b9.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/11/daf42b9b3786ba47bcfd27fe878172b9.png and /dev/null differ diff --git a/ics/2022/06/11/eaf66fb0b4faf6e20ef386f86aaf694b.png b/ics/2022/06/11/eaf66fb0b4faf6e20ef386f86aaf694b.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/eaf66fb0b4faf6e20ef386f86aaf694b.png and /dev/null differ diff --git a/ics/2022/06/11/f520179dd70b6e91142bcee29fbef9bc.png b/ics/2022/06/11/f520179dd70b6e91142bcee29fbef9bc.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/06/11/f520179dd70b6e91142bcee29fbef9bc.png and /dev/null differ diff --git a/ics/2022/06/11/fcfcfdbcd6b0672995e996a0f928d53b.png b/ics/2022/06/11/fcfcfdbcd6b0672995e996a0f928d53b.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/fcfcfdbcd6b0672995e996a0f928d53b.png and /dev/null differ diff --git a/ics/2022/06/11/ffb8ba886ea42c458e15ad4625c12dcd.png b/ics/2022/06/11/ffb8ba886ea42c458e15ad4625c12dcd.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/11/ffb8ba886ea42c458e15ad4625c12dcd.png and /dev/null differ diff --git a/ics/2022/06/13/08ea48a1f5fa7f06659694627f9624dd.png b/ics/2022/06/13/08ea48a1f5fa7f06659694627f9624dd.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/13/08ea48a1f5fa7f06659694627f9624dd.png and /dev/null differ diff --git a/ics/2022/06/13/37b69d097fce5a334bdd69abf46db76a.png b/ics/2022/06/13/37b69d097fce5a334bdd69abf46db76a.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/06/13/37b69d097fce5a334bdd69abf46db76a.png and /dev/null differ diff --git a/ics/2022/06/13/7ef259d341e0e7fa101919a8b0f277ca.png b/ics/2022/06/13/7ef259d341e0e7fa101919a8b0f277ca.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/13/7ef259d341e0e7fa101919a8b0f277ca.png and /dev/null differ diff --git a/ics/2022/06/13/c198e5b2b9bba7266d5637187ebdd72d.png b/ics/2022/06/13/c198e5b2b9bba7266d5637187ebdd72d.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2022/06/13/c198e5b2b9bba7266d5637187ebdd72d.png and /dev/null differ diff --git a/ics/2022/06/18/05df9970d30a587900f786a1a1fd5b2b.png b/ics/2022/06/18/05df9970d30a587900f786a1a1fd5b2b.png deleted file mode 100644 index 24afd0a..0000000 Binary files a/ics/2022/06/18/05df9970d30a587900f786a1a1fd5b2b.png and /dev/null differ diff --git a/ics/2022/06/18/08a4760ecca32d6904e992da2c09aa5a.jpeg b/ics/2022/06/18/08a4760ecca32d6904e992da2c09aa5a.jpeg deleted file mode 100644 index 06a28e5..0000000 Binary files a/ics/2022/06/18/08a4760ecca32d6904e992da2c09aa5a.jpeg and /dev/null differ diff --git a/ics/2022/06/18/a7770939b02e5da54718248a4a1d0407.png b/ics/2022/06/18/a7770939b02e5da54718248a4a1d0407.png deleted file mode 100644 index 24afd0a..0000000 Binary files a/ics/2022/06/18/a7770939b02e5da54718248a4a1d0407.png and /dev/null differ diff --git a/ics/2022/06/18/b5b066563bf0fc93202daf268bc315c1.png b/ics/2022/06/18/b5b066563bf0fc93202daf268bc315c1.png deleted file mode 100644 index 189c7ed..0000000 Binary files a/ics/2022/06/18/b5b066563bf0fc93202daf268bc315c1.png and /dev/null differ diff --git a/ics/2022/06/19/0ebe0fcfd399a350b1135f221d79f454.png b/ics/2022/06/19/0ebe0fcfd399a350b1135f221d79f454.png deleted file mode 100644 index 189c7ed..0000000 Binary files a/ics/2022/06/19/0ebe0fcfd399a350b1135f221d79f454.png and /dev/null differ diff --git a/ics/2022/07/11/20643e473092d72e2d1aa7edffa1ac41.png b/ics/2022/07/11/20643e473092d72e2d1aa7edffa1ac41.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2022/07/11/20643e473092d72e2d1aa7edffa1ac41.png and /dev/null differ diff --git a/ics/2022/07/11/852249cfa8c9ce0280e02896dce7a556.png b/ics/2022/07/11/852249cfa8c9ce0280e02896dce7a556.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2022/07/11/852249cfa8c9ce0280e02896dce7a556.png and /dev/null differ diff --git a/ics/2022/07/13/117b090faf3a4615be00a84362ccd50e.png b/ics/2022/07/13/117b090faf3a4615be00a84362ccd50e.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2022/07/13/117b090faf3a4615be00a84362ccd50e.png and /dev/null differ diff --git a/ics/2022/07/13/12b193ba96a19e113b815699a2e9c397.jpg b/ics/2022/07/13/12b193ba96a19e113b815699a2e9c397.jpg deleted file mode 100644 index d6640f8..0000000 Binary files a/ics/2022/07/13/12b193ba96a19e113b815699a2e9c397.jpg and /dev/null differ diff --git a/ics/2022/07/13/af48b435adce1af5b863a0bd052dd586.jpg b/ics/2022/07/13/af48b435adce1af5b863a0bd052dd586.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2022/07/13/af48b435adce1af5b863a0bd052dd586.jpg and /dev/null differ diff --git a/ics/2022/07/13/d4b7d0c1beee71c3eec00992cd5ca14b.png b/ics/2022/07/13/d4b7d0c1beee71c3eec00992cd5ca14b.png deleted file mode 100644 index e724d91..0000000 Binary files a/ics/2022/07/13/d4b7d0c1beee71c3eec00992cd5ca14b.png and /dev/null differ diff --git a/ics/2022/07/13/d6ee8f3f6dacf16b3ac9af4bf48db0c5.png b/ics/2022/07/13/d6ee8f3f6dacf16b3ac9af4bf48db0c5.png deleted file mode 100644 index 51bca65..0000000 Binary files a/ics/2022/07/13/d6ee8f3f6dacf16b3ac9af4bf48db0c5.png and /dev/null differ diff --git a/ics/2022/07/17/0a3ffc078f6a4bdb4e1071e31e1ad2fa.jpg b/ics/2022/07/17/0a3ffc078f6a4bdb4e1071e31e1ad2fa.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2022/07/17/0a3ffc078f6a4bdb4e1071e31e1ad2fa.jpg and /dev/null differ diff --git a/ics/2022/07/17/4067443a6c30c4514e7c32f252e5011c.jpg b/ics/2022/07/17/4067443a6c30c4514e7c32f252e5011c.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2022/07/17/4067443a6c30c4514e7c32f252e5011c.jpg and /dev/null differ diff --git a/ics/2022/07/17/498100ef1edbe2e1b149ee0c5bff5948.jpg b/ics/2022/07/17/498100ef1edbe2e1b149ee0c5bff5948.jpg deleted file mode 100644 index d6640f8..0000000 Binary files a/ics/2022/07/17/498100ef1edbe2e1b149ee0c5bff5948.jpg and /dev/null differ diff --git a/ics/2022/07/17/80939cbe720422851fd275bc220715b3.jpg b/ics/2022/07/17/80939cbe720422851fd275bc220715b3.jpg deleted file mode 100644 index d6640f8..0000000 Binary files a/ics/2022/07/17/80939cbe720422851fd275bc220715b3.jpg and /dev/null differ diff --git a/ics/2022/07/17/8985f4d6aa53c4aa45b592fdcbfc0870.jpg b/ics/2022/07/17/8985f4d6aa53c4aa45b592fdcbfc0870.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2022/07/17/8985f4d6aa53c4aa45b592fdcbfc0870.jpg and /dev/null differ diff --git a/ics/2022/07/17/8f900fac5c22111d37c375ef65e2bcc8.jpg b/ics/2022/07/17/8f900fac5c22111d37c375ef65e2bcc8.jpg deleted file mode 100644 index d6640f8..0000000 Binary files a/ics/2022/07/17/8f900fac5c22111d37c375ef65e2bcc8.jpg and /dev/null differ diff --git a/ics/2022/07/20/02c145678ca29af4352c1086a8928dd5.jpg b/ics/2022/07/20/02c145678ca29af4352c1086a8928dd5.jpg deleted file mode 100644 index d6640f8..0000000 Binary files a/ics/2022/07/20/02c145678ca29af4352c1086a8928dd5.jpg and /dev/null differ diff --git a/ics/2022/07/20/171c62ca5688763d298cc02cf68763bd.jpg b/ics/2022/07/20/171c62ca5688763d298cc02cf68763bd.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2022/07/20/171c62ca5688763d298cc02cf68763bd.jpg and /dev/null differ diff --git a/ics/2022/07/20/321ac89faa53c89484dac071c48d4a19.png b/ics/2022/07/20/321ac89faa53c89484dac071c48d4a19.png deleted file mode 100644 index 873d1ee..0000000 Binary files a/ics/2022/07/20/321ac89faa53c89484dac071c48d4a19.png and /dev/null differ diff --git a/ics/2022/07/20/8a56a52d0b030ae7c1b70725506f8f30.png b/ics/2022/07/20/8a56a52d0b030ae7c1b70725506f8f30.png deleted file mode 100644 index eab7f43..0000000 Binary files a/ics/2022/07/20/8a56a52d0b030ae7c1b70725506f8f30.png and /dev/null differ diff --git a/ics/2022/08/02/5b25cac2870db4f617463137979c1d2a.png b/ics/2022/08/02/5b25cac2870db4f617463137979c1d2a.png deleted file mode 100644 index 189c7ed..0000000 Binary files a/ics/2022/08/02/5b25cac2870db4f617463137979c1d2a.png and /dev/null differ diff --git a/ics/2022/08/31/13e391e9c7394ae5af1694076303bfd0.png b/ics/2022/08/31/13e391e9c7394ae5af1694076303bfd0.png deleted file mode 100644 index d0e0c86..0000000 Binary files a/ics/2022/08/31/13e391e9c7394ae5af1694076303bfd0.png and /dev/null differ diff --git a/ics/2022/08/31/18217e1e144547dbd04c77b955f73e61.png b/ics/2022/08/31/18217e1e144547dbd04c77b955f73e61.png deleted file mode 100644 index 8e53957..0000000 Binary files a/ics/2022/08/31/18217e1e144547dbd04c77b955f73e61.png and /dev/null differ diff --git a/ics/2022/08/31/3aa434a9180c5f40aa8c1267031b86f5.png b/ics/2022/08/31/3aa434a9180c5f40aa8c1267031b86f5.png deleted file mode 100644 index c1c7411..0000000 Binary files a/ics/2022/08/31/3aa434a9180c5f40aa8c1267031b86f5.png and /dev/null differ diff --git a/ics/2022/08/31/482992f7859adaa2e2c385966895c939.png b/ics/2022/08/31/482992f7859adaa2e2c385966895c939.png deleted file mode 100644 index 23e7ae3..0000000 Binary files a/ics/2022/08/31/482992f7859adaa2e2c385966895c939.png and /dev/null differ diff --git a/ics/2022/08/31/691d806e4be61768ef2d8b163cd5f2e0.png b/ics/2022/08/31/691d806e4be61768ef2d8b163cd5f2e0.png deleted file mode 100644 index ad68749..0000000 Binary files a/ics/2022/08/31/691d806e4be61768ef2d8b163cd5f2e0.png and /dev/null differ diff --git a/ics/2022/08/31/8154b812838f8c424e4854c47b4c5d81.png b/ics/2022/08/31/8154b812838f8c424e4854c47b4c5d81.png deleted file mode 100644 index 64e92e6..0000000 Binary files a/ics/2022/08/31/8154b812838f8c424e4854c47b4c5d81.png and /dev/null differ diff --git a/ics/2022/08/31/82a921e7f9ca3bd080cf02be2d600e73.png b/ics/2022/08/31/82a921e7f9ca3bd080cf02be2d600e73.png deleted file mode 100644 index 23e7ae3..0000000 Binary files a/ics/2022/08/31/82a921e7f9ca3bd080cf02be2d600e73.png and /dev/null differ diff --git a/ics/2022/08/31/965babf957ff15e2362973f89c6ecc58.png b/ics/2022/08/31/965babf957ff15e2362973f89c6ecc58.png deleted file mode 100644 index d0e0c86..0000000 Binary files a/ics/2022/08/31/965babf957ff15e2362973f89c6ecc58.png and /dev/null differ diff --git a/ics/2022/08/31/a1a5a51a222010ee66290d7f7ce81fba.png b/ics/2022/08/31/a1a5a51a222010ee66290d7f7ce81fba.png deleted file mode 100644 index 189c7ed..0000000 Binary files a/ics/2022/08/31/a1a5a51a222010ee66290d7f7ce81fba.png and /dev/null differ diff --git a/ics/2022/08/31/d5c3c78edbf99dca165ee1b1d7ae8dba.png b/ics/2022/08/31/d5c3c78edbf99dca165ee1b1d7ae8dba.png deleted file mode 100644 index 0be413f..0000000 Binary files a/ics/2022/08/31/d5c3c78edbf99dca165ee1b1d7ae8dba.png and /dev/null differ diff --git a/ics/2022/08/31/ff3ad384b7a51748a84a007b4fb9a4bf.png b/ics/2022/08/31/ff3ad384b7a51748a84a007b4fb9a4bf.png deleted file mode 100644 index d48087d..0000000 Binary files a/ics/2022/08/31/ff3ad384b7a51748a84a007b4fb9a4bf.png and /dev/null differ diff --git a/ics/2022/09/07/0471fd2f13fdd6c9811d378cc7eef0b6.png b/ics/2022/09/07/0471fd2f13fdd6c9811d378cc7eef0b6.png deleted file mode 100644 index 1bd6f79..0000000 Binary files a/ics/2022/09/07/0471fd2f13fdd6c9811d378cc7eef0b6.png and /dev/null differ diff --git a/ics/2022/09/07/3563d11b338fc9c060303de97ffdbe64.png b/ics/2022/09/07/3563d11b338fc9c060303de97ffdbe64.png deleted file mode 100644 index 189c7ed..0000000 Binary files a/ics/2022/09/07/3563d11b338fc9c060303de97ffdbe64.png and /dev/null differ diff --git a/ics/2022/09/07/3d8eee9ee6e07c3a809fc7978918df9e.png b/ics/2022/09/07/3d8eee9ee6e07c3a809fc7978918df9e.png deleted file mode 100644 index 1bd6f79..0000000 Binary files a/ics/2022/09/07/3d8eee9ee6e07c3a809fc7978918df9e.png and /dev/null differ diff --git a/ics/2022/09/07/bcc2bae00f0dde1726d0f1a1f0d288ff.png b/ics/2022/09/07/bcc2bae00f0dde1726d0f1a1f0d288ff.png deleted file mode 100644 index 189c7ed..0000000 Binary files a/ics/2022/09/07/bcc2bae00f0dde1726d0f1a1f0d288ff.png and /dev/null differ diff --git a/ics/2022/12/29/6fc95604f0c88b65667e8b6fcff80ba6.png b/ics/2022/12/29/6fc95604f0c88b65667e8b6fcff80ba6.png deleted file mode 100644 index 117298d..0000000 Binary files a/ics/2022/12/29/6fc95604f0c88b65667e8b6fcff80ba6.png and /dev/null differ diff --git a/ics/2022/12/29/d96225a18becc5b7be42c69a1f52c862.html b/ics/2022/12/29/d96225a18becc5b7be42c69a1f52c862.html deleted file mode 100644 index c5cdf33..0000000 Binary files a/ics/2022/12/29/d96225a18becc5b7be42c69a1f52c862.html and /dev/null differ diff --git a/ics/2022/12/29/f7f5707abb96ebb42fb573a4eddc852d.png b/ics/2022/12/29/f7f5707abb96ebb42fb573a4eddc852d.png deleted file mode 100644 index 117298d..0000000 Binary files a/ics/2022/12/29/f7f5707abb96ebb42fb573a4eddc852d.png and /dev/null differ diff --git a/ics/2023/04/04/11448cb64fbc470f62b2d035a8d0a563.png b/ics/2023/04/04/11448cb64fbc470f62b2d035a8d0a563.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2023/04/04/11448cb64fbc470f62b2d035a8d0a563.png and /dev/null differ diff --git a/ics/2023/04/04/26d960287d136ac46fa49174f5ef2a99.png b/ics/2023/04/04/26d960287d136ac46fa49174f5ef2a99.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2023/04/04/26d960287d136ac46fa49174f5ef2a99.png and /dev/null differ diff --git a/ics/2023/04/04/33b557ddf34dd6c48c083ad21754b05b.jpg b/ics/2023/04/04/33b557ddf34dd6c48c083ad21754b05b.jpg deleted file mode 100644 index d6640f8..0000000 Binary files a/ics/2023/04/04/33b557ddf34dd6c48c083ad21754b05b.jpg and /dev/null differ diff --git a/ics/2023/04/04/4beba09e4380e4715f1f25932d2ed812.png b/ics/2023/04/04/4beba09e4380e4715f1f25932d2ed812.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2023/04/04/4beba09e4380e4715f1f25932d2ed812.png and /dev/null differ diff --git a/ics/2023/04/04/5c3def55ae54edf2ba389b160593d6f9.png b/ics/2023/04/04/5c3def55ae54edf2ba389b160593d6f9.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2023/04/04/5c3def55ae54edf2ba389b160593d6f9.png and /dev/null differ diff --git a/ics/2023/04/04/71c31ce8abdb2b5b5213517aaa6e1cb1.png b/ics/2023/04/04/71c31ce8abdb2b5b5213517aaa6e1cb1.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2023/04/04/71c31ce8abdb2b5b5213517aaa6e1cb1.png and /dev/null differ diff --git a/ics/2023/04/04/793b81bc9a4c9ec5abc563cf5c4ae79b.jpg b/ics/2023/04/04/793b81bc9a4c9ec5abc563cf5c4ae79b.jpg deleted file mode 100644 index d6640f8..0000000 Binary files a/ics/2023/04/04/793b81bc9a4c9ec5abc563cf5c4ae79b.jpg and /dev/null differ diff --git a/ics/2023/04/04/9b306623b812c8b3f12ccae5925386c7.jpg b/ics/2023/04/04/9b306623b812c8b3f12ccae5925386c7.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/04/9b306623b812c8b3f12ccae5925386c7.jpg and /dev/null differ diff --git a/ics/2023/04/04/bff440d821d9b89c9e73f31522d71468.png b/ics/2023/04/04/bff440d821d9b89c9e73f31522d71468.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2023/04/04/bff440d821d9b89c9e73f31522d71468.png and /dev/null differ diff --git a/ics/2023/04/04/caad2ce111fc7ea0b6a208e3d6cd0137.png b/ics/2023/04/04/caad2ce111fc7ea0b6a208e3d6cd0137.png deleted file mode 100644 index b47d612..0000000 Binary files a/ics/2023/04/04/caad2ce111fc7ea0b6a208e3d6cd0137.png and /dev/null differ diff --git a/ics/2023/04/04/cc846cf5817e338d9469604a73b06f1d.png b/ics/2023/04/04/cc846cf5817e338d9469604a73b06f1d.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2023/04/04/cc846cf5817e338d9469604a73b06f1d.png and /dev/null differ diff --git a/ics/2023/04/04/ea70d7c6cbcdf95fda00048e453bc691.png b/ics/2023/04/04/ea70d7c6cbcdf95fda00048e453bc691.png deleted file mode 100644 index 118c043..0000000 Binary files a/ics/2023/04/04/ea70d7c6cbcdf95fda00048e453bc691.png and /dev/null differ diff --git a/ics/2023/04/28/315880926808d623dc9688a4bf859c25.jpg b/ics/2023/04/28/315880926808d623dc9688a4bf859c25.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/315880926808d623dc9688a4bf859c25.jpg and /dev/null differ diff --git a/ics/2023/04/28/43ed09f97c852311cd3825067dd87c7e.jpg b/ics/2023/04/28/43ed09f97c852311cd3825067dd87c7e.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/43ed09f97c852311cd3825067dd87c7e.jpg and /dev/null differ diff --git a/ics/2023/04/28/89125938b04636972213b1c4c9ec7234.jpg b/ics/2023/04/28/89125938b04636972213b1c4c9ec7234.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/89125938b04636972213b1c4c9ec7234.jpg and /dev/null differ diff --git a/ics/2023/04/28/8d082907decfeaba5ae8a292a214493d.jpg b/ics/2023/04/28/8d082907decfeaba5ae8a292a214493d.jpg deleted file mode 100644 index 47af363..0000000 Binary files a/ics/2023/04/28/8d082907decfeaba5ae8a292a214493d.jpg and /dev/null differ diff --git a/ics/2023/04/28/9e92208fc4e3eb2d349f6f9bbbe1440c.jpg b/ics/2023/04/28/9e92208fc4e3eb2d349f6f9bbbe1440c.jpg deleted file mode 100644 index 47af363..0000000 Binary files a/ics/2023/04/28/9e92208fc4e3eb2d349f6f9bbbe1440c.jpg and /dev/null differ diff --git a/ics/2023/04/28/afe652ef66ce6dbdb81b95b37b999640.jpg b/ics/2023/04/28/afe652ef66ce6dbdb81b95b37b999640.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/afe652ef66ce6dbdb81b95b37b999640.jpg and /dev/null differ diff --git a/ics/2023/04/28/b6d678268d3a13ec2de4089ae8e386f4.jpg b/ics/2023/04/28/b6d678268d3a13ec2de4089ae8e386f4.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/b6d678268d3a13ec2de4089ae8e386f4.jpg and /dev/null differ diff --git a/ics/2023/04/28/cd630485b6b14d377b5ca88ded861d98.jpg b/ics/2023/04/28/cd630485b6b14d377b5ca88ded861d98.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/cd630485b6b14d377b5ca88ded861d98.jpg and /dev/null differ diff --git a/ics/2023/04/28/ce08b560ce8416c4764274c49829d2e0.jpg b/ics/2023/04/28/ce08b560ce8416c4764274c49829d2e0.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/ce08b560ce8416c4764274c49829d2e0.jpg and /dev/null differ diff --git a/ics/2023/04/28/d1357a740260739645807ec5ac79b8bf.jpg b/ics/2023/04/28/d1357a740260739645807ec5ac79b8bf.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/d1357a740260739645807ec5ac79b8bf.jpg and /dev/null differ diff --git a/ics/2023/04/28/dc862a41fa90ef747d3c768731eadd23.png b/ics/2023/04/28/dc862a41fa90ef747d3c768731eadd23.png deleted file mode 100644 index 3c2f7f5..0000000 Binary files a/ics/2023/04/28/dc862a41fa90ef747d3c768731eadd23.png and /dev/null differ diff --git a/ics/2023/04/28/eb0feaef59dc3c0c782da80979a7b2d3.png b/ics/2023/04/28/eb0feaef59dc3c0c782da80979a7b2d3.png deleted file mode 100644 index 5b5d97a..0000000 Binary files a/ics/2023/04/28/eb0feaef59dc3c0c782da80979a7b2d3.png and /dev/null differ diff --git a/ics/2023/04/28/eb79e12914aa8f816e2fd49f74ef78ca.png b/ics/2023/04/28/eb79e12914aa8f816e2fd49f74ef78ca.png deleted file mode 100644 index 1bd6f79..0000000 Binary files a/ics/2023/04/28/eb79e12914aa8f816e2fd49f74ef78ca.png and /dev/null differ diff --git a/ics/2023/04/28/f089620ca274bd3a4202091500a428b1.jpg b/ics/2023/04/28/f089620ca274bd3a4202091500a428b1.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/28/f089620ca274bd3a4202091500a428b1.jpg and /dev/null differ diff --git a/ics/2023/04/29/03903dda18739240d1ce6a639c73d5b4.png b/ics/2023/04/29/03903dda18739240d1ce6a639c73d5b4.png deleted file mode 100644 index 4a03443..0000000 Binary files a/ics/2023/04/29/03903dda18739240d1ce6a639c73d5b4.png and /dev/null differ diff --git a/ics/2023/04/29/05afee9bc91c115645bfa26af5977748.jpg b/ics/2023/04/29/05afee9bc91c115645bfa26af5977748.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/29/05afee9bc91c115645bfa26af5977748.jpg and /dev/null differ diff --git a/ics/2023/04/29/08699c72eaa3193a699fceaa8ed3acb8.jpg b/ics/2023/04/29/08699c72eaa3193a699fceaa8ed3acb8.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/29/08699c72eaa3193a699fceaa8ed3acb8.jpg and /dev/null differ diff --git a/ics/2023/04/29/08b59e747b7c741c0ec5d5d309c1995d.png b/ics/2023/04/29/08b59e747b7c741c0ec5d5d309c1995d.png deleted file mode 100644 index c15c2e7..0000000 Binary files a/ics/2023/04/29/08b59e747b7c741c0ec5d5d309c1995d.png and /dev/null differ diff --git a/ics/2023/04/29/0d0baf0174e3f83e2f7062a872c3a473.png b/ics/2023/04/29/0d0baf0174e3f83e2f7062a872c3a473.png deleted file mode 100644 index 14a7910..0000000 Binary files a/ics/2023/04/29/0d0baf0174e3f83e2f7062a872c3a473.png and /dev/null differ diff --git a/ics/2023/04/29/0ea075033d9c8cec9cda12850b6464ed.png b/ics/2023/04/29/0ea075033d9c8cec9cda12850b6464ed.png deleted file mode 100644 index 6a88885..0000000 Binary files a/ics/2023/04/29/0ea075033d9c8cec9cda12850b6464ed.png and /dev/null differ diff --git a/ics/2023/04/29/1277ed2f0bf6d610ac558c0cd20d535f.png b/ics/2023/04/29/1277ed2f0bf6d610ac558c0cd20d535f.png deleted file mode 100644 index 4a03443..0000000 Binary files a/ics/2023/04/29/1277ed2f0bf6d610ac558c0cd20d535f.png and /dev/null differ diff --git a/ics/2023/04/29/145704f3bb7eb7d140e60368a97adae7.png b/ics/2023/04/29/145704f3bb7eb7d140e60368a97adae7.png deleted file mode 100644 index 74878c3..0000000 Binary files a/ics/2023/04/29/145704f3bb7eb7d140e60368a97adae7.png and /dev/null differ diff --git a/ics/2023/04/29/17e5caae59cba88d59dd9b1921ed4b04.png b/ics/2023/04/29/17e5caae59cba88d59dd9b1921ed4b04.png deleted file mode 100644 index 74878c3..0000000 Binary files a/ics/2023/04/29/17e5caae59cba88d59dd9b1921ed4b04.png and /dev/null differ diff --git a/ics/2023/04/29/1ddfbf3e18ae48de3eae8b35eb83899a.png b/ics/2023/04/29/1ddfbf3e18ae48de3eae8b35eb83899a.png deleted file mode 100644 index c15c2e7..0000000 Binary files a/ics/2023/04/29/1ddfbf3e18ae48de3eae8b35eb83899a.png and /dev/null differ diff --git a/ics/2023/04/29/1eec620dd431b83820fea3ced32fa2cd.png b/ics/2023/04/29/1eec620dd431b83820fea3ced32fa2cd.png deleted file mode 100644 index c6ca6cc..0000000 Binary files a/ics/2023/04/29/1eec620dd431b83820fea3ced32fa2cd.png and /dev/null differ diff --git a/ics/2023/04/29/1fcd17785d7f949d632770eb3f23925e.png b/ics/2023/04/29/1fcd17785d7f949d632770eb3f23925e.png deleted file mode 100644 index 82bd959..0000000 Binary files a/ics/2023/04/29/1fcd17785d7f949d632770eb3f23925e.png and /dev/null differ diff --git a/ics/2023/04/29/248038ea2196a347b969e57a211a1938.png b/ics/2023/04/29/248038ea2196a347b969e57a211a1938.png deleted file mode 100644 index 7359722..0000000 Binary files a/ics/2023/04/29/248038ea2196a347b969e57a211a1938.png and /dev/null differ diff --git a/ics/2023/04/29/2592098d782bbb4550d42ef1d518164c.png b/ics/2023/04/29/2592098d782bbb4550d42ef1d518164c.png deleted file mode 100644 index 326b506..0000000 Binary files a/ics/2023/04/29/2592098d782bbb4550d42ef1d518164c.png and /dev/null differ diff --git a/ics/2023/04/29/2a552ae3575bba5949eea10bdce60594.png b/ics/2023/04/29/2a552ae3575bba5949eea10bdce60594.png deleted file mode 100644 index c6ca6cc..0000000 Binary files a/ics/2023/04/29/2a552ae3575bba5949eea10bdce60594.png and /dev/null differ diff --git a/ics/2023/04/29/2ae7f3f902538397568fa28fbef9ed50.png b/ics/2023/04/29/2ae7f3f902538397568fa28fbef9ed50.png deleted file mode 100644 index 3837a01..0000000 Binary files a/ics/2023/04/29/2ae7f3f902538397568fa28fbef9ed50.png and /dev/null differ diff --git a/ics/2023/04/29/2af794d525e5bb375fc330d6c674a26b.png b/ics/2023/04/29/2af794d525e5bb375fc330d6c674a26b.png deleted file mode 100644 index 1fbfa26..0000000 Binary files a/ics/2023/04/29/2af794d525e5bb375fc330d6c674a26b.png and /dev/null differ diff --git a/ics/2023/04/29/3198454155ec31073906c3f400cf24e3.png b/ics/2023/04/29/3198454155ec31073906c3f400cf24e3.png deleted file mode 100644 index 87ff59b..0000000 Binary files a/ics/2023/04/29/3198454155ec31073906c3f400cf24e3.png and /dev/null differ diff --git a/ics/2023/04/29/33325d991f7dc30f4fc361e90594bb65.png b/ics/2023/04/29/33325d991f7dc30f4fc361e90594bb65.png deleted file mode 100644 index 1fe86d3..0000000 Binary files a/ics/2023/04/29/33325d991f7dc30f4fc361e90594bb65.png and /dev/null differ diff --git a/ics/2023/04/29/359fe2915c7c606f6e9212d931e57687.png b/ics/2023/04/29/359fe2915c7c606f6e9212d931e57687.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2023/04/29/359fe2915c7c606f6e9212d931e57687.png and /dev/null differ diff --git a/ics/2023/04/29/3638b1e8e3f6b785e4f44850adb68a94.png b/ics/2023/04/29/3638b1e8e3f6b785e4f44850adb68a94.png deleted file mode 100644 index 326b506..0000000 Binary files a/ics/2023/04/29/3638b1e8e3f6b785e4f44850adb68a94.png and /dev/null differ diff --git a/ics/2023/04/29/3e178a0c1c2ab8e6549fcf4e3f9bcc69.png b/ics/2023/04/29/3e178a0c1c2ab8e6549fcf4e3f9bcc69.png deleted file mode 100644 index 3d7e86a..0000000 Binary files a/ics/2023/04/29/3e178a0c1c2ab8e6549fcf4e3f9bcc69.png and /dev/null differ diff --git a/ics/2023/04/29/3fdfe55a452317843537e66bbad2da22.png b/ics/2023/04/29/3fdfe55a452317843537e66bbad2da22.png deleted file mode 100644 index 3130a8e..0000000 Binary files a/ics/2023/04/29/3fdfe55a452317843537e66bbad2da22.png and /dev/null differ diff --git a/ics/2023/04/29/45967ef8e60cb2babf38231b9572b614.png b/ics/2023/04/29/45967ef8e60cb2babf38231b9572b614.png deleted file mode 100644 index 7359722..0000000 Binary files a/ics/2023/04/29/45967ef8e60cb2babf38231b9572b614.png and /dev/null differ diff --git a/ics/2023/04/29/4623c18e40c1f093d5937ffaeb0b63a2.png b/ics/2023/04/29/4623c18e40c1f093d5937ffaeb0b63a2.png deleted file mode 100644 index c950c9d..0000000 Binary files a/ics/2023/04/29/4623c18e40c1f093d5937ffaeb0b63a2.png and /dev/null differ diff --git a/ics/2023/04/29/4a6580c0d51b6eec6492c880db24764a.png b/ics/2023/04/29/4a6580c0d51b6eec6492c880db24764a.png deleted file mode 100644 index 3837a01..0000000 Binary files a/ics/2023/04/29/4a6580c0d51b6eec6492c880db24764a.png and /dev/null differ diff --git a/ics/2023/04/29/4e2a3956c21501adf94ddc87afcb3c11.jpg b/ics/2023/04/29/4e2a3956c21501adf94ddc87afcb3c11.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/29/4e2a3956c21501adf94ddc87afcb3c11.jpg and /dev/null differ diff --git a/ics/2023/04/29/50eb44ca6f7dd364dffdd064c3ffb9eb.png b/ics/2023/04/29/50eb44ca6f7dd364dffdd064c3ffb9eb.png deleted file mode 100644 index 1fe86d3..0000000 Binary files a/ics/2023/04/29/50eb44ca6f7dd364dffdd064c3ffb9eb.png and /dev/null differ diff --git a/ics/2023/04/29/58fffb110b694ad77c380ea51e8dd6c1.png b/ics/2023/04/29/58fffb110b694ad77c380ea51e8dd6c1.png deleted file mode 100644 index 7dc3d16..0000000 Binary files a/ics/2023/04/29/58fffb110b694ad77c380ea51e8dd6c1.png and /dev/null differ diff --git a/ics/2023/04/29/5a10d9bb96034f55fee33224f123da34.jpg b/ics/2023/04/29/5a10d9bb96034f55fee33224f123da34.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/29/5a10d9bb96034f55fee33224f123da34.jpg and /dev/null differ diff --git a/ics/2023/04/29/5a9bc4e719e349aac74d425bdc461c85.jpg b/ics/2023/04/29/5a9bc4e719e349aac74d425bdc461c85.jpg deleted file mode 100644 index 47af363..0000000 Binary files a/ics/2023/04/29/5a9bc4e719e349aac74d425bdc461c85.jpg and /dev/null differ diff --git a/ics/2023/04/29/620bb8138e3f957dd27ce6bbfa40bbae.png b/ics/2023/04/29/620bb8138e3f957dd27ce6bbfa40bbae.png deleted file mode 100644 index 87ff59b..0000000 Binary files a/ics/2023/04/29/620bb8138e3f957dd27ce6bbfa40bbae.png and /dev/null differ diff --git a/ics/2023/04/29/66d3c68a3cf46538d849401301aeb043.jpg b/ics/2023/04/29/66d3c68a3cf46538d849401301aeb043.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/29/66d3c68a3cf46538d849401301aeb043.jpg and /dev/null differ diff --git a/ics/2023/04/29/6d86137aef664a518d05944d26051dc2.png b/ics/2023/04/29/6d86137aef664a518d05944d26051dc2.png deleted file mode 100644 index 12d5e4d..0000000 Binary files a/ics/2023/04/29/6d86137aef664a518d05944d26051dc2.png and /dev/null differ diff --git a/ics/2023/04/29/7039b32316c17df53f36d89332481556.png b/ics/2023/04/29/7039b32316c17df53f36d89332481556.png deleted file mode 100644 index 4a03443..0000000 Binary files a/ics/2023/04/29/7039b32316c17df53f36d89332481556.png and /dev/null differ diff --git a/ics/2023/04/29/71818ef91894daed432a30d902039b4c.png b/ics/2023/04/29/71818ef91894daed432a30d902039b4c.png deleted file mode 100644 index 7359722..0000000 Binary files a/ics/2023/04/29/71818ef91894daed432a30d902039b4c.png and /dev/null differ diff --git a/ics/2023/04/29/78b4f6c1c7c0202900a246f933d31e07.png b/ics/2023/04/29/78b4f6c1c7c0202900a246f933d31e07.png deleted file mode 100644 index 75ffa50..0000000 Binary files a/ics/2023/04/29/78b4f6c1c7c0202900a246f933d31e07.png and /dev/null differ diff --git a/ics/2023/04/29/7c0abca12a2d1915dc16ceb2305d05cc.png b/ics/2023/04/29/7c0abca12a2d1915dc16ceb2305d05cc.png deleted file mode 100644 index 12d5e4d..0000000 Binary files a/ics/2023/04/29/7c0abca12a2d1915dc16ceb2305d05cc.png and /dev/null differ diff --git a/ics/2023/04/29/7c80e84b0f6359942192248aa5bc6442.png b/ics/2023/04/29/7c80e84b0f6359942192248aa5bc6442.png deleted file mode 100644 index 7359722..0000000 Binary files a/ics/2023/04/29/7c80e84b0f6359942192248aa5bc6442.png and /dev/null differ diff --git a/ics/2023/04/29/80f042e5a1402c5ea4ad6e53f4e55fd4.png b/ics/2023/04/29/80f042e5a1402c5ea4ad6e53f4e55fd4.png deleted file mode 100644 index 3d7e86a..0000000 Binary files a/ics/2023/04/29/80f042e5a1402c5ea4ad6e53f4e55fd4.png and /dev/null differ diff --git a/ics/2023/04/29/842e20d06a6ae8d8b042905b347ce4ed.png b/ics/2023/04/29/842e20d06a6ae8d8b042905b347ce4ed.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2023/04/29/842e20d06a6ae8d8b042905b347ce4ed.png and /dev/null differ diff --git a/ics/2023/04/29/86bde6d74644936c37110b21e771ca59.png b/ics/2023/04/29/86bde6d74644936c37110b21e771ca59.png deleted file mode 100644 index 12d5e4d..0000000 Binary files a/ics/2023/04/29/86bde6d74644936c37110b21e771ca59.png and /dev/null differ diff --git a/ics/2023/04/29/891293cddecfdf9ba217ea8a74f962bd.png b/ics/2023/04/29/891293cddecfdf9ba217ea8a74f962bd.png deleted file mode 100644 index d5c70a4..0000000 Binary files a/ics/2023/04/29/891293cddecfdf9ba217ea8a74f962bd.png and /dev/null differ diff --git a/ics/2023/04/29/8b2dae18fbe0b2a4a52dfa2ba75c90d5.png b/ics/2023/04/29/8b2dae18fbe0b2a4a52dfa2ba75c90d5.png deleted file mode 100644 index c950c9d..0000000 Binary files a/ics/2023/04/29/8b2dae18fbe0b2a4a52dfa2ba75c90d5.png and /dev/null differ diff --git a/ics/2023/04/29/8bc3b7c8063cd4554e8563360150484f.png b/ics/2023/04/29/8bc3b7c8063cd4554e8563360150484f.png deleted file mode 100644 index 82bd959..0000000 Binary files a/ics/2023/04/29/8bc3b7c8063cd4554e8563360150484f.png and /dev/null differ diff --git a/ics/2023/04/29/9066ad25153ce2b15f37cd5cdb256c80.png b/ics/2023/04/29/9066ad25153ce2b15f37cd5cdb256c80.png deleted file mode 100644 index 6a88885..0000000 Binary files a/ics/2023/04/29/9066ad25153ce2b15f37cd5cdb256c80.png and /dev/null differ diff --git a/ics/2023/04/29/910ffda25cf408fc9fa60bf105ee3e2e.png b/ics/2023/04/29/910ffda25cf408fc9fa60bf105ee3e2e.png deleted file mode 100644 index 91bfefd..0000000 Binary files a/ics/2023/04/29/910ffda25cf408fc9fa60bf105ee3e2e.png and /dev/null differ diff --git a/ics/2023/04/29/93dc47b81a22283cd08145870dae0dee.jpg b/ics/2023/04/29/93dc47b81a22283cd08145870dae0dee.jpg deleted file mode 100644 index 47af363..0000000 Binary files a/ics/2023/04/29/93dc47b81a22283cd08145870dae0dee.jpg and /dev/null differ diff --git a/ics/2023/04/29/947d89870fed6c805b401276beda4014.png b/ics/2023/04/29/947d89870fed6c805b401276beda4014.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2023/04/29/947d89870fed6c805b401276beda4014.png and /dev/null differ diff --git a/ics/2023/04/29/94e93b27626f6d0c10fcf8ca36823658.png b/ics/2023/04/29/94e93b27626f6d0c10fcf8ca36823658.png deleted file mode 100644 index 14a7910..0000000 Binary files a/ics/2023/04/29/94e93b27626f6d0c10fcf8ca36823658.png and /dev/null differ diff --git a/ics/2023/04/29/a81dd278c87205cc0809014d286dfc1e.jpg b/ics/2023/04/29/a81dd278c87205cc0809014d286dfc1e.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/29/a81dd278c87205cc0809014d286dfc1e.jpg and /dev/null differ diff --git a/ics/2023/04/29/a9155777d1ddf7cb291c6b17ada440dc.png b/ics/2023/04/29/a9155777d1ddf7cb291c6b17ada440dc.png deleted file mode 100644 index c0fd345..0000000 Binary files a/ics/2023/04/29/a9155777d1ddf7cb291c6b17ada440dc.png and /dev/null differ diff --git a/ics/2023/04/29/a944d5ae9143e7eb4325e2acd257a77c.png b/ics/2023/04/29/a944d5ae9143e7eb4325e2acd257a77c.png deleted file mode 100644 index 14a7910..0000000 Binary files a/ics/2023/04/29/a944d5ae9143e7eb4325e2acd257a77c.png and /dev/null differ diff --git a/ics/2023/04/29/ac94f65f923272fa0c0172fb5c925bca.png b/ics/2023/04/29/ac94f65f923272fa0c0172fb5c925bca.png deleted file mode 100644 index 14a7910..0000000 Binary files a/ics/2023/04/29/ac94f65f923272fa0c0172fb5c925bca.png and /dev/null differ diff --git a/ics/2023/04/29/b0859e5f61f012a7314443a2bd1d7a64.png b/ics/2023/04/29/b0859e5f61f012a7314443a2bd1d7a64.png deleted file mode 100644 index 8b45b61..0000000 Binary files a/ics/2023/04/29/b0859e5f61f012a7314443a2bd1d7a64.png and /dev/null differ diff --git a/ics/2023/04/29/c2f129593b0e1d226ecdb664e6a9e1dd.png b/ics/2023/04/29/c2f129593b0e1d226ecdb664e6a9e1dd.png deleted file mode 100644 index 1fbfa26..0000000 Binary files a/ics/2023/04/29/c2f129593b0e1d226ecdb664e6a9e1dd.png and /dev/null differ diff --git a/ics/2023/04/29/ccb4c5a7410b75a1bafc951275ecaf17.png b/ics/2023/04/29/ccb4c5a7410b75a1bafc951275ecaf17.png deleted file mode 100644 index 6a88885..0000000 Binary files a/ics/2023/04/29/ccb4c5a7410b75a1bafc951275ecaf17.png and /dev/null differ diff --git a/ics/2023/04/29/cdee82dfcaf33f9b01b816b27dfd0f54.png b/ics/2023/04/29/cdee82dfcaf33f9b01b816b27dfd0f54.png deleted file mode 100644 index 3837a01..0000000 Binary files a/ics/2023/04/29/cdee82dfcaf33f9b01b816b27dfd0f54.png and /dev/null differ diff --git a/ics/2023/04/29/df31773f6581084b3a7308ae18b4e43d.png b/ics/2023/04/29/df31773f6581084b3a7308ae18b4e43d.png deleted file mode 100644 index c950c9d..0000000 Binary files a/ics/2023/04/29/df31773f6581084b3a7308ae18b4e43d.png and /dev/null differ diff --git a/ics/2023/04/29/e08e65aed1dbabc2f4efaa7de7cdaebc.png b/ics/2023/04/29/e08e65aed1dbabc2f4efaa7de7cdaebc.png deleted file mode 100644 index 6a88885..0000000 Binary files a/ics/2023/04/29/e08e65aed1dbabc2f4efaa7de7cdaebc.png and /dev/null differ diff --git a/ics/2023/04/29/e30bfa2b97992a0b157e908bbe0ab84b.png b/ics/2023/04/29/e30bfa2b97992a0b157e908bbe0ab84b.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2023/04/29/e30bfa2b97992a0b157e908bbe0ab84b.png and /dev/null differ diff --git a/ics/2023/04/29/e6952f0d06283fdd1d3f58164dd15b45.png b/ics/2023/04/29/e6952f0d06283fdd1d3f58164dd15b45.png deleted file mode 100644 index c6ca6cc..0000000 Binary files a/ics/2023/04/29/e6952f0d06283fdd1d3f58164dd15b45.png and /dev/null differ diff --git a/ics/2023/04/29/e8a19a759c5630c3c33016687531755c.png b/ics/2023/04/29/e8a19a759c5630c3c33016687531755c.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2023/04/29/e8a19a759c5630c3c33016687531755c.png and /dev/null differ diff --git a/ics/2023/04/29/ea77ad0c5ed486d7eebe873855415200.png b/ics/2023/04/29/ea77ad0c5ed486d7eebe873855415200.png deleted file mode 100644 index 82bd959..0000000 Binary files a/ics/2023/04/29/ea77ad0c5ed486d7eebe873855415200.png and /dev/null differ diff --git a/ics/2023/04/29/eafa14f0168581de962e4ae6b35b060b.png b/ics/2023/04/29/eafa14f0168581de962e4ae6b35b060b.png deleted file mode 100644 index 7359722..0000000 Binary files a/ics/2023/04/29/eafa14f0168581de962e4ae6b35b060b.png and /dev/null differ diff --git a/ics/2023/04/29/f124fc0970901a7a227407c7452a66ec.png b/ics/2023/04/29/f124fc0970901a7a227407c7452a66ec.png deleted file mode 100644 index 326b506..0000000 Binary files a/ics/2023/04/29/f124fc0970901a7a227407c7452a66ec.png and /dev/null differ diff --git a/ics/2023/04/29/fabcbcb05699f1c4781690984afa573c.png b/ics/2023/04/29/fabcbcb05699f1c4781690984afa573c.png deleted file mode 100644 index 326b506..0000000 Binary files a/ics/2023/04/29/fabcbcb05699f1c4781690984afa573c.png and /dev/null differ diff --git a/ics/2023/04/29/faede6f562d7b7ec36ef08d74a318f86.jpg b/ics/2023/04/29/faede6f562d7b7ec36ef08d74a318f86.jpg deleted file mode 100644 index 2e7540a..0000000 Binary files a/ics/2023/04/29/faede6f562d7b7ec36ef08d74a318f86.jpg and /dev/null differ diff --git a/ics/2023/04/30/232c3d4531314905635da9047d08b0af.png b/ics/2023/04/30/232c3d4531314905635da9047d08b0af.png deleted file mode 100644 index de0baee..0000000 Binary files a/ics/2023/04/30/232c3d4531314905635da9047d08b0af.png and /dev/null differ diff --git a/ics/2023/04/30/7560032a4a5c34b9f538667a3a0eed3e.png b/ics/2023/04/30/7560032a4a5c34b9f538667a3a0eed3e.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2023/04/30/7560032a4a5c34b9f538667a3a0eed3e.png and /dev/null differ diff --git a/ics/2023/04/30/837ce9afa18f624fa94b0ca9efda40ad.png b/ics/2023/04/30/837ce9afa18f624fa94b0ca9efda40ad.png deleted file mode 100644 index 82db1a0..0000000 Binary files a/ics/2023/04/30/837ce9afa18f624fa94b0ca9efda40ad.png and /dev/null differ diff --git a/ics/2023/04/30/b4c87d3039e179da00fc674ef4c75936.png b/ics/2023/04/30/b4c87d3039e179da00fc674ef4c75936.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2023/04/30/b4c87d3039e179da00fc674ef4c75936.png and /dev/null differ diff --git a/ics/2023/04/30/ce7f3fe59f850b64af415ff5479ce10a.png b/ics/2023/04/30/ce7f3fe59f850b64af415ff5479ce10a.png deleted file mode 100644 index 0011285..0000000 Binary files a/ics/2023/04/30/ce7f3fe59f850b64af415ff5479ce10a.png and /dev/null differ diff --git a/ics/2023/05/06/a1b93a5bf4434936e4c63581ba39a822.png b/ics/2023/05/06/a1b93a5bf4434936e4c63581ba39a822.png deleted file mode 100644 index 83fd1cb..0000000 Binary files a/ics/2023/05/06/a1b93a5bf4434936e4c63581ba39a822.png and /dev/null differ diff --git a/ics/2023/05/08/75f760cabd50d55ab9460868b5030ac9.png b/ics/2023/05/08/75f760cabd50d55ab9460868b5030ac9.png deleted file mode 100644 index d37cf51..0000000 Binary files a/ics/2023/05/08/75f760cabd50d55ab9460868b5030ac9.png and /dev/null differ diff --git a/ics/banner/1.jpg b/ics/banner/1.jpg deleted file mode 100644 index 1c351a7..0000000 Binary files a/ics/banner/1.jpg and /dev/null differ diff --git a/ics/banner/2.jpg b/ics/banner/2.jpg deleted file mode 100644 index fb86800..0000000 Binary files a/ics/banner/2.jpg and /dev/null differ diff --git a/ics/banner/3.jpg b/ics/banner/3.jpg deleted file mode 100644 index daf252d..0000000 Binary files a/ics/banner/3.jpg and /dev/null differ diff --git a/ics/banner/4.jpg b/ics/banner/4.jpg deleted file mode 100644 index dc77e49..0000000 Binary files a/ics/banner/4.jpg and /dev/null differ diff --git a/ics/banner/5.jpg b/ics/banner/5.jpg deleted file mode 100644 index 89246eb..0000000 Binary files a/ics/banner/5.jpg and /dev/null differ diff --git a/ics/banner/6.jpg b/ics/banner/6.jpg deleted file mode 100644 index 3dfabe4..0000000 Binary files a/ics/banner/6.jpg and /dev/null differ diff --git a/ics/wenjian/1.jpg b/ics/wenjian/1.jpg deleted file mode 100644 index 3ffa049..0000000 Binary files a/ics/wenjian/1.jpg and /dev/null differ diff --git a/ics/wenjian/2.jpg b/ics/wenjian/2.jpg deleted file mode 100644 index 286729a..0000000 Binary files a/ics/wenjian/2.jpg and /dev/null differ diff --git a/ics/wenjian/3.jpg b/ics/wenjian/3.jpg deleted file mode 100644 index 9d5ba44..0000000 Binary files a/ics/wenjian/3.jpg and /dev/null differ diff --git a/ics/wenjian/4.jpg b/ics/wenjian/4.jpg deleted file mode 100644 index eaa7ae6..0000000 Binary files a/ics/wenjian/4.jpg and /dev/null differ