diff --git a/src/main/java/com/nis/dao/AlertRuleDao.java b/src/main/java/com/nis/dao/AlertRuleDao.java index 4a4d427..fe61f4b 100644 --- a/src/main/java/com/nis/dao/AlertRuleDao.java +++ b/src/main/java/com/nis/dao/AlertRuleDao.java @@ -5,10 +5,13 @@ import com.nis.entity.AlertMessageActiveEntity; import com.nis.entity.AlertMessageEntity; import com.nis.entity.AlertRuleEntity; +import java.util.List; + import org.apache.ibatis.annotations.Mapper; @Mapper public interface AlertRuleDao extends BaseMapper { + List selectAllDatas(); } diff --git a/src/main/java/com/nis/dao/ModuleDao.java b/src/main/java/com/nis/dao/ModuleDao.java index 8f4e9c4..f371b8c 100644 --- a/src/main/java/com/nis/dao/ModuleDao.java +++ b/src/main/java/com/nis/dao/ModuleDao.java @@ -13,6 +13,8 @@ import com.nis.entity.Dc; import com.nis.entity.Idc; import com.nis.entity.Module; +import java.util.List; + import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -21,4 +23,5 @@ import org.springframework.stereotype.Repository; @Repository public interface ModuleDao extends BaseMapper { + List selectSnmpDatas(); } diff --git a/src/main/java/com/nis/dao/SysConfigDao.java b/src/main/java/com/nis/dao/SysConfigDao.java new file mode 100644 index 0000000..9d2c48c --- /dev/null +++ b/src/main/java/com/nis/dao/SysConfigDao.java @@ -0,0 +1,30 @@ +/** + + * + + * + + */ + +package com.nis.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nis.entity.SysConfigEntity; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * 系统配置信息 + * + + */ +@Mapper +public interface SysConfigDao extends BaseMapper { + + List selectSysConfigEntitys(); +} diff --git a/src/main/java/com/nis/dao/SysDictDao.java b/src/main/java/com/nis/dao/SysDictDao.java index fb0e2e9..c565082 100644 --- a/src/main/java/com/nis/dao/SysDictDao.java +++ b/src/main/java/com/nis/dao/SysDictDao.java @@ -10,10 +10,15 @@ package com.nis.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nis.entity.SysDictEntity; + +import java.util.List; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface SysDictDao extends BaseMapper { + List selectDatas(@Param("type") String type); } diff --git a/src/main/java/com/nis/dao/SysUserDao.java b/src/main/java/com/nis/dao/SysUserDao.java new file mode 100644 index 0000000..568ca45 --- /dev/null +++ b/src/main/java/com/nis/dao/SysUserDao.java @@ -0,0 +1,20 @@ +package com.nis.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nis.entity.Account; +import com.nis.entity.Asset; +import com.nis.entity.SysUserEntity; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface SysUserDao extends BaseMapper { + + List selectOldUsers(); + + List selectNewUsers(); +} diff --git a/src/main/java/com/nis/entity/AlertMessageActiveEntity.java b/src/main/java/com/nis/entity/AlertMessageActiveEntity.java index 8177e62..bf5865a 100644 --- a/src/main/java/com/nis/entity/AlertMessageActiveEntity.java +++ b/src/main/java/com/nis/entity/AlertMessageActiveEntity.java @@ -118,6 +118,6 @@ public class AlertMessageActiveEntity implements Serializable { @TableField(exist = false) private Dc dc; - + @TableField(exist = false) private String severity; } diff --git a/src/main/java/com/nis/entity/AlertMessageHistoryEntity.java b/src/main/java/com/nis/entity/AlertMessageHistoryEntity.java index d728858..176c656 100644 --- a/src/main/java/com/nis/entity/AlertMessageHistoryEntity.java +++ b/src/main/java/com/nis/entity/AlertMessageHistoryEntity.java @@ -117,6 +117,6 @@ public class AlertMessageHistoryEntity implements Serializable { @TableField(exist = false) private Dc dc; - + @TableField(exist = false) private String severity; } diff --git a/src/main/java/com/nis/entity/AlertRuleEntity.java b/src/main/java/com/nis/entity/AlertRuleEntity.java index 8b8af9f..6b2280f 100644 --- a/src/main/java/com/nis/entity/AlertRuleEntity.java +++ b/src/main/java/com/nis/entity/AlertRuleEntity.java @@ -76,6 +76,7 @@ public class AlertRuleEntity implements Serializable { */ private String seq; + @TableField(exist = false) private String severity; private Integer method; diff --git a/src/main/java/com/nis/entity/SysUserEntity.java b/src/main/java/com/nis/entity/SysUserEntity.java new file mode 100644 index 0000000..bc6ad5b --- /dev/null +++ b/src/main/java/com/nis/entity/SysUserEntity.java @@ -0,0 +1,83 @@ +package com.nis.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 系统用户 + */ +@Data +@TableName("sys_user") +public class SysUserEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @TableField(exist=false) + private Long id; + + @TableField(exist=false) + private Long userId; + /** + * 用户名 + */ + private String username; + + + private String password; + /** + * 密码 + */ + @TableField(exist=false) + private String pin; + + /** + * 盐 + */ + private String salt; + + /** + * 邮箱 + */ + private String email; + + /** + * 状态 0：禁用 1：正常 + */ + private Integer status; + + /** + * 语言 + */ + private String lang; + @TableField(exist=false) + private String mobile; + + /** + * 创建时间 + */ + @TableField(exist=false) + private Date createAt; + @TableField(exist=false) + private Integer createBy; + @TableField(exist=false) + private String name; + + /** + * 来源 + */ + private String source; + + @TableField(exist=false) + private String lastLoginIp; + @TableField(exist=false) + private Date lastLoginTime; + + private Date createTime; +} diff --git a/src/main/java/com/nis/handler/AfterHandler.java b/src/main/java/com/nis/handler/AfterHandler.java index 72dc652..0533ed3 100644 --- a/src/main/java/com/nis/handler/AfterHandler.java +++ b/src/main/java/com/nis/handler/AfterHandler.java @@ -24,13 +24,13 @@ public class AfterHandler implements CommandLineRunner { @Override public void run(String... args) throws Exception { - + sqlHandler.removeTable(); log.info("remove table successful"); sqlHandler.removeCopy(); log.info("remove copy back successful"); - + log.info("-----------------program end-----------------------"); log.info("-----------------transfer data success-----------------------"); diff --git a/src/main/java/com/nis/handler/BeforeHandler.java b/src/main/java/com/nis/handler/BeforeHandler.java index d091a88..471b201 100644 --- a/src/main/java/com/nis/handler/BeforeHandler.java +++ b/src/main/java/com/nis/handler/BeforeHandler.java @@ -37,7 +37,7 @@ public class BeforeHandler implements CommandLineRunner { log.info("backup database successful"); // 删除触发器 - sqlHandler.dropTriggers(); + /*sqlHandler.dropTriggers(); log.info("drop all trigger successful"); // 修改表结构 @@ -45,7 +45,7 @@ public class BeforeHandler implements CommandLineRunner { log.info("alter table successful"); // 新增表 - sqlHandler.batchAddTable(); + sqlHandler.batchAddTable();*/ log.info("all sql execute successful , before handler close"); diff --git a/src/main/java/com/nis/handler/SqlHandler.java b/src/main/java/com/nis/handler/SqlHandler.java index 9d7b6ca..ebc973c 100644 --- a/src/main/java/com/nis/handler/SqlHandler.java +++ b/src/main/java/com/nis/handler/SqlHandler.java @@ -1,12 +1,32 @@ package com.nis.handler; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.sql.SQLException; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.sql.DataSource; + +import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.jdbc.datasource.init.ScriptException; +import org.springframework.jdbc.datasource.init.ScriptUtils; import org.springframework.stereotype.Service; +import org.springframework.util.ResourceUtils; import com.nis.dao.SqlDao; +import com.nis.entity.SysConfigEntity; +import com.nis.entity.SysUserEntity; import com.nis.service.AlertMessageService; import com.nis.service.AssetAssetService; import com.nis.service.AssetBrandService; @@ -14,8 +34,12 @@ import com.nis.service.AssetModelService; import com.nis.service.ChartService; import com.nis.service.DcService; import com.nis.service.EndpointService; +import com.nis.service.SysConfigService; +import com.nis.service.SysUserService; import com.nis.util.Constant; +import com.nis.util.ToolUtil; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.log.Log; @@ -53,6 +77,15 @@ public class SqlHandler { @Autowired private ChartService chartService; + @Autowired + private DataSource dataSource; + + @Autowired + private SysUserService sysUserService; + + @Autowired + private SysConfigService sysConfigService; + public void removeData() { String assetPing = "delete from asset_ping"; sqlDao.execute(assetPing); @@ -140,7 +173,8 @@ public class SqlHandler { String sysMenu = "ALTER TABLE `sys_menu` \r\n" + "ADD COLUMN `description` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,\r\n" - + "ADD COLUMN `icon` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'nz-icon nz-alert-add';"; + + "ADD COLUMN `icon` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'nz-icon nz-alert-add'," + + "ADD COLUMN `required` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '必要权限，如编辑按钮需要 勾选查看权限 填写内容为 sys_menu.id，多个逗号分隔 1,2';"; sqlDao.execute(sysMenu); String alertRule = "ALTER TABLE `alert_rule` \r\n" @@ -198,11 +232,11 @@ public class SqlHandler { + " `id` int(10) NOT NULL AUTO_INCREMENT,\r\n" + " `message_id` int(10) NOT NULL COMMENT '关联 alert_message.id',\r\n" + " `user_id` int(10) NOT NULL COMMENT '关联 sys_user.id',\r\n" - + " `method` varchar(128) NOT NULL COMMENT '通知方式 VARCHARemail 或 NOTIFICATION_SCRIPT.name',\r\n" + " `message_state` char(1) NOT NULL COMMENT '消息状态1: active2: expired',\r\n" + " `state` char(1) NOT NULL COMMENT '通知状态0:失败1:成功',\r\n" + " `error_msg` varchar(1024) NOT NULL DEFAULT '' COMMENT '发送错误信息',\r\n" + " `time` datetime NOT NULL COMMENT '发送时间',\r\n" + + " `method_id` int(10) NOT NULL COMMENT '通知方式id 关联ALERT_NOTIFICATION_METHOD.id',\r\n" + " PRIMARY KEY (`id`) USING BTREE\r\n" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"; @@ -672,9 +706,18 @@ public class SqlHandler { * asset_type_conf * monitor_event_log * sys_timezone + * @throws IOException + * @throws SQLException + * @throws ScriptException */ - public void initData() { - StringBuilder sb = new StringBuilder(); + public void initData() throws ScriptException, SQLException { + Resource classPathResource = new ClassPathResource("db/init.sql"); + ScriptUtils.executeSqlScript(dataSource.getConnection(), classPathResource); + // asset_brand表数据单独处理 + assetBrandService.handler(); + // asset_model表数据处理 前提先处理好brand表数据信息 + assetModelService.handler(); + /*StringBuilder sb = new StringBuilder(); sb.append("INSERT INTO `asset_field_group`(`id`, `name`, `remark`, `build_in`, `seq`) VALUES (1, 'default', 'Default meta group', '1', '');"); sb.append("INSERT INTO `alert_severity_conf`(`id`, `name`, `color`, `weight`, `remark`) VALUES (1, 'P1', '#f2866e', 1, '高级告警');"); sb.append("INSERT INTO `alert_severity_conf`(`id`, `name`, `color`, `weight`, `remark`) VALUES (2, 'P2', '#f89984', 2, '中级告警');"); @@ -971,16 +1014,15 @@ public class SqlHandler { + "INSERT INTO `sys_config`(`param_key`, `param_value`, `status`, `remark`) VALUES ('terminal_telnet_pin_tip', 'assword:', 1, '默认：assword:');\r\n" + "INSERT INTO `sys_config`(`param_key`, `param_value`, `status`, `remark`) VALUES ('terminal_telnet_user_tip', 'ogin:', 1, '默认：ogin:');\r\n" + "INSERT INTO `sys_config`(`param_key`, `param_value`, `status`, `remark`) VALUES ('terminal_timeout', '30', 1, '默认：30，单位：minute');\r\n" + + "INSERT INTO `sys_config`(`param_key`, `param_value`, `status`, `remark`) VALUES ('snmp_trap_listen_port', '160', 1, 'snmp trap接收端口');\r\n" + "update sys_config set param_key =\"default_scrape_interval\" where param_key=\"scrape_interval\";\r\n" + "update sys_config set param_key =\"default_scrape_timeout\" where param_key=\"scrape_timeout\";\r\n" + + "update sys_config set param_value =\"Asia/Almaty\" where param_key=\"timezone\";\r\n" ); // 修改sys_user表数据 初始化name字段内容 sb.append("update sys_user set name = username;"); sqlDao.execute(sb.toString()); - // asset_brand表数据单独处理 - assetBrandService.handler(); - // asset_model表数据处理 前提先处理好brand表数据信息 - assetModelService.handler(); + */ } public void transferData() { @@ -998,5 +1040,61 @@ public class SqlHandler { // 图表相关数据同步 chartService.handler(); + // 将原来数据库的数据数据还原 + this.dataRestore(); + } + + public void dataRestore() { + StringBuilder sb =new StringBuilder(); + // sys_user表数据还原 + List users = sysUserService.queryNewUsers(); + List oldUsers = sysUserService.queryOldUsers(); + Map userIdAndEntity = users.stream().collect(Collectors.toMap(SysUserEntity::getId, Function.identity())); + for(SysUserEntity user : oldUsers) { + SysUserEntity sysUserEntity = userIdAndEntity.get(user.getUserId()); + if(ToolUtil.isNotEmpty(sysUserEntity)) { + sb.append("update sys_user set id='"+user.getUserId()+"',username='"+user.getUsername()+"',pin='" + +user.getPassword()+"',salt='"+user.getSalt()+"',email='"+user.getEmail()+"',status='" + +user.getStatus()+"',lang='"+user.getLang() + +"',source='"+user.getSource()+"',name='"+user.getUsername()+"';"); + }else { + sb.append("insert into sys_user (id,username,pin,salt,email,status," + + "lang,source,name) values('"+user.getUserId()+"','"+user.getUsername()+"','"+user.getPassword() + +"','"+user.getSalt()+"','"+user.getEmail()+"','"+user.getStatus() + +"','"+user.getLang()+"','"+user.getSource()+"','"+user.getUsername()+"');"); + } + } + // + sqlDao.execute(sb.toString()); + + // sys_config表数据 + List newDatas = sysConfigService.list(); + List oldDatas = sysConfigService.querySysConfigEntitys(); + Map oldDataMap = oldDatas.stream().collect(Collectors.toMap(SysConfigEntity::getParamKey, SysConfigEntity::getParamValue)); + for(SysConfigEntity data : newDatas) { + if(data.getParamKey().equals("default_scrape_interval")) { + data.setParamValue(oldDataMap.get("scrape_interval")); + }else if(data.getParamKey().equals("default_scrape_timeout")) { + data.setParamValue(oldDataMap.get("scrape_timeout")); + }else if(data.getParamKey().equals("timezone")) { + data.setParamValue("Asia/Shanghai"); + }else { + String value = oldDataMap.get(data.getParamKey()); + if(value!=null) { + data.setParamValue(value); + } + } + } + sysConfigService.updateBatchById(newDatas); + + // prom_server snmp_mib link project_topo表数据同步 + StringBuilder restoreData = new StringBuilder(); + restoreData.append("INSERT INTO prom_server (id, dc_id, `host`, `port`, type, `status`, check_time,token ) SELECT id, idc_id,`host`,`port`,type,`status`,check_time,\"\" FROM prom_server_copy;\r\n" + + " INSERT INTO project_topo (id, project_id, topo,update_at,update_by) SELECT id, project_id, topo,update_at,update_by from project_topo_copy;\r\n" + + " INSERT INTO project_topo_icon (id,name,bytes,type,unit) select id,name,bytes,type,-1 from project_topo_icon_copy where id > 4;\r\n" + + " INSERT INTO snmp_mib (id,name,file_name,content,models,remark,update_by,update_at,tree) select id,name,file_name,content,models,remark,update_by,update_at,tree from snmp_mib_copy;\r\n" + + " INSERT INTO link (id,name,create_by,url,build_in,weight) select id,name,create_by,url,build_in,0 from link_copy;" + + " INSERT INTO cabinet (id,name,dc_id,u_size,remark,seq,x,y) select id,name,idc_id,u_size,remark,seq,x,y from cabinet_copy;"); + sqlDao.execute(restoreData.toString()); } } diff --git a/src/main/java/com/nis/service/AlertRuleService.java b/src/main/java/com/nis/service/AlertRuleService.java index 03e3fb9..70a6557 100644 --- a/src/main/java/com/nis/service/AlertRuleService.java +++ b/src/main/java/com/nis/service/AlertRuleService.java @@ -10,6 +10,7 @@ import com.nis.entity.AlertRuleEntity; public interface AlertRuleService extends IService { - + + List queryAllDatas(); } diff --git a/src/main/java/com/nis/service/ModuleService.java b/src/main/java/com/nis/service/ModuleService.java index 73a9e38..d96d18a 100644 --- a/src/main/java/com/nis/service/ModuleService.java +++ b/src/main/java/com/nis/service/ModuleService.java @@ -1,5 +1,7 @@ package com.nis.service; +import java.util.List; + import com.baomidou.mybatisplus.extension.service.IService; import com.nis.entity.Dc; import com.nis.entity.Idc; @@ -8,4 +10,5 @@ import com.nis.entity.Module; public interface ModuleService extends IService { + List querySnmpDatas(); } \ No newline at end of file diff --git a/src/main/java/com/nis/service/SysConfigService.java b/src/main/java/com/nis/service/SysConfigService.java new file mode 100644 index 0000000..30b502f --- /dev/null +++ b/src/main/java/com/nis/service/SysConfigService.java @@ -0,0 +1,26 @@ +/** + + * + + * + + */ + +package com.nis.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nis.entity.SysConfigEntity; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 系统配置信息 + * + + */ +public interface SysConfigService extends IService { + + List querySysConfigEntitys(); +} diff --git a/src/main/java/com/nis/service/SysDictService.java b/src/main/java/com/nis/service/SysDictService.java index 5990bf6..54ed78f 100644 --- a/src/main/java/com/nis/service/SysDictService.java +++ b/src/main/java/com/nis/service/SysDictService.java @@ -21,5 +21,6 @@ import java.util.Map; */ public interface SysDictService extends IService { + List queryDatas(String type); } diff --git a/src/main/java/com/nis/service/SysUserService.java b/src/main/java/com/nis/service/SysUserService.java new file mode 100644 index 0000000..d1d2145 --- /dev/null +++ b/src/main/java/com/nis/service/SysUserService.java @@ -0,0 +1,28 @@ +/** + + * + + * + + */ + +package com.nis.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nis.entity.SysUserEntity; + +import java.util.List; +import java.util.Map; + + +/** + * 系统用户 + * + + */ +public interface SysUserService extends IService { + + List queryOldUsers(); + + List queryNewUsers(); +} diff --git a/src/main/java/com/nis/service/impl/AlertMessageServiceImpl.java b/src/main/java/com/nis/service/impl/AlertMessageServiceImpl.java index 51af684..98732b2 100644 --- a/src/main/java/com/nis/service/impl/AlertMessageServiceImpl.java +++ b/src/main/java/com/nis/service/impl/AlertMessageServiceImpl.java @@ -1,6 +1,7 @@ package com.nis.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nis.dao.AlertMessageDao; import com.nis.entity.AlertMessageActiveEntity; @@ -22,8 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - - @Service("alertMessageService") public class AlertMessageServiceImpl extends ServiceImpl implements AlertMessageService { @@ -40,7 +39,7 @@ public class AlertMessageServiceImpl extends ServiceImpl rules = alertRuleService.list(); + List rules = alertRuleService.queryAllDatas(); for(AlertRuleEntity rule : rules) { if(rule.getSeverity().equals("P1")) { rule.setSeverityId(1); @@ -51,8 +50,10 @@ public class AlertMessageServiceImpl extends ServiceImpl()); if(ToolUtil.isNotEmpty(rules)) { - alertRuleService.updateBatchById(rules); + alertRuleService.saveBatch(rules); } List messages = this.list(); @@ -74,6 +75,7 @@ public class AlertMessageServiceImpl extends ServiceImpl implements AlertRuleService { + @Override + public List queryAllDatas() { + return this.baseMapper.selectAllDatas(); + } + } diff --git a/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java b/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java index 5cf0927..241923a 100644 --- a/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java +++ b/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java @@ -91,7 +91,7 @@ public class AssetAssetServiceImpl extends ServiceImpl models = modelService.list(); Map modelAndType = models.stream().collect(Collectors.toMap(Model::getId, Model::getTypeCode)); - List sysDicts = sysDictService.list(new QueryWrapper().lambda().eq(SysDictEntity::getType, "assetType")); + List sysDicts = sysDictService.queryDatas("assetType"); Map dictAndType = sysDicts.stream().collect(Collectors.toMap(SysDictEntity::getCode, SysDictEntity::getValue)); Map modelIdAndTypeName = new HashMap(); for(Integer key : modelAndType.keySet()) { diff --git a/src/main/java/com/nis/service/impl/AssetBrandServiceImpl.java b/src/main/java/com/nis/service/impl/AssetBrandServiceImpl.java index c6af484..c6ceb17 100644 --- a/src/main/java/com/nis/service/impl/AssetBrandServiceImpl.java +++ b/src/main/java/com/nis/service/impl/AssetBrandServiceImpl.java @@ -37,7 +37,7 @@ public class AssetBrandServiceImpl extends ServiceImpl brands = sysDictService.list(new QueryWrapper().lambda().eq(SysDictEntity::getType, "vendor")); + List brands = sysDictService.queryDatas("vendor"); List assetBrands = new ArrayList(); for(SysDictEntity brand : brands) { diff --git a/src/main/java/com/nis/service/impl/DcServiceImpl.java b/src/main/java/com/nis/service/impl/DcServiceImpl.java index 49622f0..67f8b43 100644 --- a/src/main/java/com/nis/service/impl/DcServiceImpl.java +++ b/src/main/java/com/nis/service/impl/DcServiceImpl.java @@ -29,6 +29,7 @@ public class DcServiceImpl extends ServiceImpl implements DcService { for(Idc idc : idcs) { Dc dc = new Dc(); + dc.setId(idc.getId()); dc.setName(idc.getName()); dc.setLocation(idc.getLocation()); dc.setTel(idc.getTel()); diff --git a/src/main/java/com/nis/service/impl/EndpointServiceImpl.java b/src/main/java/com/nis/service/impl/EndpointServiceImpl.java index 21ae7ec..f7328ab 100644 --- a/src/main/java/com/nis/service/impl/EndpointServiceImpl.java +++ b/src/main/java/com/nis/service/impl/EndpointServiceImpl.java @@ -76,6 +76,9 @@ public class EndpointServiceImpl extends ServiceImpl impl BeanUtil.copyProperties(project, monitorProject); monitorProjects.add(monitorProject); } + + // 先清空表 + monitorProjectService.remove(new QueryWrapper()); if(ToolUtil.isNotEmpty(monitorProjects)) { monitorProjectService.saveBatch(monitorProjects); } @@ -83,7 +86,7 @@ public class EndpointServiceImpl extends ServiceImpl impl // 同步module数据 首先需要将module中snmp类型的新增凭证 List snmpCredentials = new ArrayList(); - List snmpModules = moduleService.list(new QueryWrapper().eq("type", "snmp")); + List snmpModules = moduleService.querySnmpDatas(); Map moduleIdAndSnmpcredentialMap = new HashMap(); for(Module snmpModule : snmpModules) { String snmpParam = snmpModule.getSnmpParam(); @@ -157,7 +160,7 @@ public class EndpointServiceImpl extends ServiceImpl impl MonitorModule monitorModule = new MonitorModule(); monitorModule.setName(module.getName()); monitorModule.setId(module.getId()); - monitorModule.setProjectId(module.getId()); + monitorModule.setProjectId(module.getProjectId()); monitorModule.setRemark(module.getRemark()); monitorModule.setSeq(module.getSeq()); monitorModule.setBuildIn(module.getBuildIn()); diff --git a/src/main/java/com/nis/service/impl/ModuleServiceImpl.java b/src/main/java/com/nis/service/impl/ModuleServiceImpl.java index 7ec219f..c1d61a7 100644 --- a/src/main/java/com/nis/service/impl/ModuleServiceImpl.java +++ b/src/main/java/com/nis/service/impl/ModuleServiceImpl.java @@ -12,9 +12,16 @@ import com.nis.service.DcService; import com.nis.service.IdcService; import com.nis.service.ModuleService; +import java.util.List; + import org.springframework.stereotype.Service; @Service public class ModuleServiceImpl extends ServiceImpl implements ModuleService { + + @Override + public List querySnmpDatas() { + return this.baseMapper.selectSnmpDatas(); + } } diff --git a/src/main/java/com/nis/service/impl/SysConfigServiceImpl.java b/src/main/java/com/nis/service/impl/SysConfigServiceImpl.java new file mode 100644 index 0000000..7fe8a4f --- /dev/null +++ b/src/main/java/com/nis/service/impl/SysConfigServiceImpl.java @@ -0,0 +1,32 @@ +/** + + * + + * + + */ + +package com.nis.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nis.dao.SysConfigDao; +import com.nis.entity.SysConfigEntity; +import com.nis.service.SysConfigService; + +import org.springframework.stereotype.Service; + + +import java.util.*; + + +@Service("sysConfigService") +public class SysConfigServiceImpl extends ServiceImpl implements SysConfigService { + + @Override + public List querySysConfigEntitys() { + return this.baseMapper.selectSysConfigEntitys(); + } + + +} diff --git a/src/main/java/com/nis/service/impl/SysDictServiceImpl.java b/src/main/java/com/nis/service/impl/SysDictServiceImpl.java index 473c399..0c20769 100644 --- a/src/main/java/com/nis/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/nis/service/impl/SysDictServiceImpl.java @@ -26,4 +26,9 @@ import java.util.stream.Collectors; @Service("sysDictService") public class SysDictServiceImpl extends ServiceImpl implements SysDictService { + @Override + public List queryDatas(String type) { + return this.baseMapper.selectDatas(type); + } + } diff --git a/src/main/java/com/nis/service/impl/SysUserServiceImpl.java b/src/main/java/com/nis/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..93a3bcd --- /dev/null +++ b/src/main/java/com/nis/service/impl/SysUserServiceImpl.java @@ -0,0 +1,25 @@ +package com.nis.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nis.dao.SysUserDao; +import com.nis.entity.SysUserEntity; +import com.nis.service.SysUserService; + +import java.util.List; + +import org.springframework.stereotype.Service; + +@Service("sysUserService") +public class SysUserServiceImpl extends ServiceImpl implements SysUserService { + + @Override + public List queryOldUsers() { + return this.baseMapper.selectOldUsers(); + } + + @Override + public List queryNewUsers() { + return this.baseMapper.selectNewUsers(); + } + +} diff --git a/src/main/resources/mapper/AlertRuleDao.xml b/src/main/resources/mapper/AlertRuleDao.xml new file mode 100644 index 0000000..02b2450 --- /dev/null +++ b/src/main/resources/mapper/AlertRuleDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ModuleDao.xml b/src/main/resources/mapper/ModuleDao.xml new file mode 100644 index 0000000..5a8ffeb --- /dev/null +++ b/src/main/resources/mapper/ModuleDao.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/SysConfigDao.xml b/src/main/resources/mapper/SysConfigDao.xml new file mode 100644 index 0000000..8b2a67e --- /dev/null +++ b/src/main/resources/mapper/SysConfigDao.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/src/main/resources/mapper/SysDictDao.xml b/src/main/resources/mapper/SysDictDao.xml new file mode 100644 index 0000000..40a310d --- /dev/null +++ b/src/main/resources/mapper/SysDictDao.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/SysUserDao.xml b/src/main/resources/mapper/SysUserDao.xml new file mode 100644 index 0000000..9499793 --- /dev/null +++ b/src/main/resources/mapper/SysUserDao.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file