移动代码

This commit is contained in:
huangzj
2023-06-02 08:49:14 +08:00
parent 1f2e8005dc
commit bf2a0ea480
38 changed files with 1122 additions and 61 deletions

View File

@@ -0,0 +1,80 @@
package com.njcn.harmonic.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
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.harmonic.service.CsConfigurationService;
import com.njcn.minioss.bo.MinIoUploadResDTO;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.njcn.haronic.pojo.param.CsConfigurationParm;
import com.njcn.haronic.pojo.vo.CsConfigurationVO;
import org.springframework.web.multipart.MultipartFile;
/**
* (cs_configuration)表控制层
*
* @author xxxxx
*/
@Slf4j
@RestController
@RequestMapping("/csconfiguration")
@Api(tags = "组态项目")
@AllArgsConstructor
public class CsConfigurationController extends BaseController {
private final CsConfigurationService csConfigurationService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/add")
@ApiOperation("新增组态项目")
@ApiImplicitParam(name = "csConfigurationParm", value = "新增组态项目参数", required = true)
public HttpResult<Boolean> add(@RequestBody @Validated CsConfigurationParm csConfigurationParm){
String methodDescribe = getMethodDescribe("add");
boolean save = csConfigurationService.add (csConfigurationParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/audit")
@ApiOperation("修改组态项目")
@ApiImplicitParam(name = "auditParm", value = "修改组态项目参数", required = true)
public HttpResult<Boolean> audit(@RequestBody @Validated CsConfigurationParm.CsConfigurationAuditParam auditParm){
String methodDescribe = getMethodDescribe("audit");
boolean save = csConfigurationService.audit (auditParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryPage")
@ApiOperation("组态项目分页查询")
@ApiImplicitParam(name = "csConfigurationQueryParam", value = "组态项目查询参数", required = true)
public HttpResult<IPage<CsConfigurationVO>> queryPage(@RequestBody @Validated CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam ){
String methodDescribe = getMethodDescribe("queryPage");
IPage<CsConfigurationVO> page = csConfigurationService.queryPage (csConfigurationQueryParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
@PostMapping("/uploadImage")
@ApiOperation("上传底图")
@ApiImplicitParam(name = "file", value = "底图文件", required = true)
public HttpResult<MinIoUploadResDTO> uploadImage(@RequestParam("file") MultipartFile issuesFile){
String methodDescribe = getMethodDescribe("uploadImage");
String filePath = csConfigurationService.uploadImage(issuesFile);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(issuesFile.getOriginalFilename(),filePath), methodDescribe);
}
}

View File

@@ -0,0 +1,20 @@
package com.njcn.harmonic.controller;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
/**
* (cs_net_dev)表控制层
*
* @author xxxxx
*/
@Slf4j
@RestController
@RequestMapping("/csnetdev")
@Api(tags = "组态页面")
@AllArgsConstructor
public class CsNetDevPOController extends BaseController {
}

View File

@@ -0,0 +1,67 @@
package com.njcn.harmonic.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.harmonic.service.CsPagePOService;
import com.njcn.haronic.pojo.vo.CsPageVO;
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 org.springframework.validation.annotation.Validated;
import com.njcn.haronic.pojo.param.CsConfigurationParm;
import com.njcn.haronic.pojo.param.CsPageParm;
import org.springframework.web.bind.annotation.*;
import com.njcn.haronic.pojo.vo.CsConfigurationVO;
/**
* (cs_page)表控制层
*
* @author xxxxx
*/
@RestController
@RequestMapping("/cspage")
@Api(tags = "组态项目页面")
@AllArgsConstructor
public class CsPagePOController extends BaseController {
private final CsPagePOService csPagePOService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/add")
@ApiOperation("新增组态页面")
@ApiImplicitParam(name = "csPageParm", value = "新增组态项目参数", required = true)
public HttpResult<CsPageVO> add(@RequestBody @Validated CsPageParm csPageParm){
String methodDescribe = getMethodDescribe("add");
CsPageVO csPageVO = csPagePOService.add (csPageParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csPageVO, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/audit")
@ApiOperation("修改组态页面")
@ApiImplicitParam(name = "auditParm", value = "修改组态项目参数", required = true)
public HttpResult<Boolean> audit(@RequestBody @Validated CsPageParm.CsPageParmAuditParam auditParm){
String methodDescribe = getMethodDescribe("audit");
boolean save = csPagePOService.audit (auditParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryPage")
@ApiOperation("组态页面分页查询")
@ApiImplicitParam(name = "csPageParam", value = "组态项目查询参数", required = true)
public HttpResult<IPage<CsPageVO>> queryPage(@RequestBody @Validated CsPageParm.CsPageParmQueryParam csPageParam ){
String methodDescribe = getMethodDescribe("queryPage");
IPage<CsPageVO> page = csPagePOService.queryPage (csPageParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
}

View File

@@ -15,8 +15,8 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import pojo.param.ThdDataQueryParm;
import pojo.vo.ThdDataVO;
import com.njcn.haronic.pojo.param.ThdDataQueryParm;
import com.njcn.haronic.pojo.vo.ThdDataVO;
import java.util.List;

View File

@@ -0,0 +1,14 @@
package com.njcn.harmonic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.haronic.pojo.po.CsConfigurationPO;
/**
* Description:
* Date: 2023/5/31 10:53【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface CsConfigurationMapper extends BaseMapper<CsConfigurationPO> {
}

View File

@@ -0,0 +1,14 @@
package com.njcn.harmonic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.haronic.pojo.po.CsNetDevPO;
/**
* Description:
* Date: 2023/5/31 14:13【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface CsNetDevPOMapper extends BaseMapper<CsNetDevPO> {
}

View File

@@ -0,0 +1,15 @@
package com.njcn.harmonic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.haronic.pojo.po.CsPagePO;
/**
*
* Description:
* Date: 2023/5/31 14:31【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface CsPagePOMapper extends BaseMapper<CsPagePO> {
}

View File

@@ -0,0 +1,19 @@
<?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.harmonic.mapper.CsConfigurationMapper">
<resultMap id="BaseResultMap" type="com.njcn.haronic.pojo.po.CsConfigurationPO">
<!--@mbg.generated-->
<!--@Table cs_configuration-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `name`, `status`, create_by, create_time, update_by, update_time
</sql>
</mapper>

View File

@@ -0,0 +1,24 @@
<?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.harmonic.mapper.CsNetDevPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.haronic.pojo.po.CsNetDevPO">
<!--@mbg.generated-->
<!--@Table cs_net_dev-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="dev_type" jdbcType="VARCHAR" property="devType" />
<result column="time" jdbcType="TIMESTAMP" property="time" />
<result column="version" jdbcType="VARCHAR" property="version" />
<result column="soft_info_id" jdbcType="VARCHAR" property="softInfoId" />
<result column="prj_info_id" jdbcType="VARCHAR" property="prjInfoId" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, dev_type, `time`, version, soft_info_id, prj_info_id, `status`, create_by, create_time,
update_by, update_time
</sql>
</mapper>

View File

@@ -0,0 +1,21 @@
<?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.harmonic.mapper.CsPagePOMapper">
<resultMap id="BaseResultMap" type="com.njcn.haronic.pojo.po.CsPagePO">
<!--@mbg.generated-->
<!--@Table cs_page-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="pid" jdbcType="VARCHAR" property="pid" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="path" jdbcType="VARCHAR" property="path" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, pid, `name`, `path`, `status`, create_by, create_time, update_by, update_time
</sql>
</mapper>

View File

@@ -0,0 +1,28 @@
package com.njcn.harmonic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.njcn.haronic.pojo.param.CsConfigurationParm;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.haronic.pojo.po.CsConfigurationPO;
import com.njcn.haronic.pojo.vo.CsConfigurationVO;
import org.springframework.web.multipart.MultipartFile;
/**
*
* Description:
* Date: 2023/5/31 10:53【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface CsConfigurationService extends IService<CsConfigurationPO>{
boolean add(CsConfigurationParm csConfigurationParm);
boolean audit(CsConfigurationParm.CsConfigurationAuditParam auditParm);
IPage<CsConfigurationVO> queryPage(CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam);
String uploadImage(MultipartFile issuesFile);
}

View File

@@ -0,0 +1,16 @@
package com.njcn.harmonic.service;
import com.njcn.haronic.pojo.po.CsNetDevPO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* Description:
* Date: 2023/5/31 14:12【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface CsNetDevPOService extends IService<CsNetDevPO>{
}

View File

@@ -0,0 +1,25 @@
package com.njcn.harmonic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.njcn.haronic.pojo.param.CsPageParm;
import com.njcn.haronic.pojo.po.CsPagePO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.haronic.pojo.vo.CsPageVO;
/**
*
* Description:
* Date: 2023/5/31 14:31【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface CsPagePOService extends IService<CsPagePO>{
CsPageVO add(CsPageParm csPageParm);
boolean audit(CsPageParm.CsPageParmAuditParam auditParm);
IPage<CsPageVO> queryPage(CsPageParm.CsPageParmQueryParam csPageParam);
}

View File

@@ -2,8 +2,8 @@ package com.njcn.harmonic.service;
import pojo.param.ThdDataQueryParm;
import pojo.vo.ThdDataVO;
import com.njcn.haronic.pojo.param.ThdDataQueryParm;
import com.njcn.haronic.pojo.vo.ThdDataVO;
import java.util.List;

View File

@@ -0,0 +1,86 @@
package com.njcn.harmonic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.utils.NjcnBeanUtil;
import com.njcn.haronic.pojo.constant.HarmonicConstant;
import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.harmonic.mapper.CsConfigurationMapper;
import org.springframework.transaction.annotation.Transactional;
import com.njcn.haronic.pojo.param.CsConfigurationParm;
import com.njcn.harmonic.service.CsConfigurationService;
import com.njcn.haronic.pojo.po.CsConfigurationPO;
import com.njcn.haronic.pojo.vo.CsConfigurationVO;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.stream.Collectors;
/**
*
* Description:
* Date: 2023/5/31 10:53【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
@RequiredArgsConstructor
public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMapper, CsConfigurationPO> implements CsConfigurationService{
private final FileStorageUtil fileStorageUtil;
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean add(CsConfigurationParm csConfigurationParm) {
CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
BeanUtils.copyProperties(csConfigurationParm,csConfigurationPO);
csConfigurationPO.setStatus("1");
boolean save = this.save(csConfigurationPO);
return save;
}
@Override
public boolean audit(CsConfigurationParm.CsConfigurationAuditParam auditParm) {
CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
NjcnBeanUtil.copyPropertiesIgnoreCase(auditParm,csConfigurationPO);
boolean b = this.updateById(csConfigurationPO);
return b;
}
@Override
public IPage<CsConfigurationVO> queryPage(CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam) {
Page<CsConfigurationVO> returnpage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
Page<CsConfigurationPO> temppage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
QueryWrapper<CsConfigurationPO> query = new QueryWrapper<>();
query.like(StringUtils.isNotBlank(csConfigurationQueryParam.getSearchValue()),CsConfigurationPO.COL_NAME,csConfigurationQueryParam.getSearchValue()).
le (StringUtils.isNotBlank (csConfigurationQueryParam.getSearchEndTime()), CsConfigurationPO.COL_CREATE_TIME, csConfigurationQueryParam.getSearchEndTime ( )).
ge (StringUtils.isNotBlank (csConfigurationQueryParam.getSearchBeginTime()), CsConfigurationPO.COL_CREATE_TIME, csConfigurationQueryParam.getSearchBeginTime ( )).
eq ("status",1).orderByDesc(CsConfigurationPO.COL_CREATE_TIME);
Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().selectPage(temppage, query);
List<CsConfigurationVO> collect = csConfigurationPOPage.getRecords().stream().map(page -> {
CsConfigurationVO csDevModelPageVO = new CsConfigurationVO();
BeanUtils.copyProperties(page, csDevModelPageVO);
return csDevModelPageVO;
}).collect(Collectors.toList());
returnpage.setRecords(collect);
returnpage.setTotal(csConfigurationPOPage.getTotal());
return returnpage;
}
@Override
public String uploadImage(MultipartFile issuesFile) {
return fileStorageUtil.getFileUrl( fileStorageUtil.uploadMultipart(issuesFile, HarmonicConstant.CONFIGURATIONPATH));
}
}

View File

@@ -0,0 +1,19 @@
package com.njcn.harmonic.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.haronic.pojo.po.CsNetDevPO;
import com.njcn.harmonic.mapper.CsNetDevPOMapper;
import com.njcn.harmonic.service.CsNetDevPOService;
/**
*
* Description:
* Date: 2023/5/31 14:12【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
public class CsNetDevPOServiceImpl extends ServiceImpl<CsNetDevPOMapper, CsNetDevPO> implements CsNetDevPOService{
}

View File

@@ -0,0 +1,124 @@
package com.njcn.harmonic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.harmonic.mapper.CsConfigurationMapper;
import com.njcn.haronic.pojo.constant.HarmonicConstant;
import com.njcn.haronic.pojo.po.CsConfigurationPO;
import com.njcn.haronic.pojo.vo.CsConfigurationVO;
import com.njcn.haronic.pojo.vo.CsPageVO;
import com.njcn.oss.utils.FileStorageUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.harmonic.mapper.CsPagePOMapper;
import org.springframework.transaction.annotation.Transactional;
import com.njcn.haronic.pojo.param.CsPageParm;
import com.njcn.haronic.pojo.po.CsPagePO;
import com.njcn.harmonic.service.CsPagePOService;
/**
*
* Description:
* Date: 2023/5/31 14:31【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
@RequiredArgsConstructor
public class CsPagePOServiceImpl extends ServiceImpl<CsPagePOMapper, CsPagePO> implements CsPagePOService{
private final FileStorageUtil fileStorageUtil;
private final CsConfigurationMapper csConfigurationMapper;
@Override
@Transactional(rollbackFor = {Exception.class})
public CsPageVO add(CsPageParm csPageParm) {
CsPagePO csPagePO = new CsPagePO();
CsPageVO csPageVO = new CsPageVO();
csPagePO.setPid(csPageParm.getPid());
csPagePO.setStatus("1");
csPagePO.setName(csPageParm.getName());
InputStream inputStream = this.writeJsonStringToInputStream(csPageParm.getJsonFile());
String s = fileStorageUtil.uploadStream(inputStream, HarmonicConstant.CONFIGURATIONPATH, HarmonicConstant.CONFIGURATIONNAME);
csPagePO.setPath(s);
boolean save = this.save(csPagePO);
BeanUtils.copyProperties(csPagePO, csPageVO);
InputStream fileStream = fileStorageUtil.getFileStream(csPagePO.getPath());
String text = new BufferedReader(
new InputStreamReader(fileStream, StandardCharsets.UTF_8))
.lines()
.collect(Collectors.joining("\n"));
csPageVO.setPath(text);
return csPageVO;
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean audit(CsPageParm.CsPageParmAuditParam auditParm) {
CsPagePO csPagePO = new CsPagePO();
CsPagePO byId = this.getById(auditParm.getId());
fileStorageUtil.deleteFile(byId.getPath());
BeanUtils.copyProperties(auditParm, csPagePO);
if(StringUtils.isNotBlank(auditParm.getJsonFile())){
InputStream inputStream = this.writeJsonStringToInputStream(auditParm.getJsonFile());
String s = fileStorageUtil.uploadStream(inputStream, HarmonicConstant.CONFIGURATIONPATH, HarmonicConstant.CONFIGURATIONNAME);
csPagePO.setPath(s);
}
return this.updateById(csPagePO);
}
@Override
public IPage<CsPageVO> queryPage(CsPageParm.CsPageParmQueryParam csPageParam) {
Page<CsPageVO> returnpage = new Page<> (csPageParam.getPageNum(), csPageParam.getPageSize ( ));
QueryWrapper<CsPagePO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StringUtils.isNotBlank (csPageParam.getPid()),CsPagePO.COL_PID,csPageParam.getPid()).
like(StringUtils.isNotBlank (csPageParam.getSearchValue()),CsPagePO.COL_NAME,csPageParam.getSearchValue()).
eq ("status",1).
orderByDesc(CsPagePO.COL_CREATE_TIME);
IPage<CsPagePO> pageData = this.page(new Page<>(csPageParam.getPageNum(), csPageParam.getPageSize()), queryWrapper);
List<CsPageVO> collect = pageData.getRecords().stream().map(temp -> {
CsPageVO csPageVO = new CsPageVO();
CsConfigurationPO csConfigurationPO = csConfigurationMapper.selectById(temp.getPid());
BeanUtils.copyProperties(temp, csPageVO);
csPageVO.setConfigurationName(csConfigurationPO.getName());
InputStream fileStream = fileStorageUtil.getFileStream(temp.getPath());
String text = new BufferedReader(
new InputStreamReader(fileStream, StandardCharsets.UTF_8))
.lines()
.collect(Collectors.joining("\n"));
csPageVO.setPath(text);
return csPageVO;
}).collect(Collectors.toList());
returnpage.setRecords(collect);
returnpage.setTotal(pageData.getTotal());
return returnpage;
}
/*将strin写入Json文件返回一个InputStream*/
public InputStream writeJsonStringToInputStream(String jsonString) {
// 转换为输入流
ByteArrayInputStream inputStream = new ByteArrayInputStream(jsonString.getBytes(StandardCharsets.UTF_8));
return inputStream;
}
}

View File

@@ -13,8 +13,8 @@ import com.njcn.harmonic.service.StableDataService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import pojo.param.ThdDataQueryParm;
import pojo.vo.ThdDataVO;
import com.njcn.haronic.pojo.param.ThdDataQueryParm;
import com.njcn.haronic.pojo.vo.ThdDataVO;
import com.njcn.influx.pojo.po.HarmonicRatioData;
import com.njcn.influx.pojo.po.PowerQualityData;
import com.njcn.influx.service.HaronicRatioService;
@@ -49,26 +49,18 @@ public class StableDataServiceImpl implements StableDataService {
List<String> collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
List<PowerQualityData> firstPowerQuality = powerQualityService.getFirstPowerQuality(collect, statisticalName);
csLinePOList.forEach(temp->{
DataParam.phases.forEach(phase->{
DataParam.statMethods.forEach(method -> {
ThdDataVO thdDataVO = new ThdDataVO();
thdDataVO.setLineId(temp.getLineId());
thdDataVO.setPosition(temp.getPosition());
thdDataVO.setStatisticalName(statisticalName);
thdDataVO.setPhase(phase);
thdDataVO.setStatMethod(method);
Double statisticalValue = 0.00;
List<PowerQualityData> collect1 = firstPowerQuality.stream().filter(powerQualityData -> Objects.equals(powerQualityData.getPhase(), phase) &&
Objects.equals(powerQualityData.getStatMethod(), method)
).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect1)){
statisticalValue= (Double) ReflectUtils.getValue(collect1.get(0), statisticalName);
}
thdDataVO.setStatisticalData(statisticalValue);
thdDataVOList.add(thdDataVO);
});
});
firstPowerQuality.forEach(temp->{
ThdDataVO thdDataVO = new ThdDataVO();
BeanUtils.copyProperties(temp,thdDataVO);
thdDataVO.setStatisticalName(statisticalName);
thdDataVO.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime());
String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition();
thdDataVO.setPosition(position);
Double statisticalValue = 0.00;
statisticalValue= (Double) ReflectUtils.getValue(temp, statisticalName);
thdDataVO.setStatisticalData(statisticalValue);
thdDataVOList.add(thdDataVO);
});
@@ -83,26 +75,18 @@ public class StableDataServiceImpl implements StableDataService {
List<String> collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
List<PowerQualityData> firstPowerQuality = powerQualityService.getPowerQuality(collect, thdDataQueryParm.getStatisticalName(), thdDataQueryParm.getStartTime(), thdDataQueryParm.getEndTime());
csLinePOList.forEach(temp->{
DataParam.phases.forEach(phase->{
DataParam.statMethods.forEach(method -> {
ThdDataVO thdDataVO = new ThdDataVO();
thdDataVO.setLineId(temp.getLineId());
thdDataVO.setPosition(temp.getPosition());
thdDataVO.setStatisticalName(thdDataQueryParm.getStatisticalName());
thdDataVO.setPhase(phase);
thdDataVO.setStatMethod(method);
Double statisticalValue = 0.00;
List<PowerQualityData> collect1 = firstPowerQuality.stream().filter(powerQualityData -> Objects.equals(powerQualityData.getPhase(), phase) &&
Objects.equals(powerQualityData.getStatMethod(), method)
).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect1)){
statisticalValue= (Double) ReflectUtils.getValue(collect1.get(0), thdDataQueryParm.getStatisticalName());
}
thdDataVO.setStatisticalData(statisticalValue);
thdDataVOList.add(thdDataVO);
});
});
firstPowerQuality.forEach(temp->{
ThdDataVO thdDataVO = new ThdDataVO();
BeanUtils.copyProperties(temp,thdDataVO);
thdDataVO.setStatisticalName(thdDataQueryParm.getStatisticalName());
thdDataVO.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime());
String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition();
thdDataVO.setPosition(position);
Double statisticalValue = 0.00;
statisticalValue= (Double) ReflectUtils.getValue(temp, thdDataQueryParm.getStatisticalName());
thdDataVO.setStatisticalData(statisticalValue);
thdDataVOList.add(thdDataVO);
});
@@ -158,4 +142,5 @@ public class StableDataServiceImpl implements StableDataService {
return thdDataVOList;
}
}