Commit 09dc7f7f authored by linruibiao's avatar linruibiao

接口编写

parent 647fcdcb
......@@ -59,6 +59,8 @@ public class BaseRestController {
protected String variableRealTimeDataList;
@Value("${dc_client.interfaces.filedValue}")
protected String filedValue;
@Value("${dc_client.interfaces.send}")
protected String send;
......
package com.syc.slm.slmbi.controller;
import com.google.common.collect.Maps;
import com.google.gson.reflect.TypeToken;
import com.syc.slm.common.core.util.R;
import com.syc.slm.common.core.util.RestTemplateUtils;
import com.syc.slm.slmbi.entity.CurrentUser;
import com.syc.slm.slmbi.service.DeptService;
import com.syc.slm.slmbi.vo.DeptVo;
......@@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
* slm-bi
......@@ -40,4 +44,16 @@ public class DeptController extends BaseRestController{
return deptService.selectPositionList(dcClientHost + deptListUrl, currentUser.getToken(), appId, deptName);
});
}
@GetMapping("/base")
@ApiOperation("部门查询")
public R<List<DeptVo>> base(HttpServletRequest request, @PathVariable String appId) {
return call(() -> {
Map<String,String> uriVariables = Maps.newHashMap();
uriVariables.put("appId",appId);
String uri = dcClientHost+"/{appId}/base";
RestTemplateUtils.get(uri, new TypeToken<R<List<DeptVo>>>() {}.getType(),uriVariables );
return null;
});
}
}
......@@ -133,7 +133,7 @@ public class VariableController extends BaseRestController{
public R<Object> send(HttpServletRequest request,@PathVariable String appId,@RequestBody VariableSendDTO sendDTO) {
return call(() -> {
CurrentUser currentUser = getCurrentUser(request);
variableService.send(sendDTO, currentUser,dcClientHost + deptsRoles);
variableService.send(sendDTO, currentUser,dcClientHost + send);
});
}
}
package com.syc.slm.slmbi.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Map;
/**
* 创建时间:2019-03-21
* <p>修改时间:2019-03-21
* <p>类说明:TOTO
*
* @author luke
* @version 1.0
*/
@Data
public class SendDeviceCommandsDTO {
@ApiModelProperty(value = "token",required = true)
private String token;
@ApiModelProperty(value = "appId",required = true)
private String appId;
@ApiModelProperty(value = "key 是变量得id , value 是下发得值",required = true)
private Map<String, Object> commandMap;
}
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* slm-bi
......@@ -19,10 +20,10 @@ public class VariableSendDTO {
private String accessType;
@ApiModelProperty(value = "权限控制", required = true)
private List<CustomPermissionDTO> permissions;
@ApiModelProperty(value = "变量id", required = true)
private String variableId;
@ApiModelProperty(value = "设备id", required = true)
private String equipmentId;
@ApiModelProperty(value = "权限为私有的时候需要把创建人传入", required = true)
private String userId;
@ApiModelProperty(value = "key 是变量得id , value 是下发得值",required = true)
private Map<String, Object> commandMap;
}
......@@ -2,6 +2,7 @@ package com.syc.slm.slmbi.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
......@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -194,12 +196,7 @@ public class VariableServiceImpl implements VariableService {
if (StringUtils.isBlank(sendDTO.getAccessType())) {
throw new SysException("请传入访问类型");
}
if (StringUtils.isBlank(sendDTO.getEquipmentId())) {
throw new SysException("请传入设备id");
}
if (StringUtils.isBlank(sendDTO.getVariableId())) {
throw new SysException("请传入变量id");
}
if(AccessType.PRIVATE.value.equals(sendDTO.getAccessType())){
if (StringUtils.isBlank(sendDTO.getUserId())) {
throw new SysException("访问类型为私有,请传入创建人");
......@@ -247,8 +244,29 @@ public class VariableServiceImpl implements VariableService {
}
}
//# todo 准备下发接口
}
//# todo 准备下发接口
Map<String, Object> commandMap = sendDTO.getCommandMap();
if(CollectionUtils.isEmpty(commandMap)){
throw new SysException("变量值必传");
}
if(commandMap.keySet().stream().anyMatch(StringUtils::isBlank)){
throw new SysException("变量id 不能为空");
}
if(commandMap.values().stream().anyMatch(ObjectUtils::isEmpty)){
throw new SysException("变量对应得value 值不能为空");
}
SendDeviceCommandsDTO dto = new SendDeviceCommandsDTO();
dto.setCommandMap(commandMap);
dto.setToken(currentUser.getToken());
dto.setAppId(currentUser.getAppId());
Map<String, String> uriVariables = Maps.newHashMap();
uriVariables.put("appId", currentUser.getAppId());
RestTemplateUtils.post(uri,dto, new TypeToken<R<List<Map<String, Object>>>>() {}.getType(), uriVariables);
}
private R<Map<String,String>> setDeptAndRole(CurrentUser user,String uri){
......
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