组态功能开发

This commit is contained in:
2023-06-02 11:42:19 +08:00
parent bf2a0ea480
commit 63c10fb8b5
40 changed files with 823 additions and 76 deletions

View File

@@ -1,13 +1,25 @@
package com.njcn.csdevice.controller.Equipment;
import com.njcn.common.pojo.annotation.OperateInfo;
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.pojo.po.CsDataArray;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import com.njcn.csdevice.service.ICsDataArrayService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
import java.util.List;
/**
* <p>
@@ -20,9 +32,44 @@ import com.njcn.web.controller.BaseController;
@Slf4j
@RestController
@RequestMapping("/csDataArray")
@Api(tags = "终端指标集")
@Api(tags = "终端详细数据")
@AllArgsConstructor
public class CsDataArrayController extends BaseController {
private final ICsDataArrayService csDataArrayService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getArrayBySet")
@ApiOperation("根据数据集获取详细数据")
@ApiImplicitParam(name = "dataSetList", value = "数据集集合", required = true)
public HttpResult<List<CsDataArray>> getArrayBySet(@RequestBody List<CsDataSet> dataSetList){
String methodDescribe = getMethodDescribe("getArrayBySet");
List<CsDataArray> list = csDataArrayService.getArrayBySet(dataSetList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getDataArray")
@ApiOperation("获取详细数据")
@ApiImplicitParam(name = "dataSetList", value = "数据集集合", required = true)
public HttpResult<List<LineTargetVO>> getDataArray(@RequestBody List<String> dataSetList){
String methodDescribe = getMethodDescribe("getDataArray");
List<LineTargetVO> list = csDataArrayService.getDataArray(dataSetList);
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)
})
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);
}
}

View File

@@ -1,13 +1,26 @@
package com.njcn.csdevice.controller.Equipment;
import com.njcn.common.pojo.annotation.OperateInfo;
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.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import com.njcn.csdevice.service.ICsDataSetService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
import java.util.List;
/**
* <p>
@@ -24,5 +37,27 @@ import com.njcn.web.controller.BaseController;
@AllArgsConstructor
public class CsDataSetController extends BaseController {
private final ICsDataSetService csDataSetService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getSetByModelId")
@ApiOperation("根据模板Id获取数据集")
@ApiImplicitParam(name = "modelId", value = "模板id", required = true)
public HttpResult<List<CsDataSet>> getSetByModelId(@RequestParam("modelId") String modelId){
String methodDescribe = getMethodDescribe("getSetByModelId");
List<CsDataSet> list = csDataSetService.findDataSetByModelId(modelId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getDataSet")
@ApiOperation("获取数据集")
@ApiImplicitParam(name = "modelId", value = "模板id", required = true)
public HttpResult<List<LineTargetVO>> getDataSet(@RequestParam("modelId") String modelId){
String methodDescribe = getMethodDescribe("getDataSet");
List<LineTargetVO> list = csDataSetService.getDataSet(modelId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

View File

@@ -95,12 +95,19 @@ public class DevModelController extends BaseController {
@ApiImplicitParam(name = "time", value = "时间", required = true)
})
public HttpResult<CsDevModelPO> findModel(@RequestParam("devType") String devType,@RequestParam("version") String version,@RequestParam("time") String time){
System.out.println(devType);
System.out.println(version);
System.out.println(time);
String methodDescribe = getMethodDescribe("findModel");
CsDevModelPO csDevModelPo = csDevModelService.findModel(devType,version,time);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDevModelPo, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getModelById")
@ApiOperation("根据模板Id获取模板数据")
@ApiImplicitParam(name = "id", value = "模板id", required = true)
public HttpResult<CsDevModelPO> getModelById(@RequestParam("id") String id){
String methodDescribe = getMethodDescribe("getDataById");
CsDevModelPO po = csDevModelService.getModelById(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
}
}

View File

@@ -19,10 +19,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -80,6 +77,14 @@ public class DevModelRelationController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getModelByDevId")
@ApiOperation("根据装置Id查询模板")
@ApiImplicitParam(name = "devId", value = "装置id", required = true)
public HttpResult<CsDevModelRelationPO> getModelByDevId(@RequestParam("devId") String devId){
String methodDescribe = getMethodDescribe("getModelByDevId");
CsDevModelRelationPO po = csDevModelRelationService.findModelByDevId(devId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
}
}