dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeData.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,55 @@ package com.sandu.ximon.dao.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Data; /** * ip鳿±è®¾å¤è¡¨ * @TableName ip_volume_data */ @TableName(value ="ip_volume_data") @Data public class IpVolumeData implements Serializable { /** * */ @TableId(type = IdType.AUTO) private Long id; /** * */ private Long userId; /** * å¨çº¿ç¶æ */ private Integer onLineStatus; /** * æå±ç¯æåç§° */ private String blongsPoleName; /** * æå±ç¯æid */ private Long blongsPoleId; /** * ipå°å/Mac */ private String ip; /** * é³é */ private String volume; @TableField(exist = false) private static final long serialVersionUID = 1L; } dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeFile.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,61 @@ package com.sandu.ximon.dao.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; import lombok.Data; /** * 广æç´ æ * @TableName ip_volume_file */ @TableName(value ="ip_volume_file") @Data public class IpVolumeFile implements Serializable { /** * */ @TableId(type = IdType.AUTO) private Long id; /** * ä¸ä¼ 人id */ private Long userId; /** * ä¸ä¼ 人 */ private String userName; /** * */ private Long clientId; /** * æä»¶åç§° */ private String fileName; /** * æä»¶å¤§å° */ private Double fileSize; /** * */ private String fileBase64; /** * å建æ¶é´ */ private LocalDateTime createTime; @TableField(exist = false) private static final long serialVersionUID = 1L; } dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,102 @@ package com.sandu.ximon.dao.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; import com.sandu.common.mybatis.JsonIntegerArrayTypeHandler; import lombok.Data; /** * ip鳿±ä»»å¡ * @TableName ip_volume_mission */ @TableName(value ="ip_volume_mission") @Data public class IpVolumeMission implements Serializable { /** * */ @TableId private Long id; /** * */ private Long userId; /** * */ private String userName; private Long clientId; /** * 鳿±ä»»å¡åç§° */ private String missionName; /** * ææ¾æä»¶ */ private String missionFileName; /** * ææ¾æä»¶id */ private Long missionFileId; /** * ææ¾ç»ç«¯æ°é */ private Integer numberInPlay; /** * å¨çº¿ç¶æ */ private Integer onLineState; /** * å建æ¶é´ */ private LocalDateTime createTime; /** * å¼å§æ¥æ */ private String onDate; /** * ç»ææ¥æ */ private String offDate; /** * ææèå´ */ @TableField(typeHandler = JsonIntegerArrayTypeHandler.class) private String weeksRange; /** * å¼å§æ¶å» */ private String onTime; /** * ç»ææ¶å» */ private String offTime; /** * ä»»å¡é³é */ private String missionVolume; @TableField(exist = false) private static final long serialVersionUID = 1L; } dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeDataMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package com.sandu.ximon.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sandu.ximon.dao.domain.IpVolumeData; import org.apache.ibatis.annotations.Mapper; /** * @Entity com.sandu.ximon.dao.domain.IpVolumeData */ @Mapper public interface IpVolumeDataMapper extends BaseMapper<IpVolumeData> { } dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeFileMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package com.sandu.ximon.dao.mapper; import com.sandu.ximon.dao.domain.IpVolumeFile; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** * @Entity com.sandu.ximon.dao.domain.IpVolumeFile */ @Mapper public interface IpVolumeFileMapper extends BaseMapper<IpVolumeFile> { } dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeMissionMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package com.sandu.ximon.dao.mapper; import com.sandu.ximon.dao.domain.IpVolumeMission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** * @Entity com.sandu.ximon.dao.domain.IpVolumeMission */ @Mapper public interface IpVolumeMissionMapper extends BaseMapper<IpVolumeMission> { } dao/src/main/resources/mapper/IpVolumeDataMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.sandu.ximon.dao.mapper.IpVolumeDataMapper"> <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.IpVolumeData"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="userId" column="user_id" jdbcType="BIGINT"/> <result property="onLineStatus" column="on_line_status" jdbcType="INTEGER"/> <result property="blongsPoleName" column="blongs_pole_name" jdbcType="VARCHAR"/> <result property="blongsPoleId" column="blongs_pole_id" jdbcType="BIGINT"/> <result property="ip" column="ip" jdbcType="VARCHAR"/> <result property="volume" column="volume" jdbcType="VARCHAR"/> </resultMap> <sql id="Base_Column_List"> id,user_id,on_line_status, blongs_pole_name,blongs_pole_id,ip, volume </sql> </mapper> dao/src/main/resources/mapper/IpVolumeFileMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.sandu.ximon.dao.mapper.IpVolumeFileMapper"> <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.IpVolumeFile"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="userId" column="user_id" jdbcType="BIGINT"/> <result property="userName" column="user_name" jdbcType="VARCHAR"/> <result property="clientId" column="client_id" jdbcType="BIGINT"/> <result property="fileName" column="file_name" jdbcType="VARCHAR"/> <result property="fileSize" column="file_size" jdbcType="DOUBLE"/> <result property="fileBase64" column="file_base64" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> </resultMap> <sql id="Base_Column_List"> id,user_id,user_name, client_id,file_name,file_size, file_base64,create_time </sql> </mapper> dao/src/main/resources/mapper/IpVolumeMissionMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.sandu.ximon.dao.mapper.IpVolumeMissionMapper"> <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.IpVolumeMission"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="userId" column="user_id" jdbcType="BIGINT"/> <result property="userName" column="user_name" jdbcType="VARCHAR"/> <result property="clientId" column="client_id" jdbcType="BIGINT"/> <result property="missionName" column="mission_name" jdbcType="VARCHAR"/> <result property="missionFileName" column="mission_file_name" jdbcType="VARCHAR"/> <result property="missionFileId" column="mission_file_id" jdbcType="BIGINT"/> <result property="numberInPlay" column="number_in_play" jdbcType="INTEGER"/> <result property="onLineState" column="on_line_state" jdbcType="INTEGER"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="onDate" column="on_date" jdbcType="VARCHAR"/> <result property="offDate" column="off_date" jdbcType="VARCHAR"/> <result property="weeksRange" column="weeks_ range" typeHandler="com.sandu.common.mybatis.JsonStringArrayTypeHandler"/> <result property="onTime" column="on_time" jdbcType="VARCHAR"/> <result property="offTime" column="off_time" jdbcType="VARCHAR"/> <result property="missionVolume" column="mission_volume" jdbcType="VARCHAR"/> </resultMap> <sql id="Base_Column_List"> id ,user_id,user_name, mission_name,mission_file_name,mission_file_id, number_in_play,on_line_state,create_time, on_date,off_date,weeks_ range, on_time,off_time,mission_volume </sql> </mapper> ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,38 @@ package com.sandu.ximon.admin.controller; import com.sandu.common.domain.ResponseVO; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.param.IpVolumeFileParam; import com.sandu.ximon.admin.param.ReceiveParam; import com.sandu.ximon.admin.service.IpVolumeFileService; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** * @Author liuhaonan * @Date 2021/12/16 10:51 * @Version 1.0 ip鳿±ç¸å ³ */ @RestController @AllArgsConstructor @RequestMapping("v1/IpVolumeFile") public class IpVolumeFileController { private final IpVolumeFileService ipVolumeFileService; @PostMapping("/add") public ResponseVO<Object> addFile(@RequestBody @Validated IpVolumeFileParam fileParam){ return ResponseUtil.success(ipVolumeFileService.addFile(fileParam)); } @PostMapping("/delete/{id}") public ResponseVO<Object> deleteFile(@PathVariable Long fileId){ return ResponseUtil.success(ipVolumeFileService.deleteFile(fileId)); } @PostMapping("/list}") public ResponseVO<Object> list(@RequestBody ReceiveParam receiveParam){ return ResponseUtil.success(ipVolumeFileService.list(ipVolumeFileService.listFile(receiveParam))); } } ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,9 @@ package com.sandu.ximon.admin.controller; /** * @Author liuhaonan * @Date 2021/12/16 10:03 * @Version 1.0 鳿±ä»»å¡ */ public class IpVolumeMissionController { } ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeFileParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.sandu.ximon.admin.param; import lombok.Data; /** * @Author liuhaonan * @Date 2021/12/16 10:53 * @Version 1.0 */ @Data public class IpVolumeFileParam { private String fileName; private Double fileSize; private String fileBase64; private String fileType; } ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,60 @@ package com.sandu.ximon.admin.param; import com.baomidou.mybatisplus.annotation.TableField; import com.sandu.common.mybatis.JsonIntegerArrayTypeHandler; import lombok.Data; import java.time.LocalDateTime; /** * @Author liuhaonan * @Date 2021/12/16 10:53 * @Version 1.0 */ @Data public class IpVolumeMissionParam { private String missionName; /** * ææ¾æä»¶ */ private String missionFileName; /** * ææ¾æä»¶id */ private Long missionFileId; /** * å¼å§æ¥æ */ private String onDate; /** * ç»ææ¥æ */ private String offDate; /** * ææèå´ */ @TableField(typeHandler = JsonIntegerArrayTypeHandler.class) private String weeksRange; /** * å¼å§æ¶å» */ private String onTime; /** * ç»ææ¶å» */ private String offTime; /** * ä»»å¡é³é */ private String missionVolume; } ximon-admin/src/main/java/com/sandu/ximon/admin/param/LCDMissionparam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.sandu.ximon.admin.param; import lombok.Data; /** * @Author liuhaonan * @Date 2021/12/16 14:37 * @Version 1.0 */ @Data public class LCDMissionparam { private String missionName; private Long missionFileId; private String missionFileName; private String missionRemark; } ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeDataService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,31 @@ package com.sandu.ximon.admin.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.dao.domain.IpVolumeData; import com.sandu.ximon.dao.mapper.IpVolumeDataMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; /** * @Author liuhaonan * @Date 2021/12/15 18:04 * ip鳿±ç¸å ³ * @Version 1.0 */ @Service @AllArgsConstructor public class IpVolumeDataService extends BaseServiceImpl<IpVolumeDataMapper, IpVolumeData> { private final IpVolumeDataMapper ipVolumeDataMapper; public LambdaQueryWrapper<IpVolumeData> listData() { if (SecurityUtils.getClientId() != null) { return Wrappers.lambdaQuery(IpVolumeData.class).eq(IpVolumeData::getUserId, SecurityUtils.getClientId()); } else { return Wrappers.lambdaQuery(IpVolumeData.class); } } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,55 @@ package com.sandu.ximon.admin.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.execption.BusinessException; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.IpVolumeFileParam; import com.sandu.ximon.admin.param.ReceiveParam; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.dao.domain.IpVolumeFile; import com.sandu.ximon.dao.mapper.IpVolumeFileMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; /** * @Author liuhaonan * @Date 2021/12/16 10:48 * @Version 1.0 */ @Service @AllArgsConstructor public class IpVolumeFileService extends BaseServiceImpl<IpVolumeFileMapper, IpVolumeFile> { private final IpVolumeFileMapper ipVolumeFileMapper; private final ClientService clientService; public boolean addFile(IpVolumeFileParam fileParam) { IpVolumeFile file = new IpVolumeFile(); file.setUserId(SecurityUtils.getClientId()); file.setUserName(SecurityUtils.getUsername()); file.setClientId(clientService.getClientId()); file.setFileName(fileParam.getFileName()); file.setFileSize(fileParam.getFileSize()); file.setFileBase64(fileParam.getFileBase64()); return save(file); } public boolean deleteFile(Long fileId) { IpVolumeFile byId = getById(fileId); if (byId == null) { throw new BusinessException("æ¾ä¸å°å¯¹åºæä»¶"); } return removeById(fileId); } public LambdaQueryWrapper<IpVolumeFile> listFile(ReceiveParam receiveParam) { LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class).eq(IpVolumeFile::getClientId, clientService.getClientId()); if (receiveParam.getKeyWord() == null) { return wrapper; } else { return wrapper.like(IpVolumeFile::getFileName,receiveParam.getKeyWord()); } } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,98 @@ package com.sandu.ximon.admin.service; import cn.hutool.http.HttpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.execption.BusinessException; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.IpVolumeMissionParam; import com.sandu.ximon.admin.param.ReceiveParam; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.dao.domain.IpVolumeMission; import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; /** * @Author liuhaonan * @Date 2021/12/16 10:03 * @Version 1.0 */ @Service @AllArgsConstructor public class IpVolumeMissionService extends BaseServiceImpl<IpVolumeMissionMapper, IpVolumeMission> { private final IpVolumeMissionMapper ipVolumeMissionMapper; private final ClientService clientService; public boolean addMission(IpVolumeMissionParam missionparam) { IpVolumeMission mission = new IpVolumeMission(); mission.setUserId(SecurityUtils.getUserId()); mission.setUserName(SecurityUtils.getUsername()); mission.setClientId(clientService.getClientId()); mission.setMissionName(missionparam.getMissionName()); mission.setMissionFileId(missionparam.getMissionFileId()); mission.setMissionFileName(missionparam.getMissionFileName()); mission.setOnDate(missionparam.getOnDate()); mission.setOffDate(missionparam.getOffDate()); mission.setWeeksRange(missionparam.getWeeksRange()); mission.setOnTime(missionparam.getOnTime()); mission.setOffTime(missionparam.getOffTime()); mission.setMissionVolume(missionparam.getMissionVolume()); return save(mission); } public boolean updateMission(Long missionId, IpVolumeMissionParam missionparam) { IpVolumeMission byId = getById(missionId); if (byId == null) { throw new BusinessException("æªæ¾å°è¯¥ä»»å¡"); } IpVolumeMission mission = new IpVolumeMission(); mission.setId(missionId); /* mission.setUserId(SecurityUtils.getUserId()); mission.setUserName(SecurityUtils.getUsername()); mission.setClientId(clientService.getClientId());*/ mission.setMissionName(missionparam.getMissionName()); mission.setMissionFileId(missionparam.getMissionFileId()); mission.setMissionFileName(missionparam.getMissionFileName()); mission.setOnDate(missionparam.getOnDate()); mission.setOffDate(missionparam.getOffDate()); mission.setWeeksRange(missionparam.getWeeksRange()); mission.setOnTime(missionparam.getOnTime()); mission.setOffTime(missionparam.getOffTime()); mission.setMissionVolume(missionparam.getMissionVolume()); HttpUtil.post("123", String.valueOf(mission)); return updateById(mission); } public boolean deleteMission(Long missionId) { IpVolumeMission byId = getById(missionId); if (byId == null) { throw new BusinessException("æªæ¾å°è¯¥ä»»å¡"); } return removeById(missionId); } public List<IpVolumeMission> listMission(ReceiveParam receiveParam) { LambdaQueryWrapper<IpVolumeMission> wrapper = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()).like(IpVolumeMission::getMissionName, receiveParam.getKeyWord()); return list(wrapper); } public void setMissionToData(Long missionId,List<Long> dateIds){ // tudo } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -63,16 +63,16 @@ public LambdaQueryWrapper<LEDProgram> listProgram() { LambdaQueryWrapper<LEDProgram> wrapper= new LambdaQueryWrapper<>(); // LambdaQueryWrapper<LEDProgram> wrapper= new LambdaQueryWrapper<>(); /* if(SecurityUtils.getClientId()!=null){ return list(Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId())); }else { return list(Wrappers.lambdaQuery(LEDProgram.class)); }*/ if(SecurityUtils.getClientId()!=null){ return wrapper=Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId,SecurityUtils.getClientId()); return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId,SecurityUtils.getClientId()); }else { return wrapper=Wrappers.lambdaQuery(LEDProgram.class); return Wrappers.lambdaQuery(LEDProgram.class); }