Commit 28bd039d by chenjunxiong

build(service):

parent 30b7ec6b
...@@ -19,6 +19,7 @@ import org.springframework.web.servlet.ModelAndView; ...@@ -19,6 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* @Description: pm_monitoring_device * @Description: pm_monitoring_device
...@@ -56,6 +57,11 @@ public class PmMonitoringDeviceController extends JeecgController<PmMonitoringDe ...@@ -56,6 +57,11 @@ public class PmMonitoringDeviceController extends JeecgController<PmMonitoringDe
return Result.OK(pageList); return Result.OK(pageList);
} }
@GetMapping("/listByFloorId")
public Result<List<PmMonitoringDevice>> listByFloorId(Long floorId) {
return null;
}
/** /**
* 添加 * 添加
* *
......
package org.jeecg.modules.demo.pm.service; package org.jeecg.modules.demo.pm.service;
import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice;
import java.util.List;
/** /**
* @Description: pm_monitoring_device * @Description: pm_monitoring_device
...@@ -10,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -10,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IPmMonitoringDeviceService extends IService<PmMonitoringDevice> { public interface IPmMonitoringDeviceService extends IService<PmMonitoringDevice> {
List<PmMonitoringDevice> listByFloorId(Long floorId);
} }
package org.jeecg.modules.demo.pm.service.impl; package org.jeecg.modules.demo.pm.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice; import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice;
import org.jeecg.modules.demo.pm.mapper.PmMonitoringDeviceMapper; import org.jeecg.modules.demo.pm.mapper.PmMonitoringDeviceMapper;
import org.jeecg.modules.demo.pm.service.IPmMonitoringDeviceService; import org.jeecg.modules.demo.pm.service.IPmMonitoringDeviceService;
import org.jeecg.pm.hikvision.sdk.client.HikvisionClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @Description: pm_monitoring_device * @Description: pm_monitoring_device
...@@ -20,6 +24,9 @@ import java.util.Date; ...@@ -20,6 +24,9 @@ import java.util.Date;
@Service @Service
public class PmMonitoringDeviceServiceImpl extends ServiceImpl<PmMonitoringDeviceMapper, PmMonitoringDevice> implements IPmMonitoringDeviceService { public class PmMonitoringDeviceServiceImpl extends ServiceImpl<PmMonitoringDeviceMapper, PmMonitoringDevice> implements IPmMonitoringDeviceService {
@Autowired
private HikvisionClient hikvisionClient;
@Override @Override
public boolean save(PmMonitoringDevice entity) { public boolean save(PmMonitoringDevice entity) {
entity.setId(IdWorker.getId()) entity.setId(IdWorker.getId())
...@@ -43,4 +50,12 @@ public class PmMonitoringDeviceServiceImpl extends ServiceImpl<PmMonitoringDevic ...@@ -43,4 +50,12 @@ public class PmMonitoringDeviceServiceImpl extends ServiceImpl<PmMonitoringDevic
.set(PmMonitoringDevice::getDeleted, true) .set(PmMonitoringDevice::getDeleted, true)
.set(PmMonitoringDevice::getModifyTime, new Date())); .set(PmMonitoringDevice::getModifyTime, new Date()));
} }
@Override
public List<PmMonitoringDevice> listByFloorId(Long floorId) {
new QueryWrapper<PmMonitoringDevice>()
.lambda()
.eq(PmMonitoringDevice::getFloor, floorId);
return null;
}
} }
...@@ -38,9 +38,9 @@ public class HikvisionBaseClient extends HikvisionAbstractClient { ...@@ -38,9 +38,9 @@ public class HikvisionBaseClient extends HikvisionAbstractClient {
/** /**
* 请求的Host头,该字段值必须是:openapi/service * 请求的Host头,该字段值必须是:openapi/service
*/ */
private final static String host = "172.16.16.2"; private final static String HOST = "172.16.16.2";
private final static String protocol = "http"; private final static String PROTOCOL = "http";
private final static String joiner = "://"; private final static String JOINER = "://";
private final String appKey; private final String appKey;
private final String secret; private final String secret;
private final String opUserUuid; private final String opUserUuid;
...@@ -88,7 +88,7 @@ public class HikvisionBaseClient extends HikvisionAbstractClient { ...@@ -88,7 +88,7 @@ public class HikvisionBaseClient extends HikvisionAbstractClient {
request.getBodyModel().setOpUserUuid(opUserUuid); request.getBodyModel().setOpUserUuid(opUserUuid);
} }
final URIBuilder uriBuilder = new URIBuilder( final URIBuilder uriBuilder = new URIBuilder(
new URI((protocol + joiner + host + request.getReqPath()))); new URI((PROTOCOL + JOINER + HOST + request.getReqPath())));
uriBuilder.setCharset(StandardCharsets.UTF_8); uriBuilder.setCharset(StandardCharsets.UTF_8);
uriBuilder.addParameter("token", createToken(request)); uriBuilder.addParameter("token", createToken(request));
if (request.getQueryModel() != null) { if (request.getQueryModel() != null) {
......
import com.chanjx.utils.StringUtils;
import org.jeecg.pm.hikvision.sdk.client.HikvisionBaseClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionBaseClient;
import org.jeecg.pm.hikvision.sdk.client.HikvisionClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionClient;
import org.jeecg.pm.hikvision.sdk.entity.body.base.res.HikvisionGetPlatSubsytem; import org.jeecg.pm.hikvision.sdk.entity.body.base.res.HikvisionGetPlatSubsytem;
...@@ -34,6 +35,9 @@ import org.jeecg.pm.hikvision.sdk.result.vss.preview.HikvisionPreviewParamByCame ...@@ -34,6 +35,9 @@ import org.jeecg.pm.hikvision.sdk.result.vss.preview.HikvisionPreviewParamByCame
import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetCamerasExResult; import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetCamerasExResult;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -152,4 +156,37 @@ public class HikvisionSdkTest { ...@@ -152,4 +156,37 @@ public class HikvisionSdkTest {
final HikvisionGetEventTypesRespsonse execute = CLIENT.execute(new HikvisionGetEventTypesRequest(hikvisionGetEventTypes)); final HikvisionGetEventTypesRespsonse execute = CLIENT.execute(new HikvisionGetEventTypesRequest(hikvisionGetEventTypes));
System.out.println(execute); System.out.println(execute);
} }
@Test
void name() throws UnsupportedEncodingException {
final String oct = "\\345\\215\\216\\344\\270\\272\\346\\211\\213\\346\\234\\272\\345\\272\\227\\345\\220\\216\\351\\227\\250";
final String[] splitOct = StringUtils.split(oct, "\\");
final List<String> octList = Arrays.asList(splitOct);
final char[] chars = new char[octList.size()];
for (int i = 0; i < octList.size(); i++) {
final int decimal = getDecimal(Integer.parseInt(octList.get(i)));
chars[i] = (char) decimal;
}
final String s = new String(chars);
System.out.println(new String(s.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
}
public static int getDecimal(int octal) {
//Declaring variable to store decimal number
int decimal = 0;
//Declaring variable to use in power
int n = 0;
//writing logic
while (true) {
if (octal == 0) {
break;
} else {
int temp = octal % 10;
decimal += temp * Math.pow(8, n);
octal = octal / 10;
n++;
}
}
return decimal;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment