admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -90,7 +90,8 @@ parentId: null, disable: false, parentName: '', parentType:null parentType: null, sortnum: null } if (target != null) { this.form.parentId = target.id admin/src/views/business/internalCompany.vue
@@ -38,7 +38,7 @@ </template> </el-table-column> <el-table-column prop="companyNamePath" label="组织路径" min-width="100px"></el-table-column> <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column> <el-table-column prop="sortnum" align="center" label="排序码" min-width="80px"></el-table-column> <el-table-column prop="editorName" label="操作人" width="100px"></el-table-column> <el-table-column prop="editDate" label="最后更新时间" min-width="100px"></el-table-column> <el-table-column label="操作" width="230" fixed="right"> admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -202,7 +202,7 @@ { value: 7, label: '转移中' }, { value: 8, label: '异常挂起' }, { value: 9, label: '已授权离园' }, { value: 10, label: '已离园' }, // { value: 10, label: '已离园' }, { value: 11, label: '已过号' }, { value: 12, label: '已取消' }, ] admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -137,7 +137,7 @@ { value: 7, label: '转移中' }, { value: 8, label: '异常挂起' }, { value: 9, label: '已授权离园' }, { value: 10, label: '已离园' }, // { value: 10, label: '已离园' }, { value: 11, label: '已过号' }, { value: 12, label: '已取消' }, ] server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -28,6 +28,9 @@ @ApiOperation("【访客系统】定时查询设备状态") @GetMapping("/timer/device/getAscDeviceStatus") ApiResponse getAscDeviceStatus() ; @ApiOperation("【访客系统】设置全部LED屏显内容为默认内容") @GetMapping("/timer/device/setAllLedDefualtContent") ApiResponse setAllLedDefualtContent() ; @ApiOperation("【访客系统】定时备份数据库") @GetMapping("/timer/db/backupDatabase") ApiResponse backupDatabase() ; server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java
@@ -1,5 +1,6 @@ package com.doumee.api; import com.doumee.service.business.DeviceService; import com.doumee.service.business.third.model.ApiResponse; import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl; import io.swagger.annotations.Api; @@ -19,11 +20,19 @@ public class HkDeviceTimerController extends BaseController { @Autowired private HkSyncDeviceServiceImpl hkSyncDeviceService; @Autowired private DeviceService deviceService; @ApiOperation("开启定时查询设备状态") @GetMapping("/getAscDeviceStatus") public ApiResponse getAscDeviceStatus() { hkSyncDeviceService.getAscDeviceStatus(); return ApiResponse.success("开启定时查询设备状态成功"); } @ApiOperation("更新全部LED屏显内容为默认内容") @GetMapping("/setAllLedDefualtContent") public ApiResponse setAllLedDefualtContent() { deviceService.setAllLedDefualtContent(); return ApiResponse.success("更新全部LED屏显内容为默认内容"); } } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
@@ -1,5 +1,6 @@ package com.doumee.dao.business.model; import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -82,4 +83,8 @@ @ExcelColumn(name="设备編碼") private String hkNo; @ApiModelProperty(value = "led空闲文案") @TableField(exist = false) private String ledContent; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
@@ -104,4 +104,5 @@ long count(Device device); void setLedContent(TransparentChannelSingleRequest body); void setAllLedDefualtContent(); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -5,25 +5,27 @@ import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest; import com.doumee.dao.business.*; import com.doumee.dao.business.model.*; import com.doumee.service.business.third.model.PageData; import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.DeviceMapper; import com.doumee.dao.business.PlatformBroadcastLogMapper; import com.doumee.dao.business.model.Device; import com.doumee.dao.business.model.PlatformBroadcastLog; import com.doumee.service.business.DeviceService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; /** * 设备信息表Service实现 @@ -31,10 +33,15 @@ * @date 2023/11/30 15:33 */ @Service @Slf4j public class DeviceServiceImpl implements DeviceService { @Autowired private DeviceMapper deviceMapper; @Autowired private PlatformMapper platformMapper; @Autowired private PlatformDeviceMapper platformDeviceMapper; @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired @@ -246,4 +253,35 @@ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，屏幕内容设置失败"+(log!=null?log.getHkInfo():"")); } } @Override public void setAllLedDefualtContent() { int speed = 13; try { speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode()); }catch (Exception e){ } //所有月台关联设备信息 List<PlatformDevice> list = platformDeviceMapper.selectList(new MPJLambdaWrapper<PlatformDevice>(). selectAll(PlatformDevice.class) .selectAs(Platform::getLedContent,PlatformDevice::getLedContent) .leftJoin(Platform.class,Platform::getId,PlatformDevice::getPlatformId) .eq(PlatformDevice::getType,Constants.ZERO) .eq(PlatformDevice::getIsdeleted,Constants.ZERO) .eq(Platform::getIsdeleted,Constants.ZERO) ); if(list==null || list.size()==0){ return; } for(PlatformDevice device :list){ String content = device.getLedContent(); if(StringUtils.isBlank(content)){ continue; } PlatformBroadcastLog log1 = HkSyncPushServiceImpl.dealLedContentBiz(device.getPlatformId(),device.getHkNo(),device.getName(),content,speed,1); platformBroadcastLogMapper.insert(log1); if(log1.getHkStatus() == null || !Constants.equalsInteger(log1.getHkStatus(), Constants.TWO)){ log.error( "对不起，屏幕内容设置失败"+(log1!=null?log1.getHkInfo():"")); } } } }
