包名调整
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package com.njcn.harmonic;
|
||||
package com.njcn.csharmonic;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.njcn.harmonic.controller;
|
||||
package com.njcn.csharmonic.controller;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.OperateType;
|
||||
@@ -6,7 +6,7 @@ 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.csharmonic.service.CsConfigurationService;
|
||||
import com.njcn.minioss.bo.MinIoUploadResDTO;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
@@ -16,8 +16,8 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import com.njcn.harmonic.param.CsConfigurationParm;
|
||||
import com.njcn.harmonic.pojo.vo.CsConfigurationVO;
|
||||
import com.njcn.csharmonic.param.CsConfigurationParm;
|
||||
import com.njcn.csharmonic.pojo.vo.CsConfigurationVO;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
/**
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.njcn.harmonic.controller;
|
||||
package com.njcn.csharmonic.controller;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.AllArgsConstructor;
|
||||
@@ -1,19 +1,19 @@
|
||||
package com.njcn.harmonic.controller;
|
||||
package com.njcn.csharmonic.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.harmonic.pojo.vo.CsPageVO;
|
||||
import com.njcn.csharmonic.service.CsPagePOService;
|
||||
import com.njcn.csharmonic.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.harmonic.param.CsPageParm;
|
||||
import com.njcn.csharmonic.param.CsPageParm;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.njcn.harmonic.controller;
|
||||
package com.njcn.csharmonic.controller;
|
||||
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
@@ -6,9 +6,9 @@ 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.vo.LineTargetVO;
|
||||
import com.njcn.harmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.harmonic.pojo.vo.TargetDetailVO;
|
||||
import com.njcn.harmonic.service.ILineTargetService;
|
||||
import com.njcn.csharmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.csharmonic.pojo.vo.TargetDetailVO;
|
||||
import com.njcn.csharmonic.service.ILineTargetService;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.njcn.harmonic.controller;
|
||||
package com.njcn.csharmonic.controller;
|
||||
|
||||
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.StableDataService;
|
||||
import com.njcn.csharmonic.service.StableDataService;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
@@ -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 com.njcn.harmonic.param.ThdDataQueryParm;
|
||||
import com.njcn.harmonic.pojo.vo.ThdDataVO;
|
||||
import com.njcn.csharmonic.param.ThdDataQueryParm;
|
||||
import com.njcn.csharmonic.pojo.vo.ThdDataVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.njcn.harmonic.handler;
|
||||
package com.njcn.csharmonic.handler;
|
||||
|
||||
import com.alibaba.nacos.shaded.com.google.gson.Gson;
|
||||
import com.github.tocrhz.mqtt.annotation.MqttSubscribe;
|
||||
import com.github.tocrhz.mqtt.annotation.NamedValue;
|
||||
import com.github.tocrhz.mqtt.annotation.Payload;
|
||||
import com.github.tocrhz.mqtt.publisher.MqttPublisher;
|
||||
import com.njcn.harmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.harmonic.service.ILineTargetService;
|
||||
import com.njcn.csharmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.csharmonic.service.ILineTargetService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.eclipse.paho.client.mqttv3.MqttMessage;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.njcn.harmonic.mapper;
|
||||
package com.njcn.csharmonic.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.njcn.harmonic.pojo.po.CsConfigurationPO;
|
||||
import com.njcn.csharmonic.pojo.po.CsConfigurationPO;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.njcn.harmonic.mapper;
|
||||
package com.njcn.csharmonic.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.njcn.harmonic.pojo.po.CsNetDevPO;
|
||||
import com.njcn.csharmonic.pojo.po.CsNetDevPO;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.njcn.harmonic.mapper;
|
||||
package com.njcn.csharmonic.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.njcn.harmonic.pojo.po.CsPagePO;
|
||||
import com.njcn.csharmonic.pojo.po.CsPagePO;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -1,7 +1,7 @@
|
||||
<?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.harmonic.pojo.po.CsConfigurationPO">
|
||||
<mapper namespace="com.njcn.csharmonic.mapper.CsConfigurationMapper">
|
||||
<resultMap id="BaseResultMap" type="com.njcn.csharmonic.pojo.po.CsConfigurationPO">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table cs_configuration-->
|
||||
<id column="id" jdbcType="VARCHAR" property="id" />
|
||||
@@ -1,7 +1,7 @@
|
||||
<?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.harmonic.pojo.po.CsNetDevPO">
|
||||
<mapper namespace="com.njcn.csharmonic.mapper.CsNetDevPOMapper">
|
||||
<resultMap id="BaseResultMap" type="com.njcn.csharmonic.pojo.po.CsNetDevPO">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table cs_net_dev-->
|
||||
<id column="id" jdbcType="VARCHAR" property="id" />
|
||||
@@ -1,7 +1,7 @@
|
||||
<?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.harmonic.pojo.po.CsPagePO">
|
||||
<mapper namespace="com.njcn.csharmonic.mapper.CsPagePOMapper">
|
||||
<resultMap id="BaseResultMap" type="com.njcn.csharmonic.pojo.po.CsPagePO">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table cs_page-->
|
||||
<id column="id" jdbcType="VARCHAR" property="id" />
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.njcn.harmonic.service;
|
||||
package com.njcn.csharmonic.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.njcn.harmonic.param.CsConfigurationParm;
|
||||
import com.njcn.harmonic.pojo.po.CsConfigurationPO;
|
||||
import com.njcn.harmonic.pojo.vo.CsConfigurationVO;
|
||||
import com.njcn.csharmonic.param.CsConfigurationParm;
|
||||
import com.njcn.csharmonic.pojo.po.CsConfigurationPO;
|
||||
import com.njcn.csharmonic.pojo.vo.CsConfigurationVO;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
/**
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.njcn.harmonic.service;
|
||||
package com.njcn.csharmonic.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.njcn.harmonic.pojo.po.CsNetDevPO;
|
||||
import com.njcn.csharmonic.pojo.po.CsNetDevPO;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.njcn.harmonic.service;
|
||||
package com.njcn.csharmonic.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.njcn.harmonic.param.CsPageParm;
|
||||
import com.njcn.harmonic.pojo.po.CsPagePO;
|
||||
import com.njcn.harmonic.pojo.vo.CsPageVO;
|
||||
import com.njcn.csharmonic.param.CsPageParm;
|
||||
import com.njcn.csharmonic.pojo.po.CsPagePO;
|
||||
import com.njcn.csharmonic.pojo.vo.CsPageVO;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.njcn.harmonic.service;
|
||||
package com.njcn.csharmonic.service;
|
||||
|
||||
import com.njcn.csdevice.pojo.vo.LineTargetVO;
|
||||
import com.njcn.harmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.harmonic.pojo.vo.TargetDetailVO;
|
||||
import com.njcn.csharmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.csharmonic.pojo.vo.TargetDetailVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.njcn.harmonic.service;
|
||||
package com.njcn.csharmonic.service;
|
||||
|
||||
|
||||
|
||||
import com.njcn.harmonic.param.ThdDataQueryParm;
|
||||
import com.njcn.harmonic.pojo.vo.ThdDataVO;
|
||||
import com.njcn.csharmonic.param.ThdDataQueryParm;
|
||||
import com.njcn.csharmonic.pojo.vo.ThdDataVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package com.njcn.harmonic.service.impl;
|
||||
package com.njcn.csharmonic.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.common.utils.NjcnBeanUtil;
|
||||
import com.njcn.harmonic.constant.HarmonicConstant;
|
||||
import com.njcn.harmonic.mapper.CsConfigurationMapper;
|
||||
import com.njcn.harmonic.param.CsConfigurationParm;
|
||||
import com.njcn.harmonic.pojo.po.CsConfigurationPO;
|
||||
import com.njcn.harmonic.pojo.vo.CsConfigurationVO;
|
||||
import com.njcn.harmonic.service.CsConfigurationService;
|
||||
import com.njcn.csharmonic.constant.HarmonicConstant;
|
||||
import com.njcn.csharmonic.mapper.CsConfigurationMapper;
|
||||
import com.njcn.csharmonic.param.CsConfigurationParm;
|
||||
import com.njcn.csharmonic.pojo.po.CsConfigurationPO;
|
||||
import com.njcn.csharmonic.pojo.vo.CsConfigurationVO;
|
||||
import com.njcn.csharmonic.service.CsConfigurationService;
|
||||
import com.njcn.oss.utils.FileStorageUtil;
|
||||
import com.njcn.user.api.UserFeignClient;
|
||||
import com.njcn.user.pojo.po.User;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.njcn.harmonic.service.impl;
|
||||
package com.njcn.csharmonic.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.harmonic.mapper.CsNetDevPOMapper;
|
||||
import com.njcn.harmonic.pojo.po.CsNetDevPO;
|
||||
import com.njcn.harmonic.service.CsNetDevPOService;
|
||||
import com.njcn.csharmonic.mapper.CsNetDevPOMapper;
|
||||
import com.njcn.csharmonic.pojo.po.CsNetDevPO;
|
||||
import com.njcn.csharmonic.service.CsNetDevPOService;
|
||||
import org.springframework.stereotype.Service;
|
||||
/**
|
||||
*
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.njcn.harmonic.service.impl;
|
||||
package com.njcn.csharmonic.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.harmonic.constant.HarmonicConstant;
|
||||
import com.njcn.harmonic.mapper.CsConfigurationMapper;
|
||||
import com.njcn.harmonic.mapper.CsPagePOMapper;
|
||||
import com.njcn.harmonic.param.CsPageParm;
|
||||
import com.njcn.harmonic.pojo.po.CsConfigurationPO;
|
||||
import com.njcn.harmonic.pojo.po.CsPagePO;
|
||||
import com.njcn.harmonic.pojo.vo.CsPageVO;
|
||||
import com.njcn.harmonic.service.CsPagePOService;
|
||||
import com.njcn.csharmonic.constant.HarmonicConstant;
|
||||
import com.njcn.csharmonic.mapper.CsConfigurationMapper;
|
||||
import com.njcn.csharmonic.mapper.CsPagePOMapper;
|
||||
import com.njcn.csharmonic.param.CsPageParm;
|
||||
import com.njcn.csharmonic.pojo.po.CsConfigurationPO;
|
||||
import com.njcn.csharmonic.pojo.po.CsPagePO;
|
||||
import com.njcn.csharmonic.pojo.vo.CsPageVO;
|
||||
import com.njcn.csharmonic.service.CsPagePOService;
|
||||
import com.njcn.oss.utils.FileStorageUtil;
|
||||
import com.njcn.user.api.UserFeignClient;
|
||||
import com.njcn.user.pojo.po.User;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.njcn.harmonic.service.impl;
|
||||
package com.njcn.csharmonic.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.alibaba.nacos.shaded.com.google.gson.Gson;
|
||||
@@ -8,17 +8,17 @@ import com.njcn.csdevice.pojo.po.CsDataArray;
|
||||
import com.njcn.csdevice.pojo.po.CsDevModelPO;
|
||||
import com.njcn.csdevice.pojo.po.CsDevModelRelationPO;
|
||||
import com.njcn.csdevice.pojo.vo.LineTargetVO;
|
||||
import com.njcn.harmonic.constant.HarmonicConstant;
|
||||
import com.njcn.harmonic.pojo.influx.CsDataHarmPowerP;
|
||||
import com.njcn.harmonic.pojo.influx.CsDataV;
|
||||
import com.njcn.harmonic.pojo.influx.CsPqdData;
|
||||
import com.njcn.harmonic.pojo.vo.ElementsVO;
|
||||
import com.njcn.harmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.harmonic.pojo.vo.TargetDetailVO;
|
||||
import com.njcn.harmonic.pojo.vo.ZuTaiVo;
|
||||
import com.njcn.harmonic.service.CsPagePOService;
|
||||
import com.njcn.harmonic.service.ILineTargetService;
|
||||
import com.njcn.harmonic.utils.CsReflectUitl;
|
||||
import com.njcn.csharmonic.constant.HarmonicConstant;
|
||||
import com.njcn.csharmonic.pojo.influx.CsDataHarmPowerP;
|
||||
import com.njcn.csharmonic.pojo.influx.CsDataV;
|
||||
import com.njcn.csharmonic.pojo.influx.CsPqdData;
|
||||
import com.njcn.csharmonic.pojo.vo.ElementsVO;
|
||||
import com.njcn.csharmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.csharmonic.pojo.vo.TargetDetailVO;
|
||||
import com.njcn.csharmonic.pojo.vo.ZuTaiVo;
|
||||
import com.njcn.csharmonic.service.CsPagePOService;
|
||||
import com.njcn.csharmonic.service.ILineTargetService;
|
||||
import com.njcn.csharmonic.utils.CsReflectUitl;
|
||||
import com.njcn.influx.pojo.dto.StatisticalDataDTO;
|
||||
import com.njcn.influx.service.CommonService;
|
||||
import com.njcn.influxdb.utils.InfluxDbUtils;
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.njcn.harmonic.service.impl;
|
||||
package com.njcn.csharmonic.service.impl;
|
||||
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.csdevice.api.CsLineFeignClient;
|
||||
import com.njcn.csdevice.enums.AlgorithmResponseEnum;
|
||||
import com.njcn.csdevice.pojo.po.CsLinePO;
|
||||
import com.njcn.csdevice.utils.ReflectUtils;
|
||||
import com.njcn.harmonic.service.StableDataService;
|
||||
import com.njcn.csharmonic.service.StableDataService;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.njcn.harmonic.param.ThdDataQueryParm;
|
||||
import com.njcn.harmonic.pojo.vo.ThdDataVO;
|
||||
import com.njcn.csharmonic.param.ThdDataQueryParm;
|
||||
import com.njcn.csharmonic.pojo.vo.ThdDataVO;
|
||||
import com.njcn.influx.pojo.po.HarmonicRatioData;
|
||||
import com.njcn.influx.pojo.po.PowerQualityData;
|
||||
import com.njcn.influx.service.HaronicRatioService;
|
||||
@@ -1,18 +1,12 @@
|
||||
package com.njcn;
|
||||
|
||||
import com.alibaba.nacos.shaded.com.google.gson.Gson;
|
||||
import com.github.tocrhz.mqtt.publisher.MqttPublisher;
|
||||
import com.njcn.harmonic.pojo.vo.RtDataVO;
|
||||
import com.njcn.harmonic.service.ILineTargetService;
|
||||
import com.njcn.influxdb.param.InfluxDBPublicParam;
|
||||
import com.njcn.influxdb.utils.InfluxDbUtils;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.influxdb.InfluxDB;
|
||||
import org.influxdb.dto.BatchPoints;
|
||||
import org.influxdb.dto.Point;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user