新增开发终端管理器,任务偏好设置,配置管理,采集器类型

segment2.0
linrf 2 years ago
parent 931194abcf
commit 7c9d82f24d

@ -52,5 +52,4 @@ public class MsgConstants {
*/
public static final String SCH_DISTRIBUTE_TASKS = "9".trim();
}

@ -1,9 +1,15 @@
package com.docus.server.common.netty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Data
public class CommMsg<MSG_CONTENT extends Serializable> implements Serializable {

@ -17,6 +17,7 @@ import java.util.concurrent.ConcurrentHashMap;
@Component
@Slf4j
public class ChannelRepository {
@Resource
private ISchTerminatorService iSchTerminatorService;
@ -33,6 +34,7 @@ public class ChannelRepository {
CHANNEL_CACHE_MAP.put(key, value);
AttributeKey<String> attributeKey = AttributeKey.valueOf("user");
value.attr(attributeKey).set(key);
iSchTerminatorService.saveOrUpdate(key, onlineState);
}
@ -57,6 +59,7 @@ public class ChannelRepository {
*/
public void remove(String key) {
CHANNEL_CACHE_MAP.remove(key);
iSchTerminatorService.saveOrUpdate(key, OnlineStateEnum.OFFLINE);
}

@ -56,22 +56,6 @@ public class NettyBusinessHandler extends SimpleChannelInboundHandler<ByteBuf> {
String messageTime = commMsg.getMessageTime();
TerminatorContent messageContent = commMsg.getContent();
// if (messageType.equals(MsgConstants.ONLINE_REGISTER)) {
// log.info("接受到【采集器-终端】的上线注册消息:消息类型={},消息时间={},消息内容={}", messageType, messageTime, messageContent);
// InetSocketAddress ipSocket = (InetSocketAddress) channelHandlerContext.channel().remoteAddress();
// String clientIp = ipSocket.getAddress().getHostAddress();
// log.info("【采集器-终端IP】:{},连接上线,IP地址信息:{}", clientIp, clientIp);
// Channel channel = repository.get(clientIp);
// if (channel != null && channel.isOpen()) {
// channel.close();
// }
//
// /*
// * 将ip和channel进行映射
// */
// repository.put(clientIp, channelHandlerContext.channel(), OnlineStateEnum.OFFLINE);
// }
if (messageType.equals(MsgConstants.TERMINATOR_RESTART)) {
log.info("接受到终端重启命令,内容{}", messageContent);
}
@ -112,13 +96,14 @@ public class NettyBusinessHandler extends SimpleChannelInboundHandler<ByteBuf> {
repository.put(clientIp, ctx.channel(), OnlineStateEnum.OFFLINE);
DEFAULT_CHANNEL_GROUP.add(ctx.channel());
System.out.println(ctx.channel().remoteAddress() + " 上线," + "在线数量:" + DEFAULT_CHANNEL_GROUP.size());
System.out.println(ctx.channel().remoteAddress() + " 上线," + "【采集器-终端】在线数量:" + DEFAULT_CHANNEL_GROUP.size());
}
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
Channel channel = ctx.channel();
System.out.println(channel.remoteAddress() + " 下线," + "在线数量:" + DEFAULT_CHANNEL_GROUP.size());
System.out.println(channel.remoteAddress() + " 下线," + "【采集器-终端】在线数量:" + DEFAULT_CHANNEL_GROUP.size());
}
@Override

@ -60,9 +60,8 @@ public class NettyHeartbeatHandler extends ChannelInboundHandlerAdapter {
if (channel != null && channel.isOpen()) {
channel.close();
}
/*
* ipchannel
*/
//将ip和channel进行映射
repository.put(clientIp, channelHandlerContext.channel(), OnlineStateEnum.ONLINE);
} else {
@ -71,7 +70,6 @@ public class NettyHeartbeatHandler extends ChannelInboundHandlerAdapter {
channelHandlerContext.fireChannelRead(msg);
}
}
// ReferenceCountUtil.release(msg);
}
private ChannelRepository repository;
@ -80,28 +78,12 @@ public class NettyHeartbeatHandler extends ChannelInboundHandlerAdapter {
this.repository = repository;
}
// @Override
// public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
// if (evt instanceof IdleStateEvent) {
// IdleStateEvent event = (IdleStateEvent) evt;
// if (event.state() == IdleState.READER_IDLE) {
// String clientId = repository.getClientKey(ctx.channel());
// //移除工控机缓存,设备离线
// repository.remove(clientId);
// log.info("{},关闭这个不活跃通道=================>", clientId);
// ctx.channel().close();
// }
// } else {
// super.userEventTriggered(ctx, evt);
// }
// }
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
cause.printStackTrace();
String clientId = repository.getClientKey(ctx.channel());
log.error("通道发生异常,终端连接:{}", clientId);
//移除工控机缓存,设备离线
//移除终端,终端离线
if (clientId != null) {
repository.remove(clientId);
}

@ -0,0 +1,40 @@
package com.docus.server.controller;
import com.docus.core.util.DateUtil;
import com.docus.core.util.json.JSON;
import com.docus.server.api.scheduling.management.CommMsgApi;
import com.docus.server.common.netty.CommMsg;
import com.docus.server.common.netty.server.ChannelRepository;
import com.docus.server.convert.CommMsgConvert;
import com.docus.server.dto.scheduling.management.schterminator.CommMsgDTO;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.util.CharsetUtil;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Date;
/**
* TCP API
*
* @author AutoGenerator
* @since 2023-07-15
*/
@RestController
public class CommMsgController implements CommMsgApi {
@Resource
private ChannelRepository channelRepository;
@Override
public void clientCommand(CommMsgDTO commMsgDTO) {
Channel channel = channelRepository.get(commMsgDTO.getTerminatorIp());
CommMsg commMsg = CommMsgConvert.INSTANCE.convertDO(commMsgDTO);
commMsg.setMessageTime(DateUtil.formatDateTime(new Date()));
if (channel != null) {
channel.writeAndFlush(Unpooled.copiedBuffer(JSON.toJSON(commMsg), CharsetUtil.UTF_8));
}
}
}

@ -1,5 +1,6 @@
package com.docus.server.controller;
import com.docus.core.util.json.JSON;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.api.scheduling.management.SchCollectorConfigApi;
@ -8,9 +9,11 @@ import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCo
import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO;
import com.docus.server.service.ISchCollectorConfigService;
import com.docus.server.vo.scheduling.management.schcollectorconfig.SchCollectorConfigVO;
import com.google.common.collect.Maps;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
/**
*
@ -77,4 +80,15 @@ public class SchCollectorConfigController implements SchCollectorConfigApi {
public int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO) {
return iSchCollectorConfigService.delete(deleteSchCollectorConfigDTO);
}
public static void main(String[] args) {
HashMap<Object, Object> objectObjectHashMap = Maps.newHashMap();
objectObjectHashMap.put("ocr.url", "http://192.168.2.13/ocr");
objectObjectHashMap.put("ocr.name", "lin");
objectObjectHashMap.put("ocr.pwd", "123");
System.out.println(JSON.toJSON(objectObjectHashMap));
}
}

@ -3,6 +3,7 @@ package com.docus.server.controller;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.api.scheduling.management.SchTerminatorApi;
import com.docus.server.common.netty.server.ChannelRepository;
import com.docus.server.dto.scheduling.management.schterminator.AddSchTerminatorDTO;
import com.docus.server.dto.scheduling.management.schterminator.DeleteSchTerminatorDTO;
import com.docus.server.dto.scheduling.management.schterminator.EditSchTerminatorDTO;
@ -22,6 +23,8 @@ import javax.annotation.Resource;
public class SchTerminatorController implements SchTerminatorApi {
@Resource
private ISchTerminatorService iSchTerminatorService;
@Resource
private ChannelRepository channelRepository;
/**
*
@ -77,4 +80,5 @@ public class SchTerminatorController implements SchTerminatorApi {
public int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO) {
return iSchTerminatorService.delete(deleteSchTerminatorDTO);
}
}

@ -0,0 +1,24 @@
package com.docus.server.convert;
import com.docus.server.common.netty.CommMsg;
import com.docus.server.dto.scheduling.management.schterminator.CommMsgDTO;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
/**
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Mapper
public interface CommMsgConvert {
CommMsgConvert INSTANCE = Mappers.getMapper(CommMsgConvert.class);
@Mappings({})
CommMsg convertDO(CommMsgDTO commMsgDTO);
}

@ -1,18 +1,14 @@
package com.docus.server.convert;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.scheduling.management.SchCollectorConfig;
import com.docus.server.dto.scheduling.management.schcollectorconfig.AddSchCollectorConfigDTO;
import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO;
import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCollectorConfigDTO;
import com.docus.server.entity.scheduling.management.SchCollectorConfig;
import com.docus.server.vo.scheduling.management.schcollectorconfig.SchCollectorConfigVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
*
*
@ -30,19 +26,11 @@ public interface SchCollectorConfigConvert {
@Mappings({})
SchCollectorConfig convertDO(EditSchCollectorConfigDTO editSchCollectorConfigDTO);
@Mappings({})
List<SchCollectorConfig> convertAddDOList(List<AddSchCollectorConfigDTO> addSchCollectorConfigDTO);
@Mappings({})
List<SchCollectorConfig> convertEditDOList(List<EditSchCollectorConfigDTO> editSchCollectorConfigDTO);
@Mappings({})
SchCollectorConfigVO convertVO(SchCollectorConfig schCollectorConfig);
@Mappings({})
List<SchCollectorConfigVO> convertVO(List<SchCollectorConfig> schCollectorConfigList);
@Mappings({})
PageResult<SchCollectorConfigVO> convertVO(PageResult<SchCollectorConfig> pageResult);
}

@ -28,12 +28,6 @@ public interface SchTerminatorConvert {
@Mappings({})
SchTerminator convertDO(EditSchTerminatorDTO editSchTerminatorDTO);
@Mappings({})
List<SchTerminator> convertAddDOList(List<AddSchTerminatorDTO> addSchTerminatorDTO);
@Mappings({})
List<SchTerminator> convertEditDOList(List<EditSchTerminatorDTO> editSchTerminatorDTO);
@Mappings({})
SchTerminatorVO convertVO(SchTerminator schTerminator);
@ -42,5 +36,6 @@ public interface SchTerminatorConvert {
@Mappings({})
PageResult<SchTerminatorVO> convertVO(PageResult<SchTerminator> pageResult);
}

@ -86,15 +86,20 @@ public class SchCollectorConfigDaoImpl extends BaseDaoImpl<SchCollectorConfigMap
Date endTime = searchDTO.getEndTime();
query.le(SchCollectorConfig::getCreateTime, endTime);
}
//关键字比较多个列or
//if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
//单个列用like
//query. like(SchCollectorConfig::getxxx, searchDTO.getKeyword());
//多个列用like
//query. and(sub -> sub.like(SchCollectorConfig::getxx1, searchDTO.getKeyword())
// оr(). like(SchCollectorConfig::getXX2, searchDTO.getKeyword()))
//);
//}
if (searchDTO.getParams("collectorCode") != null && searchDTO.getParams("collectorCode") != "") {
query.eq(SchCollectorConfig::getCollectorCode, searchDTO.getParams("collectorCode"));
}
if (searchDTO.getParams("configType") != null && searchDTO.getParams("configType") != "") {
query.eq(SchCollectorConfig::getConfigType, searchDTO.getParams("configType"));
}
if (searchDTO.getEndTime() != null) {
Date endTime = searchDTO.getEndTime();
query.le(SchCollectorConfig::getCreateTime, endTime);
}
//默认createTime倒序排序
query.orderByDesc(SchCollectorConfig::getCreateTime);
List<SchCollectorConfig> list = super.find(query);

@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.docus.core.util.Func;
import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
@ -86,15 +87,13 @@ public class SchSystemParamsDaoImpl extends BaseDaoImpl<SchSystemParamsMapper, S
Date endTime = searchDTO.getEndTime();
query.le(SchSystemParams::getCreateTime, endTime);
}
//关键字比较多个列or
//if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
//单个列用like
//query. like(SchSystemParams::getxxx, searchDTO.getKeyword());
//多个列用like
//query. and(sub -> sub.like(SchSystemParams::getxx1, searchDTO.getKeyword())
// оr(). like(SchSystemParams::getXX2, searchDTO.getKeyword()))
//);
//}
//分组查询系统参数表
String paramGroup = String.valueOf(searchDTO.getParams("paramGroup"));
if (Func.isNotBlank(paramGroup)) {
query.eq(SchSystemParams::getParamGroup, paramGroup);
}
//默认createTime倒序排序
query.orderByDesc(SchSystemParams::getCreateTime);
List<SchSystemParams> list = super.find(query);

@ -1,5 +1,6 @@
package com.docus.server.service.impl;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchCollectorConfigConvert;
@ -24,6 +25,8 @@ import javax.annotation.Resource;
public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService {
@Resource
private ISchCollectorConfigDao iSchCollectorConfigDao;
@Resource
private IdService idService;
/**
*
@ -55,8 +58,22 @@ public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService
*/
@Override
public boolean add(AddSchCollectorConfigDTO addSchCollectorConfigDTO) {
String collectorCode = addSchCollectorConfigDTO.getCollectorCode();
SchCollectorConfig schCollectorConfigDO = iSchCollectorConfigDao.findOneBy("collectorCode", collectorCode);
if (null == schCollectorConfigDO) {
SchCollectorConfig schCollectorConfig = SchCollectorConfigConvert.INSTANCE.convertDO(addSchCollectorConfigDTO);
schCollectorConfig.setId(idService.getDateSeq());
return iSchCollectorConfigDao.add(schCollectorConfig);
} else {
schCollectorConfigDO.setConfigJson(addSchCollectorConfigDTO.getConfigJson());
return iSchCollectorConfigDao.updateById(schCollectorConfigDO);
}
}
/**

@ -6,7 +6,7 @@
<resultMap id="BaseResultMap"
type="com.docus.server.entity.scheduling.management.SchCollectorConfig">
<id column="id" property="id"/>
<result column="collector_id" property="collectorId"/>
<result column="collector_code" property="collectorCode"/>
<result column="config_type" property="configType"/>
<result column="config_json" property="configJson"/>
<result column="create_time" property="createTime"/>
@ -15,7 +15,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, collector_id, config_type, config_json, create_time, update_time
id, collector_code, config_type, config_json, create_time, update_time
</sql>
</mapper>

@ -0,0 +1,32 @@
package com.docus.server.api.scheduling.management;
import com.docus.server.dto.scheduling.management.schterminator.CommMsgDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* TCP API
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "通用消息TCP接口", tags = "通用消息TCP接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.CommMsgApi")
@RequestMapping("/sch/commMsg")
public interface CommMsgApi {
/**
* TCP
*
* @param commMsgDTO
*/
@ApiOperation("向客户端发送TCP命令")
@PostMapping("/clientCommand")
void clientCommand(@RequestBody CommMsgDTO commMsgDTO);
}

@ -78,4 +78,5 @@ public interface SchTerminatorApi {
@ApiOperation("批量删除")
@DeleteMapping("/delete")
int delete(@RequestBody DeleteSchTerminatorDTO deleteSchTerminatorDTO);
}

@ -1,44 +1,33 @@
package com.docus.server.dto.scheduling.management.schcollectorconfig;
import com.docus.server.enums.ConfigTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
*
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="AddSchCollectorConfigDTO对象", description="采集器配置")
@ApiModel(value = "AddSchCollectorConfigDTO对象", description = "采集器配置")
public class AddSchCollectorConfigDTO implements Serializable {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "采集器id")
private Long collectorId;
@ApiModelProperty(value = "采集器类型")
private String collectorCode;
@NotNull
@ApiModelProperty(value = "配置类型0采集器公共配置1采集器私有配置")
private String configType;
private ConfigTypeEnum configType;
@NotNull
@ApiModelProperty(value = "配置参数")
private String configJson;
@ApiModelProperty(value = "产生时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
}

@ -3,42 +3,26 @@ package com.docus.server.dto.scheduling.management.schcollectorconfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
*
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="EditSchCollectorConfigDTO对象", description="采集器配置")
@ApiModel(value = "EditSchCollectorConfigDTO对象", description = "采集器配置")
public class EditSchCollectorConfigDTO implements Serializable {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "采集器id")
private Long collectorId;
@ApiModelProperty(value = "配置类型0采集器公共配置1采集器私有配置")
private String configType;
@ApiModelProperty(value = "采集器类型")
private String collectorCode;
@ApiModelProperty(value = "配置参数")
private String configJson;
@ApiModelProperty(value = "产生时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
}

@ -1,25 +1,21 @@
package com.docus.server.dto.scheduling.management.schsystemparams;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="AddSchSystemParamsDTO对象", description="系统参数表")
@ApiModel(value = "AddSchSystemParamsDTO对象", description = "系统参数表")
public class AddSchSystemParamsDTO implements Serializable {
@ApiModelProperty(value = "主键")
@ -50,10 +46,12 @@ public class AddSchSystemParamsDTO implements Serializable {
private String needEncrypt;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,25 +1,21 @@
package com.docus.server.dto.scheduling.management.schsystemparams;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="EditSchSystemParamsDTO对象", description="系统参数表")
@ApiModel(value = "EditSchSystemParamsDTO对象", description = "系统参数表")
public class EditSchSystemParamsDTO implements Serializable {
@ApiModelProperty(value = "主键")
@ -50,10 +46,12 @@ public class EditSchSystemParamsDTO implements Serializable {
private String needEncrypt;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,6 +1,5 @@
package com.docus.server.dto.scheduling.management.schterminator;
import com.baomidou.mybatisplus.annotation.TableField;
import com.docus.server.enums.BusyStateEnum;
import com.docus.server.enums.OnlineStateEnum;
import com.docus.server.enums.RestrictStateEnum;
@ -13,14 +12,13 @@ import java.io.Serializable;
import java.util.Date;
/**
*
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="AddSchTerminatorDTO对象", description="执行管理器")
@ApiModel(value = "AddSchTerminatorDTO对象", description = "执行管理器")
public class AddSchTerminatorDTO implements Serializable {
@ -28,53 +26,41 @@ public class AddSchTerminatorDTO implements Serializable {
private Long id;
@ApiModelProperty(value = "终端IP")
@TableField("terminator_ip")
private String terminatorIp;
@ApiModelProperty(value = "资源管理器名称")
@TableField("terminator_name")
private String terminatorName;
@ApiModelProperty(value = "只干某些任务,任务偏好属性")
@TableField("only_collector_ids")
private String onlyCollectorIds;
@ApiModelProperty(value = "优先干某些任务,任务偏好属性(优先给哪个采集器,若不空闲再给任意采集器)")
@TableField("priority_collector_ids")
private String priorityCollectorIds;
@ApiModelProperty(value = "是否限制采集器类型01是")
@TableField("restrict_state")
private RestrictStateEnum restrictState;
@ApiModelProperty(value = "忙闲状态0空闲1繁忙")
@TableField("busy_state")
private BusyStateEnum busyState;
@ApiModelProperty(value = "在线状态0离线1在线")
@TableField("online_state")
private OnlineStateEnum onlineState;
@ApiModelProperty(value = "最近任务执行时间")
@TableField("last_task_exec_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastTaskExecTime;
@ApiModelProperty(value = "正在执行任务的名称")
@TableField("executing_task_name")
private String executingTaskName;
@ApiModelProperty(value = "最近一次任务执行失败原因")
@TableField("last_task_error_msg")
private String lastTaskErrorMsg;
@ApiModelProperty(value = "入库时间")
@TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
@TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;

@ -0,0 +1,28 @@
package com.docus.server.dto.scheduling.management.schterminator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Data
@ApiModel(value = "CommMsgDTO对象", description = "TCP 重启命令")
public class CommMsgDTO implements Serializable {
@ApiModelProperty(value = "终端IP")
public String terminatorIp;
@ApiModelProperty(value = "消息类型")
public String messageType;
@ApiModelProperty(value = "消息内容")
public String content;
}

@ -1,16 +1,10 @@
package com.docus.server.dto.scheduling.management.schterminator;
import com.baomidou.mybatisplus.annotation.TableField;
import com.docus.server.enums.BusyStateEnum;
import com.docus.server.enums.OnlineStateEnum;
import com.docus.server.enums.RestrictStateEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* EditDTO
@ -25,56 +19,10 @@ public class EditSchTerminatorDTO implements Serializable {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "终端IP")
@TableField("terminator_ip")
private String terminatorIp;
@ApiModelProperty(value = "资源管理器名称")
@TableField("terminator_name")
private String terminatorName;
@ApiModelProperty(value = "只干某些任务,任务偏好属性")
@TableField("only_collector_ids")
private String onlyCollectorIds;
@ApiModelProperty(value = "优先干某些任务,任务偏好属性(优先给哪个采集器,若不空闲再给任意采集器)")
@TableField("priority_collector_ids")
private String priorityCollectorIds;
@ApiModelProperty(value = "是否限制采集器类型01是")
@TableField("restrict_state")
private RestrictStateEnum restrictState;
@ApiModelProperty(value = "忙闲状态0空闲1繁忙")
@TableField("busy_state")
private BusyStateEnum busyState;
@ApiModelProperty(value = "在线状态0离线1在线")
@TableField("online_state")
private OnlineStateEnum onlineState;
@ApiModelProperty(value = "最近任务执行时间")
@TableField("last_task_exec_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastTaskExecTime;
@ApiModelProperty(value = "正在执行任务的名称")
@TableField("executing_task_name")
private String executingTaskName;
@ApiModelProperty(value = "最近一次任务执行失败原因")
@TableField("last_task_error_msg")
private String lastTaskErrorMsg;
@ApiModelProperty(value = "入库时间")
@TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
@TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,55 +1,54 @@
package com.docus.server.entity.scheduling.management;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.docus.server.enums.ConfigTypeEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.util.Date;
/**
*
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("sch_collector_config")
@ApiModel(value="SchCollectorConfig对象", description="采集器配置")
@ApiModel(value = "SchCollectorConfig对象", description = "采集器配置")
public class SchCollectorConfig implements Serializable {
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private Long id;
@ApiModelProperty(value = "采集器id")
@TableField("collector_id")
private Long collectorId;
@ApiModelProperty(value = "采集器类型")
@TableField("collector_code")
private String collectorCode;
@ApiModelProperty(value = "配置类型0采集器公共配置1采集器私有配置")
@TableField("config_type")
private String configType;
private ConfigTypeEnum configType;
@ApiModelProperty(value = "配置参数")
@TableField("config_json")
private String configJson;
@ApiModelProperty(value = "产生时间")
@TableField("create_time")
private LocalDateTime createTime;
@ApiModelProperty(value = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
private LocalDateTime updateTime;
@ApiModelProperty(value = "入库更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,30 +1,28 @@
package com.docus.server.entity.scheduling.management;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.util.Date;
/**
*
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("sch_system_params")
@ApiModel(value="SchSystemParams对象", description="系统参数表")
@ApiModel(value = "SchSystemParams对象", description = "系统参数表")
public class SchSystemParams implements Serializable {
@ApiModelProperty(value = "主键")
@ -65,11 +63,13 @@ public class SchSystemParams implements Serializable {
@ApiModelProperty(value = "入库时间")
@TableField("create_time")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
@TableField("update_time")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -0,0 +1,31 @@
package com.docus.server.enums;
import com.docus.infrastructure.core.db.enums.IIntegerEnum;
/**
*
*/
public enum ConfigTypeEnum implements IIntegerEnum {
PUBLIC_CONFIG(0, "公共配置"),
PRIVATE_CONFIG(1, "私有配置");
private Integer value;
private String display;
ConfigTypeEnum(Integer value, String display) {
this.value = value;
this.display = display;
}
@Override
public Integer getValue() {
return value;
}
@Override
public String getDisplay() {
return display;
}
}

@ -1,44 +1,43 @@
package com.docus.server.vo.scheduling.management.schcollectorconfig;
import com.docus.server.enums.ConfigTypeEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="SchCollectorConfigVO对象", description="采集器配置")
@ApiModel(value = "SchCollectorConfigVO对象", description = "采集器配置")
public class SchCollectorConfigVO implements Serializable {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "采集器id")
private Long collectorId;
@ApiModelProperty(value = "采集器类型")
private String collectorCode;
@ApiModelProperty(value = "配置类型0采集器公共配置1采集器私有配置")
private String configType;
private ConfigTypeEnum configType;
@ApiModelProperty(value = "配置参数")
private String configJson;
@ApiModelProperty(value = "产生时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "入库更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,25 +1,21 @@
package com.docus.server.vo.scheduling.management.schsystemparams;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="SchSystemParamsVO对象", description="系统参数表")
@ApiModel(value = "SchSystemParamsVO对象", description = "系统参数表")
public class SchSystemParamsVO implements Serializable {
@ApiModelProperty(value = "主键")
@ -50,10 +46,12 @@ public class SchSystemParamsVO implements Serializable {
private String needEncrypt;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

Loading…
Cancel
Save