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-02 11:42:19 +08:00
parent bf2a0ea480
commit 63c10fb8b5
40 changed files with 823 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/CsDataArrayController.java
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);
}
}

39
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/CsDataSetController.java
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);
}
}

13
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/DevModelController.java
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);
}
}

15
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/DevModelRelationController.java
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);
}
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java
View File

@@ -2,6 +2,10 @@ package com.njcn.csdevice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.csdevice.pojo.po.CsDataArray;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +17,6 @@ import com.njcn.csdevice.pojo.po.CsDataArray;
*/
public interface CsDataArrayMapper extends BaseMapper<CsDataArray> {
List<LineTargetVO> getDataArray(@Param("list") List<String> list);
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataSetMapper.java
View File

@@ -2,6 +2,10 @@ package com.njcn.csdevice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +17,6 @@ import com.njcn.csdevice.pojo.po.CsDataSet;
*/
public interface CsDataSetMapper extends BaseMapper<CsDataSet> {
List<LineTargetVO> getDataSet(@Param("modelId") String modelId);
}

5
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelMapper.java
View File

@@ -2,12 +2,15 @@ package com.njcn.csdevice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.csdevice.pojo.dto.DataArrayDTO;
import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm;
import com.njcn.csdevice.pojo.param.CsDevModelQueryParm;
import com.njcn.csdevice.pojo.po.CsDevModelPO;
import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
* Description:
@@ -21,4 +24,6 @@ public interface CsDevModelMapper extends BaseMapper<CsDevModelPO> {
Page<CsDevModelPageVO> getPage(Page<CsDevModelPageVO> returnpage,@Param("csDevModelQueryParm") CsDevModelQueryParm csDevModelQueryParm);
CsDevModelPageVO queryOne(@Param("csDevModelQueryListParm")CsDevModelQueryListParm csDevModelQueryListParm);
List<DataArrayDTO> getDataArrayByModelId(@Param("modelId")String modelId);
}

20
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDictMapper.java
View File

@@ -1,20 +0,0 @@
package com.njcn.csdevice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.csdevice.pojo.dto.CsDictDTO;
import com.njcn.csdevice.pojo.po.CsDictPO;
import org.apache.ibatis.annotations.Param;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/4/3 14:53【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface CsDictMapper extends BaseMapper<CsDictPO> {
CsDictDTO getOwnAndFatherData(@Param("name") String name);
}

22
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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.njcn.csdevice.mapper.CsDataArrayMapper">
<select id="getDataArray" resultType="LineTargetVO">
select
pid,
name,
another_name anotherName,
idx sort
from
cs_data_array
where
pid in
<foreach collection='list' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
group by pid,name,another_name,idx
order by idx
</select>
</mapper>

18
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataSetMapper.xml Normal file
View File

@@ -0,0 +1,18 @@
<?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.njcn.csdevice.mapper.CsDataSetMapper">
<select id="getDataSet" resultType="LineTargetVO">
select
id,
pid,
name,
another_name anotherName,
idx sort
from
cs_data_set
where
pid = #{modelId}
</select>
</mapper>

14
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml
View File

@@ -74,4 +74,18 @@
</if>
</select>
<select id="getDataArrayByModelId" resultType="com.njcn.csdevice.pojo.dto.DataArrayDTO">
select
distinct t1.id dataSetId,t1.another_name dataSetName ,t2.name dataArrayName,t2.another_name dataArrayShowName
from
cs_dev_model t0
left join cs_data_set t1 on
t0.id = t1.pid
left join cs_data_array t2 on
t1.id = t2.pid
where
t0.id = #{modelId}
</select>
</mapper>

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java
View File

@@ -38,4 +38,12 @@ public interface CsDevModelRelationService extends IService<CsDevModelRelationPO
Boolean AuditDevModelRelation(CsDevModelRelationAuidtParm auditParm);
List<CsDevModelRelationVO> queryDevModelRelation(CsDevModelRelationQueryParm queryParm);
}
/**
* 根据装置id获取关联信息
* @param devId
* @return
*/
CsDevModelRelationPO findModelByDevId(String devId);
}

7
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelService.java
View File

@@ -64,11 +64,10 @@ public interface CsDevModelService extends IService<CsDevModelPO>{
CsDevModelPO findModel(String devType, String version, String time);
/**
* 根据装置型号查询模板
* @param devType 装置型号
* 根据id获取模板信息
* @param id
* @return
*/
CsDevModelPO findModelByDevType(String devType);
CsDevModelPO getModelById(String id);
}

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

@@ -2,6 +2,9 @@ package com.njcn.csdevice.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.csdevice.pojo.po.CsDataArray;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -15,13 +18,16 @@ import java.util.List;
*/
public interface ICsDataArrayService extends IService<CsDataArray> {
/**
* 根据数据集id获取指标数据
* @param dataSetId 数据集Id
* 根据数据集获取指标数据
* @param list 数据集
* @return
*/
List<CsDataArray> findDataArrayByDataSetId(String dataSetId);
List<CsDataArray> getArrayBySet(List<CsDataSet> list);
List<LineTargetVO> getDataArray(List<String> list);
List<CsDataArray> getDataArrayById(String pid, String name);
}

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

@@ -2,6 +2,7 @@ package com.njcn.csdevice.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import java.util.List;
@@ -22,4 +23,11 @@ public interface ICsDataSetService extends IService<CsDataSet> {
*/
List<CsDataSet> findDataSetByModelId(String modelId);
/**
* 获取数据集
* @param modelId 模板id
* @return
*/
List<LineTargetVO> getDataSet(String modelId);
}

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

@@ -3,10 +3,13 @@ package com.njcn.csdevice.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.mapper.CsDataArrayMapper;
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 org.springframework.stereotype.Service;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
@@ -20,7 +23,20 @@ import java.util.List;
public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDataArray> implements ICsDataArrayService {
@Override
public List<CsDataArray> findDataArrayByDataSetId(String dataSetId) {
return this.lambdaQuery().eq(CsDataArray::getPid,dataSetId).list();
public List<CsDataArray> getArrayBySet(List<CsDataSet> list) {
List<String> setList = list.stream().map(CsDataSet::getId).collect(Collectors.toList());
return this.lambdaQuery().in(CsDataArray::getPid,setList).list();
}
@Override
public List<LineTargetVO> getDataArray(List<String> list) {
return this.baseMapper.getDataArray(list);
}
@Override
public List<CsDataArray> getDataArrayById(String pid, String name) {
return this.lambdaQuery().eq(CsDataArray::getPid,pid).eq(CsDataArray::getName,name).list();
}
}

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

@@ -3,6 +3,7 @@ package com.njcn.csdevice.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.mapper.CsDataSetMapper;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import com.njcn.csdevice.service.ICsDataSetService;
import org.springframework.stereotype.Service;
@@ -23,4 +24,10 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
public List<CsDataSet> findDataSetByModelId(String modelId) {
return this.lambdaQuery().eq(CsDataSet::getPid,modelId).list();
}
@Override
public List<LineTargetVO> getDataSet(String modelId) {
return this.baseMapper.getDataSet(modelId);
}
}

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

@@ -87,4 +87,9 @@ public class CsDevModelRelationServiceImpl extends ServiceImpl<CsDevModelRelatio
}).collect (Collectors.toList ( ));
return collect;
}
@Override
public CsDevModelRelationPO findModelByDevId(String devId) {
return this.lambdaQuery().eq(CsDevModelRelationPO::getDevId,devId).eq(CsDevModelRelationPO::getStatus,1).one();
}
}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.mapper.CsDevModelMapper;
import com.njcn.csdevice.pojo.dto.DataArrayDTO;
import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
import com.njcn.csdevice.pojo.param.CsDevModelAuditParm;
import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm;
@@ -19,6 +20,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
@@ -77,7 +81,8 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
}
@Override
public CsDevModelPO findModelByDevType(String devType) {
return this.lambdaQuery().eq(CsDevModelPO::getDevType,devType).eq(CsDevModelPO::getStatus,1).one();
public CsDevModelPO getModelById(String id) {
return this.lambdaQuery().eq(CsDevModelPO::getId,id).one();
}
}