Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
xuyang
2023-06-25 15:30:07 +08:00
parent fc6299c6de
commit 75f5e8b464
15 changed files with 100 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataArrayFeignClient.java
View File

@@ -1,19 +1,11 @@
package com.njcn.csdevice.api;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.api.fallback.DataArrayFeignClientFallbackFactory;
import com.njcn.csdevice.pojo.po.CsDataArray;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
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;
@@ -36,6 +28,4 @@ public interface DataArrayFeignClient {
@PostMapping("/getDataArrayById")
HttpResult<List<CsDataArray>> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name);
}

1
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataArrayFeignClientFallbackFactory.java
View File

@@ -7,7 +7,6 @@ import com.njcn.csdevice.api.DataArrayFeignClient;
import com.njcn.csdevice.pojo.po.CsDataArray;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import com.njcn.csdevice.utils.CsDeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataArray.java
View File

@@ -73,10 +73,4 @@ public class CsDataArray extends BaseEntity {
*/
private String phase;
/**
* influxdb表名
*/
private String classId;
}

2
cs-device/cs-device-boot/pom.xml
View File

@@ -102,7 +102,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.2.2</version>
<executions>
<!--执行mvn package,即执行 mvn clean package docker:build-->
<execution>

26
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java
View File

@@ -69,19 +69,19 @@ public class CsDataArrayController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/getDataArrayById")
// @ApiOperation("获取详细数据(id)")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pid", value = "数据集id", required = true),
// @ApiImplicitParam(name = "name", value = "名称", required = true)
// })
// @Deprecated
// public HttpResult<List<CsDataArray>> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name){
// String methodDescribe = getMethodDescribe("getDataArrayById");
// List<CsDataArray> list = csDataArrayService.getDataArrayById(pid, name);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getDataArrayById")
@ApiOperation("获取详细数据(id)")
@ApiImplicitParams({
@ApiImplicitParam(name = "pid", value = "数据集id", required = true),
@ApiImplicitParam(name = "name", value = "名称", required = true)
})
@Deprecated
public HttpResult<List<CsDataArray>> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name){
String methodDescribe = getMethodDescribe("getDataArrayById");
List<CsDataArray> list = csDataArrayService.getDataArrayById(pid, name);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java
View File

@@ -42,7 +42,6 @@ public interface ICsDataArrayService extends IService<CsDataArray> {
*/
List<CsDataArray> getGroupData(String dataSet);
// List<CsDataArray> getDataArrayById(String pid, String name);
List<CsDataArray> getDataArrayById(String pid, String name);
}

8
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
View File

@@ -120,10 +120,10 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
return this.baseMapper.getGroupData(dataSet);
}
// @Override
// public List<CsDataArray> getDataArrayById(String pid, String name) {
// return this.lambdaQuery().eq(CsDataArray::getPid,pid).eq(CsDataArray::getName,name).list();
// }
@Override
public List<CsDataArray> getDataArrayById(String pid, String name) {
return this.lambdaQuery().eq(CsDataArray::getPid,pid).eq(CsDataArray::getName,name).list();
}
}