cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 由于数据库插入数据异常回滚设备管理数据库代码
2. 添加启动任务和停止任务业务逻辑
This commit is contained in:
HuangXin 2020-04-28 16:32:48 +08:00
parent 456a4e8fbb
commit dbe7feb01c
12 changed files with 271 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -115,3 +115,4 @@ buildNumber.properties
!/src/main/resources/git.properties
basedir/
/.idea/
/phoenix_ddos_handle.iml

5
src/main/java/com/dispose/controller/AuthController.java
View File

@ -12,8 +12,6 @@ import com.dispose.service.UserAccountService;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.security.NoSuchAlgorithmException;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
@ -24,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.security.NoSuchAlgorithmException;
/**
* The type Auth controller.
*/

13
src/main/java/com/dispose/controller/DisposeNodeInfoController.java
View File

@ -24,12 +24,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
@ -40,6 +34,13 @@ import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* The type Dispose node info controller.
*/

7
src/main/java/com/dispose/controller/DisposeNodeManagerController.java
View File

@ -15,9 +15,6 @@ import com.dispose.service.DisposeNodeManager;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
@ -29,6 +26,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* The type Dispose node manager controller.
*/

17
src/main/java/com/dispose/controller/DisposeTaskController.java
View File

@ -19,13 +19,6 @@ import com.dispose.service.TaskService;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
@ -36,6 +29,14 @@ import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
* The type Dispose task controller.
*/
@ -74,6 +75,8 @@ public class DisposeTaskController {
StartTaskReq reqInfo = mr.getRequestObject(StartTaskReq.class);
StartTaskRsp rspInfo = new StartTaskRsp();
//taskService.createTask()
rspInfo.setTaskId(String.valueOf(reqInfo.getId()));
rspInfo.setStatus(err.getCode());
rspInfo.setMessage(err.getMsg());

36
src/main/java/com/dispose/manager/DisposeDeviceManager.java
View File

@ -4,42 +4,46 @@ import com.dispose.pojo.entity.DisposeDevice;
import java.util.List;
/**
* @author phoenix
* @date 2020年4月27日
* The interface Dispose device manager.
*/
public interface DisposeDeviceManager {
/**
* @param dd
* @return
* @Description: TODO(这里用一句话描述这个方法的作用)
* Save dispose device int.
*
* @param dd the dd
* @return the int
*/
int saveDisposeDevice(DisposeDevice dd);
/**
* @param ip
* @return
* @Description: TODO(这里用一句话描述这个方法的作用)
* Find dispose device by ip dispose device.
*
* @param ip the ip
* @return the dispose device
*/
DisposeDevice findDisposeDeviceByIp(String ip);
/**
* @param id
* @return
* @Description: TODO(这里用一句话描述这个方法的作用)
* Find dispose device by id dispose device.
*
* @param id the id
* @return the dispose device
*/
DisposeDevice findDisposeDeviceById(Long id);
/**
* @return
* @Description: TODO(这里用一句话描述这个方法的作用)
* Find all dispose device list.
*
* @return the list
*/
List<DisposeDevice> findAllDisposeDevice();
/**
* @param ip
* @return
* @Description: TODO(这里用一句话描述这个方法的作用)
* Del dispose device by ip int.
*
* @param ip the ip
* @return the int
*/
int delDisposeDeviceByIp(String ip);

44
src/main/java/com/dispose/mapper/DisposeDeviceMapper.java
View File

@ -8,5 +8,49 @@ import tk.mybatis.mapper.common.MySqlMapper;
* The interface Dispose device mapper.
*/
public interface DisposeDeviceMapper extends Mapper<DisposeDevice>, MySqlMapper<DisposeDevice> {
/**
* Add new dispose device.
*
* @param dev the dev
*/
void addNewDisposeDevice(DisposeDevice dev);
/**
* Is device exists by ip int.
*
* @param ipAddr the ip addr
* @return the int
*/
int isDeviceExistsByIp(String ipAddr);
/**
* Is device exists by id int.
*
* @param id the id
* @return the int
*/
int isDeviceExistsById(Long id);
/**
* Gets device by ip.
*
* @param ipAddr the ip addr
* @return the device by ip
*/
DisposeDevice getDeviceByIp(String ipAddr);
/**
* Gets device by id.
*
* @param id the id
* @return the device by id
*/
DisposeDevice getDeviceById(Long id);
/**
* Del dispose device by ip.
*
* @param ipAddr the ip addr
*/
void delDisposeDeviceByIp(String ipAddr);
}

2
src/main/java/com/dispose/pojo/vo/task/StartTaskReq.java
View File

@ -18,7 +18,7 @@ public class StartTaskReq {
/**
* The Id.
*/
private int id;
private Integer id;
/**
* The Type.
*/

8
src/main/java/com/dispose/service/DisposeNodeManager.java
View File

@ -70,12 +70,4 @@ public interface DisposeNodeManager {
* @return the dispose device
*/
DisposeDevice getDisposeDevice(String ipAddr, DeviceCapacity capacity);
/**
* 判断设备是否存在
*
* @param ip
* @return
*/
boolean isExistsDisposeDeviceByIp(String ip);
}

46
src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java
View File

@ -5,7 +5,7 @@ import com.dispose.common.ErrorCode;
import com.dispose.common.IPAddrType;
import com.dispose.dispose.DeviceRouter;
import com.dispose.dispose.DisposeEntryManager;
import com.dispose.manager.DisposeDeviceManager;
import com.dispose.mapper.DisposeDeviceMapper;
import com.dispose.pojo.entity.DisposeDevice;
import com.dispose.pojo.po.DisposeDeviceCapacity;
import com.dispose.pojo.po.MReturnType;
@ -18,41 +18,34 @@ import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* The type Dispose node manager.
*/
@Service
@Slf4j
public class DisposeNodeManagerImpl implements DisposeNodeManager {
/**
* The Dispose dev map.
*/
private final ConcurrentHashMap<String, DisposeDevice> disposeDevMap = new ConcurrentHashMap<>();
/**
* The Dispose device mapper.
*/
@Resource
private DisposeDeviceManager disposeDeviceManager;
private DisposeDeviceMapper disposeDeviceMapper;
/**
* The User account service.
*/
@Resource
private UserAccountService userAccountService;
@Override
public boolean isExistsDisposeDeviceByIp(String ip) {
// TODO Auto-generated method stub
log.info("查询该处置设备是否存在 {}", ip);
return disposeDeviceManager.findDisposeDeviceByIp(ip) != null;
}
/**
* Load dispose node from db.
*/
@Override
public void loadDisposeNodeFromDB() {
List<DisposeDevice> devList = disposeDeviceManager.findAllDisposeDevice();
List<DisposeDevice> devList = disposeDeviceMapper.selectAll();
if (devList == null) {
return;
@ -80,7 +73,8 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
*/
@Override
public ErrorCode delDisposeDeviceById(Long id) {
DisposeDevice dev = disposeDeviceManager.findDisposeDeviceById(id);
DisposeEntryManager dp;
DisposeDevice dev = disposeDeviceMapper.getDeviceById(id);
if (dev == null) {
return ErrorCode.ERR_NOSUCHDEVICE;
@ -97,7 +91,9 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
*/
@Override
public ErrorCode delDisposeDeviceByIp(String ipAddr) {
if (!isExistsDisposeDeviceByIp(ipAddr)
DisposeEntryManager dp;
if (disposeDeviceMapper.isDeviceExistsByIp(ipAddr) == 0
|| !disposeDevMap.containsKey(ipAddr)) {
return ErrorCode.ERR_NOSUCHDEVICE;
}
@ -108,7 +104,7 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
return ErrorCode.ERR_NOSUCHDEVICE;
}
disposeDeviceManager.delDisposeDeviceByIp(ipAddr);
disposeDeviceMapper.delDisposeDeviceByIp(ipAddr);
disposeDevMap.remove(ipAddr);
return ErrorCode.ERR_OK;
@ -131,7 +127,7 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
return new MReturnType<>(ErrorCode.ERR_NOSUCHDEVICE, String.valueOf(-1));
}
DisposeDevice dbDev = disposeDeviceManager.findDisposeDeviceByIp(dev.getIpAddr());
DisposeDevice dbDev = disposeDeviceMapper.getDeviceByIp(dev.getIpAddr());
if (dbDev != null) {
return new MReturnType<>(ErrorCode.ERR_DEVICEEXISTS, String.valueOf(dbDev.getId()));
@ -149,7 +145,7 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
dev.setDevInfo(dp.getDeviceInfo());
disposeDeviceManager.saveDisposeDevice(dev);
disposeDeviceMapper.addNewDisposeDevice(dev);
disposeDevMap.put(dev.getIpAddr(), dev);
return new MReturnType<>(ErrorCode.ERR_OK, dev.getId().toString());
@ -228,15 +224,15 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
*/
private boolean isIpInRange(DisposeDeviceCapacity cap, String ipAddr) {
try {
if (IPAddrType.getIpAddrType(ipAddr) == IPAddrType.IPV4_TYPE) {
for (String s : cap.getProtectIpV4()) {
if (IPAddrType.ipInRange(s, ipAddr)) {
if(IPAddrType.getIpAddrType(ipAddr) == IPAddrType.IPV4_TYPE) {
for(String s : cap.getProtectIpV4()) {
if(IPAddrType.ipInRange(s, ipAddr)) {
return true;
}
}
} else if (IPAddrType.getIpAddrType(ipAddr) == IPAddrType.IPV6_TYPE) {
for (String s : cap.getProtectIpV6()) {
if (IPAddrType.ipInRange(s, ipAddr)) {
} else if(IPAddrType.getIpAddrType(ipAddr) == IPAddrType.IPV6_TYPE) {
for(String s : cap.getProtectIpV6()) {
if(IPAddrType.ipInRange(s, ipAddr)) {
return true;
}
}
@ -263,7 +259,7 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
.filter(f -> f.getCapacity() == capacity.getCode())
.collect(Collectors.toList());
if (capList.stream().anyMatch(k -> isIpInRange(k, ipAddr))) {
if(capList.stream().anyMatch(k -> isIpInRange(k, ipAddr))) {
return dev;
}
}

26
src/main/java/com/dispose/service/impl/TaskServiceImpl.java
View File

@ -14,13 +14,14 @@ import com.dispose.service.DisposeNodeManager;
import com.dispose.service.TaskService;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* The type Task service.
@ -119,6 +120,7 @@ public class TaskServiceImpl implements TaskService {
*/
@Override
public ErrorCode startTask(Long taskId) {
ErrorCode err = ErrorCode.ERR_OK;
TaskInfoDetail task = taskCacheManager.getTaskById(taskId);
if (task == null) {
@ -127,23 +129,27 @@ public class TaskServiceImpl implements TaskService {
DisposeEntryManager dp = getDisposeDeviceHandle(task);
if (dp == null) {
return ErrorCode.ERR_NOSUCHDEVICE;
}
if (taskIsExpired(task)) {
err = dp.stopDispose(task.getDisposeIp(), DeviceCapacity.values()[task.getType()]);
if (err == ErrorCode.ERR_OK) {
taskCacheManager.upgradeTaskStatus(taskId, DisposeTaskStatus.TASK_FINISH.getCode());
disposeTaskMapper.changeTaskCurrentStatus(taskId, DisposeTaskStatus.TASK_FINISH.getCode());
if (dp != null) {
asyncService.asyncStopDisposeDeviceTask(dp, task.getDisposeIp(),
DeviceCapacity.values()[task.getType()]);
}
} else if (!taskIsRunning(task)) {
err = dp.runDispose(task.getDisposeIp(), DeviceCapacity.values()[task.getType()]);
if (err == ErrorCode.ERR_OK) {
taskCacheManager.upgradeTaskStatus(taskId, DisposeTaskStatus.TASK_RUNNING.getCode());
disposeTaskMapper.changeTaskCurrentStatus(taskId, DisposeTaskStatus.TASK_RUNNING.getCode());
if (dp != null) {
asyncService.asyncStartDisposeDeviceTask(dp, task.getDisposeIp(),
DeviceCapacity.values()[task.getType()]);
}
}
return ErrorCode.ERR_OK;
return err;
}
/**

53
src/main/resources/mappers/DisposeDevice.xml Normal file
View File

@ -0,0 +1,53 @@
<?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.dispose.mapper.DisposeDeviceMapper">
<insert id="addNewDisposeDevice" useGeneratedKeys="true" keyProperty="id" parameterType="com.dispose.pojo.entity.DisposeDevice">
INSERT IGNORE INTO
dispose_device(ipAddr, type,
areaCode, name, manufacturer,
model, version, readme, status)
VALUES
(#{ipAddr}, #{type},
#{areaCode}, #{name}, #{manufacturer},
#{model}, #{version}, #{readme}, 0)
</insert>
<select id="getDeviceByIp" resultType="com.dispose.pojo.entity.DisposeDevice" parameterType="java.lang.String">
SELECT * FROM dispose_device
WHERE
ipAddr = #{ipAddr}
</select>
<select id="getDeviceById" resultType="com.dispose.pojo.entity.DisposeDevice" parameterType="java.lang.Long">
SELECT * FROM dispose_device
WHERE
id = #{id}
</select>
<select id="isDeviceExistsByIp" resultType="java.lang.Integer">
SELECT COUNT(*) FROM dispose_device
WHERE
ipAddr = #{ipAddr}
</select>
<select id="isDeviceExistsById" resultType="java.lang.Integer">
SELECT COUNT(*) FROM dispose_device
WHERE
id = #{id}
</select>
<delete id="delDisposeDeviceByIp" parameterType="java.lang.String">
DELETE
dispose_device
FROM
dispose_device
WHERE
dispose_device.ipAddr = #{ipAddr}
</delete>
<delete id="delDisposeDeviceById" parameterType="java.lang.Long">
DELETE
dispose_device
FROM
dispose_device
WHERE
dispose_device.id = #{id}
</delete>
</mapper>