dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java
@@ -14,7 +14,7 @@ */ @Mapper public interface IPBroadcastMapper extends BaseMapper<BroadcastTerminalV2Entity> { List<BroadcastTerminalV2Entity> listAll(Long clientId); List<BroadcastTerminalV2Entity> listAll(); // // @Insert("insert into broadcast_v2_terminal (id,terminal_name,streetlight_id,exist) values (#{id},#{terminalName},#{streetlightId},#{exist})") // int insert(BroadcastTerminalV2Entity b); dao/src/main/java/com/sandu/ximon/dao/mapper/PoleBindingMapper.java
@@ -16,7 +16,7 @@ * 根据绑定关系查询设备归属 */ Pole getPoleByBinding(String type, String Mac,Long userId); Pole getPoleByBinding(String type, Object Mac, Long userId); }
@@ -25,12 +25,6 @@ LEFT JOIN pole_binding t2 ON t1.id = t2.device_code AND t2.device_type = 5 LEFT JOIN pole t3 ON t3.id = t2.pole_id <where> <if test="clientId != null"> AND (t3.user_id = #{clientId} OR t3.client_id = #{clientId}) </if> </where> </select> <select id="getBroadcastTerminalList" resultType="com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo"> ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -1,5 +1,6 @@ package com.sandu.ximon.admin.service; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -7,18 +8,17 @@ import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.common.util.SpringContextHolder; import com.sandu.ximon.admin.minio.entity.MinIoConstant; import com.sandu.ximon.admin.param.IpVolumeMissionParam; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils; import com.sandu.ximon.admin.utils.TaskAPIUtils; import com.sandu.ximon.admin.vo.TaskMediaFileVO; import com.sandu.ximon.admin.vo.TaskTerminalVO; import com.sandu.ximon.admin.vo.TaskVO; import com.sandu.ximon.dao.bo.IpVolumeMissionBo; import com.sandu.ximon.dao.domain.BroadcastV2TaskFile; import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal; import com.sandu.ximon.dao.domain.IpVolumeFile; import com.sandu.ximon.dao.domain.IpVolumeMission; import com.sandu.ximon.dao.domain.*; import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; /** * @Author liuhaonan @@ -45,9 +46,6 @@ private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService; /*public boolean add1() { return broadcastV2TaskTerminalService.save(); }*/ public boolean addMission(IpVolumeMissionParam missionparam) { String taskName = missionparam.getMissionName(); @@ -128,6 +126,7 @@ Integer taskId = TaskAPIUtils.addTask(missionparam); // Integer taskId = 1111; boolean flag; if (null != taskId && taskId != 0) { IpVolumeMission byId = getById(taskId); for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) { @@ -174,11 +173,25 @@ broadcastV2TaskTerminalService.deleteByTaskId(taskId); broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList); broadcastV2TaskFileService.saveBatch(taskFileEntityList); return true; flag = true; } else { return false; flag = false; } /** * IP音柱任务添加日志记录开始 */ String content = "{任务ID：" + taskId + "，任务名：" + taskName + "，设备ID集合：" + missionparam.getTerminalIds() + " }"; StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP音柱任务添加", content); /** * IP音柱任务添加日志记录结束 */ return flag; } public Integer updateMission(Integer taskId, IpVolumeMissionParam missionparam) { @@ -300,11 +313,21 @@ broadcastV2TaskTerminalService.deleteByTaskId(taskId); broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList); broadcastV2TaskFileService.saveBatch(taskFileEntityList); return 0; } else { return result; } /** * IP音柱任务修改日志记录开始 */ String content = "{任务ID：" + taskId + "，任务名：" + taskName + "，设备ID集合：" + missionparam.getTerminalIds() + "，任务编辑结果：" + result + " }"; StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP音柱任务修改", content); /** * IP音柱任务修改日志记录结束 */ return result; } /** @@ -324,11 +347,21 @@ broadcastV2TaskFileService.deleteByTaskId(taskId); broadcastV2TaskTerminalService.deleteByTaskId(taskId); // broadcastV2TaskTerminalService.removeById(taskId); return 0; } else { return del; } /** * IP音柱任务删除日志记录开始 */ String content = "{删除的任务ID：" + taskId + "，任务删除结果：" + del + " }"; StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱任务删除", content); /** * IP音柱任务删除日志记录结束 */ return del; }
@@ -1,5 +1,6 @@ package com.sandu.ximon.admin.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.sandu.common.execption.BusinessException; @@ -8,11 +9,13 @@ import com.sandu.common.util.SpringContextHolder; import com.sandu.ximon.admin.param.BroadcastTerminalV2Param; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils; import com.sandu.ximon.admin.utils.TerminalAPIUtils; import com.sandu.ximon.admin.vo.EquipmentInfomation; import com.sandu.ximon.admin.vo.TerminalVO; import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo; import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity; import com.sandu.ximon.dao.domain.Pole; import com.sandu.ximon.dao.enums.PoleBindingEnums; import com.sandu.ximon.dao.mapper.IPBroadcastMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @Service public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> { @@ -31,13 +35,7 @@ * 同步终端 */ public void synchTerminal() { List<BroadcastTerminalV2Entity> server; //为空是超管 if (SecurityUtils.getClientId() == null) { server = broadcastTerminalV2EntityMapper.listAll(null); } else { server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId()); } List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll(); List<TerminalVO> list = TerminalAPIUtils.getTerminalList(); System.out.println(list); @@ -62,6 +60,13 @@ save(b); } }); /** * IP音柱同步日志记录开始 */ StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱同步", "IP音柱同步设备"); /** * IP音柱同步日志记录结束 */ } public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) { @@ -147,42 +152,26 @@ } /** * 修改终端 * @param params * @return 0:成功 1:名称不能为空 *//* public Integer updateTerminal(BroadcastParams params, Long userId) { // 校验名称合法性 if(null == params.getTerminalName() || "".equals(params.getTerminalName())){ return 1; } if(null == params.getDefaultVolumn() || params.getDefaultVolumn() < 0) { params.setDefaultVolumn(0); } BroadcastTerminalV2Entity b = new BroadcastTerminalV2Entity(); b.setId(params.getTerminalId()); b.setTerminalName(params.getTerminalName()); b.setStreetlightId(params.getStreetlightId()); b.setExist(1); // API调用修改终端音量 TerminalAPIUtils.changeVol(params.getTerminalId(),params.getDefaultVolumn(),userId); broadcastTerminalV2Dao.update(b); return 0; } */ /** * 音量修改 * * @param params * @return */ public boolean changeVol(BroadcastTerminalV2Param params) { return TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn()); if (params.getId() == null || params.getDefaultVolumn() == null || params.getDefaultVolumn() < 0) { throw new BusinessException("设备ID或修改的音量值不正确"); } boolean flag = TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn()); /** * IP音柱修改设备名称日志记录开始 */ String content = "{设备Id:" + params.getId() + "，修改后音量：" + params.getDefaultVolumn() + "}"; StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱音量修改", content); /** * IP音柱改设备名称日志记录结束 */ return flag; } /** @@ -235,6 +224,9 @@ * @return */ public boolean updateBroadcastTerminalName(String name, Integer id) { if (name == null || name.trim().length() == 0) { throw new BusinessException("设备名不能为空"); } BroadcastTerminalV2Entity byId = getById(id); if (byId == null) { throw new BusinessException("终端不存在"); @@ -244,6 +236,15 @@ throw new BusinessException("该设备不属于您,不能修改设备信息"); } byId.setTerminalName(name); return updateById(byId); boolean flag = updateById(byId); /** * IP音柱修改设备名称日志记录开始 */ String content = "{设备Id:" + id + "，修改后名称：" + name + "}"; StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱修改设备名", content); /** * IP音柱改设备名称日志记录结束 */ return flag; } } ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java
@@ -6,7 +6,6 @@ import com.sandu.ximon.admin.service.DeviceOperationLogService; import com.sandu.ximon.admin.service.InnerFrameDataService; import com.sandu.ximon.dao.domain.Pole; import com.sandu.ximon.dao.enums.PoleBindingEnums; import com.sandu.ximon.dao.mapper.PoleBindingMapper; import java.util.ArrayList; @@ -48,13 +47,13 @@ * @param operation * @param content */ public static void storeOperationData(List<String> deviceCodeList, String deviceName, String operation, String content) { public static void storeOperationData(List deviceCodeList, String deviceName, String operation, String content) { if (deviceCodeList == null) { deviceCodeList = new ArrayList<>(); } List<String> poleCodeList = new ArrayList<>(); for (String str : deviceCodeList) { Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, str, null); for (Object str : deviceCodeList) { Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, String.valueOf(str), null); if (pole != null) { poleCodeList.add(pole.getDeviceCode()); } else {
