补充新更新

pqs-quality/quality-boot/src/main/java/com/njcn/quality/QualityBootApplication.java

@@ -0,0 +1,25 @@
+package com.njcn.quality;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月09日 20:59
+ */
+@Slf4j
+@MapperScan("com.njcn.**.mapper")
+@EnableFeignClients(basePackages = "com.njcn")
+@SpringBootApplication(scanBasePackages = "com.njcn")
+public class QualityBootApplication {
+
+    public static void main(String[] args)  {
+        SpringApplication.run(QualityBootApplication.class, args);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/DataArrayController.java

@@ -0,0 +1,62 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.param.DataArrayParam;
+import com.njcn.quality.pojo.po.DataArray;
+import com.njcn.quality.pojo.po.DataMould;
+import com.njcn.quality.service.IDataArrayService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/9 15:47
+ */
+@Slf4j
+@RestController
+@RequestMapping("/dataArray")
+@RequiredArgsConstructor
+@Api(tags = "装置详细数据管理")
+public class DataArrayController extends BaseController {
+
+    private final IDataArrayService dataArrayService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增装置详细模板数据")
+    @ApiImplicitParam(name = "dataArrayParam", value = "装置详细模板数据", required = true)
+    public HttpResult<DataMould> add(@RequestBody DataArrayParam dataArrayParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，装置详细模板数据为：{}", methodDescribe, dataArrayParam);
+        DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @DeleteMapping("/delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除详细数据")
+    @ApiImplicitParam(name = "list", value = "数据集id", required = true)
+    public HttpResult<Boolean> delete(@RequestParam List<String> list){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，数据集id：{}", methodDescribe, list);
+        boolean result = dataArrayService.deleteDataArray(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/DataGroupController.java

@@ -0,0 +1,73 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.param.DataGroupParam;
+import com.njcn.quality.pojo.po.DataGroup;
+import com.njcn.quality.service.IDataGroupService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/16 9:03
+ */
+@Slf4j
+@RestController
+@RequestMapping("/group")
+@RequiredArgsConstructor
+@Api(tags = "分组管理")
+public class DataGroupController extends BaseController {
+
+    private final IDataGroupService dataGroupService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增分组")
+    @ApiImplicitParam(name = "dataGroupParam", value = "分组信息", required = true)
+    public HttpResult<DataGroup> add(@RequestBody DataGroupParam dataGroupParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，分组信息：{}", methodDescribe, dataGroupParam);
+        DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @GetMapping("/findGroupById")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查询组")
+    @ApiImplicitParam(name = "list", value = "数据集合", required = true)
+    public HttpResult<List<DataGroup>> findGroupById(@RequestParam List<String> list){
+        String methodDescribe = getMethodDescribe("findGroupById");
+        LogUtil.njcnDebug(log, "{}，数据集合：{}", methodDescribe, list);
+        List<DataGroup> result = dataGroupService.findGroupById(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @DeleteMapping("/delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除组数据")
+    @ApiImplicitParam(name = "list", value = "数据集id", required = true)
+    public HttpResult<Boolean> delete(@RequestParam List<String> list){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，数据集id：{}", methodDescribe, list);
+        boolean result = dataGroupService.deleteDataGroup(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/DataSetController.java

@@ -0,0 +1,73 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.param.DataSetParam;
+import com.njcn.quality.pojo.po.DataMould;
+import com.njcn.quality.pojo.po.DataSet;
+import com.njcn.quality.service.IDataSetService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/9 10:06
+ */
+@Slf4j
+@RestController
+@RequestMapping("/dataSet")
+@RequiredArgsConstructor
+@Api(tags = "装置数据集管理")
+public class DataSetController extends BaseController {
+
+    private final IDataSetService dataSetService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增装置数据集")
+    @ApiImplicitParam(name = "dataSetParam", value = "装置数据集", required = true)
+    public HttpResult<DataMould> add(@RequestBody DataSetParam dataSetParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，装置数据集为：{}", methodDescribe, dataSetParam);
+        DataSet dataSet = dataSetService.add(dataSetParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @DeleteMapping("/delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除数据集")
+    @ApiImplicitParam(name = "id", value = "模板id", required = true)
+    public HttpResult<Boolean> delete(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，模板id：{}", methodDescribe, id);
+        boolean result = dataSetService.delete(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @GetMapping("/findSetById")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据id获取数据集")
+    @ApiImplicitParam(name = "id", value = "模板id", required = true)
+    public HttpResult<List<DataSet>> findSetById(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("findSetById");
+        LogUtil.njcnDebug(log, "{}，模板id：{}", methodDescribe, id);
+        List<DataSet> list = dataSetService.findSetById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/DevModelController.java

@@ -0,0 +1,75 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.param.DataModelParam;
+import com.njcn.quality.pojo.po.DataMould;
+import com.njcn.quality.service.IDevModelService;
+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.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/8 20:24
+ */
+@Slf4j
+@RestController
+@RequestMapping("/devModel")
+@RequiredArgsConstructor
+@Api(tags = "装置模板管理")
+public class DevModelController extends BaseController {
+
+    private final IDevModelService devModelService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增设备数据模板")
+    @ApiImplicitParam(name = "dataModelParam", value = "设备版本信息", required = true)
+    public HttpResult<DataMould> add(@RequestBody DataModelParam dataModelParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，设备版本信息为：{}", methodDescribe, dataModelParam);
+        DataMould dataMould = devModelService.addDataMould(dataModelParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @DeleteMapping("/delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除设备数据模板")
+    @ApiImplicitParam(name = "id", value = "模板id", required = true)
+    public HttpResult<Boolean> delete(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，模板id：{}", methodDescribe, id);
+        boolean result = devModelService.deleteById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @GetMapping("/findMould")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查找模板")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "模板名称", required = true),
+            @ApiImplicitParam(name = "version", value = "模板版本", required = true),
+            @ApiImplicitParam(name = "time", value = "模板时间", required = true)
+    })
+    public HttpResult<DataMould> findMould(@RequestParam String name,@RequestParam String version,@RequestParam String time){
+        String methodDescribe = getMethodDescribe("findMould");
+        LogUtil.njcnDebug(log, "{}，模板名称：{}，模板版本：{}，模板时间：{}", methodDescribe, name,version,time);
+        DataMould dataMould = devModelService.findMould(name, version, time);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataMould, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/DevVersionController.java

@@ -0,0 +1,62 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.param.DevVersionParam;
+import com.njcn.quality.pojo.po.DevVersion;
+import com.njcn.quality.service.IDevVersionService;
+import com.njcn.web.controller.BaseController;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+/**
+ * 类的介绍：设备版本信息表
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/7 18:56
+ */
+@Slf4j
+@RestController
+@RequestMapping("/version")
+@RequiredArgsConstructor
+@Api(tags = "版本信息")
+public class DevVersionController extends BaseController {
+
+    private final com.njcn.quality.service.IDevVersionService IDevVersionService;
+
+    @PostMapping("add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增设备版本信息")
+    @ApiImplicitParam(name = "devVersionParam", value = "设备版本信息", required = true)
+    public HttpResult<DevVersion> add(@RequestBody DevVersionParam devVersionParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，网关设备数据为：{}", methodDescribe, devVersionParam);
+        DevVersion devVersion = IDevVersionService.addDevVersion(devVersionParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @DeleteMapping("delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除设备版本信息")
+    @ApiImplicitParam(name = "id", value = "设备版本id", required = true)
+    public HttpResult<Boolean> delete(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，设备版本id：{}", methodDescribe, id);
+        boolean result = IDevVersionService.deleteDevVersion(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleActrlController.java

@@ -0,0 +1,70 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleActrl;
+import com.njcn.quality.service.IEleActrlService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 20:13
+ */
+@Slf4j
+@RestController
+@RequestMapping("/actrl")
+@RequiredArgsConstructor
+@Api(tags = "自动控制数据管理")
+public class EleActrlController extends BaseController {
+
+    private final IEleActrlService eleActrlService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增自动控制数据")
+    @ApiImplicitParam(name = "eleActrl", value = "自动控制数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleActrl eleActrl){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，自动控制数据：{}", methodDescribe, eleActrl);
+        boolean result = eleActrlService.addActrl(eleActrl);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改自动控制数据")
+    @ApiImplicitParam(name = "eleActrl", value = "自动控制数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleActrl eleActrl){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，自动控制数据：{}", methodDescribe, eleActrl);
+        boolean result = eleActrlService.updateActrl(eleActrl);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleActrl> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleActrl eleActrl = eleActrlService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleActrl, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleAirStrategyController.java

@@ -0,0 +1,196 @@
+package com.njcn.quality.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.common.utils.LogUtil;
+import com.njcn.quality.param.AirStrategyParam;
+import com.njcn.quality.pojo.po.AirStrategy;
+import com.njcn.quality.pojo.vo.AirStrategyVO;
+import com.njcn.quality.pojo.vo.EnergyDeviceTreeVO;
+import com.njcn.quality.service.EleAirStrategyService;
+import com.njcn.quality.service.ILogicDeviceLineService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/4/21
+ */
+@Slf4j
+@RestController
+@Api(tags = "空调控制策略")
+@RequestMapping("/air")
+@RequiredArgsConstructor
+public class EleAirStrategyController extends BaseController {
+
+    private final EleAirStrategyService eleAirStrategyService;
+
+    private final ILogicDeviceLineService iLogicDeviceLineService;
+
+    /**
+     * 新增空调策略
+     * @author cdf
+     * @date 2022/2/22
+     */
+    @PostMapping("add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增空调策略")
+    @ApiImplicitParam(name = "airStrategyParam", value = "空调策略", required = true)
+    public HttpResult<Object> add(@RequestBody  @Validated AirStrategyParam airStrategyParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，空调策略数据为：{}", methodDescribe, airStrategyParam);
+        boolean result = eleAirStrategyService.addAirStrategy(airStrategyParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+
+
+
+    /**
+     * 查询空调策略
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/list")
+    @ApiOperation("查询空调策略")
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    public HttpResult<Page<AirStrategy>> list(@RequestBody @Validated AirStrategyParam.AirStrategyQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("list");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        Page<AirStrategy> result = eleAirStrategyService.listAirStrategy(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+    /**
+     * 修改空调策略
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改空调策略")
+    @ApiImplicitParam(name = "updateParam", value = "空调策略设备数据", required = true)
+    public HttpResult<Object> update(@RequestBody @Validated AirStrategyParam.AirUpdateParam updateParam) {
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，空调策略数据为：{}", methodDescribe, updateParam);
+        boolean result = eleAirStrategyService.updateAirStrategy(updateParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+
+    /**
+     * 删除空调策略
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @GetMapping("/delete")
+    @ApiOperation("删除空调策略")
+    @ApiImplicitParam(name = "id", value = "网关设备索引", required = true)
+    public HttpResult<Object> delete(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = eleAirStrategyService.deleteAirStrategy(id);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+
+    /**
+     * 查询空调策略详情
+     * @author cdf
+     * @date 2022/3/28
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getAirStrategyInfo")
+    @ApiOperation("查询空调策略")
+    @ApiImplicitParam(name = "id", value = "查询参数", required = true)
+    public HttpResult<AirStrategyVO> getAirStrategyInfo(@RequestParam("id")String id) {
+        String methodDescribe = getMethodDescribe("getAirStrategyInfo");
+        AirStrategyVO airStrategy  = eleAirStrategyService.findById(id);
+        if(Objects.nonNull(airStrategy)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, airStrategy, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+    }
+
+
+
+    /**
+     * 查询空调策略详情
+     * @author cdf
+     * @date 2022/3/28
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getAirLineTree")
+    @ApiOperation("查询空调监测点树")
+    public HttpResult<List<EnergyDeviceTreeVO>> getAirLineTree() {
+        String methodDescribe = getMethodDescribe("getAirLineTree");
+        List<EnergyDeviceTreeVO> list  = iLogicDeviceLineService.getAirLineTree();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    /**
+     * 执行按钮触发
+     * @author cdf
+     * @date 2022/4/22
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/startAirStrategy")
+    @ApiOperation("执行空调策略任务")
+    public HttpResult<Object> startAirStrategy(@RequestParam("id")String id) {
+        String methodDescribe = getMethodDescribe("startAirStrategy");
+        boolean res  = eleAirStrategyService.startAirStrategy(id);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else{
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+
+    /**
+     * 根据策略定时开启关闭空调
+     * @author cdf
+     * @date 2022/4/22
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/dealAirStrategyId")
+    @ApiOperation("根据策略定时开启关闭空调")
+    public HttpResult<Object> dealAirStrategyId(@RequestParam("id")String id,@RequestParam("operation")String operation) {
+        String methodDescribe = getMethodDescribe("dealAirStrategyId");
+        boolean res  = eleAirStrategyService.dealAirStrategyId(id,operation);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else{
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }    }
+
+
+
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleAlmController.java

@@ -0,0 +1,70 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleALM;
+import com.njcn.quality.service.IEleAlmService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 18:48
+ */
+@Slf4j
+@RestController
+@RequestMapping("/alm")
+@RequiredArgsConstructor
+@Api(tags = "设备告警数据管理")
+public class EleAlmController extends BaseController {
+
+
+    private final IEleAlmService eleAlmService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增设备告警数据")
+    @ApiImplicitParam(name = "eleAlM", value = "设备告警数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleALM eleAlM){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，设备告警数据：{}", methodDescribe, eleAlM);
+        boolean result = eleAlmService.addAlm(eleAlM);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改设备告警数据")
+    @ApiImplicitParam(name = "eleAlM", value = "设备告警数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleALM eleAlM){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，设备告警数据：{}", methodDescribe, eleAlM);
+        boolean result = eleAlmService.updateAlm(eleAlM);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleALM> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleALM eleAlM = eleAlmService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleAlM, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleBindController.java

@@ -0,0 +1,72 @@
+package com.njcn.quality.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.quality.param.ElDataBindParam;
+import com.njcn.quality.pojo.po.EleBind;
+import com.njcn.quality.pojo.vo.YunCaiDataVO;
+import com.njcn.quality.service.IEleBindService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/3/29
+ */
+@Slf4j
+@RestController
+@RequestMapping("/bind")
+@RequiredArgsConstructor
+@Api(tags = "用能组态数据绑定")
+public class EleBindController extends BaseController {
+
+    private final IEleBindService iEleBindService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增绑定关系")
+    @ApiImplicitParam(name = "elDataBindParam", value = "绑定信息", required = true)
+    public HttpResult add(@RequestBody ElDataBindParam elDataBindParam){
+        String methodDescribe = getMethodDescribe("add");
+
+        boolean line = iEleBindService.addBind(elDataBindParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @GetMapping("/list")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查询指定网关下的数据绑定关系")
+    @ApiImplicitParam(name = "ndid", value = "绑定信息", required = true)
+    public HttpResult<List<EleBind>> getList(@RequestParam String ndid){
+        String methodDescribe = getMethodDescribe("getList");
+        List<EleBind> line = iEleBindService.getList(ndid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, line, methodDescribe);
+    }
+
+
+    @PostMapping("/getLineListDetail")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取指定系统下的数据")
+    @ApiImplicitParam(name = "lineList", value = "绑定信息", required = true)
+    public HttpResult<List<YunCaiDataVO>> getLineListDetail(@RequestBody List<String> lineList){
+        String methodDescribe = getMethodDescribe("getLineListDetail");
+        List<YunCaiDataVO> line = iEleBindService.getLineListDetail(lineList);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, line, methodDescribe);
+    }
+
+
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleCtrlController.java

@@ -0,0 +1,69 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleCtrl;
+import com.njcn.quality.service.IEleCtrlService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 20:02
+ */
+@Slf4j
+@RestController
+@RequestMapping("/ctrl")
+@RequiredArgsConstructor
+@Api(tags = "设备控制数据管理")
+public class EleCtrlController extends BaseController {
+
+    private final IEleCtrlService eleCtrlService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增设备控制数据")
+    @ApiImplicitParam(name = "eleCtrl", value = "设备控制数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleCtrl eleCtrl){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，设备控制数据：{}", methodDescribe, eleCtrl);
+        boolean result = eleCtrlService.addCtrl(eleCtrl);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改设备控制数据")
+    @ApiImplicitParam(name = "eleCtrl", value = "设备控制数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleCtrl eleCtrl){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，设备控制数据：{}", methodDescribe, eleCtrl);
+        boolean result = eleCtrlService.updateCtrl(eleCtrl);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleCtrl> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleCtrl eleCtrl = eleCtrlService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleCtrl, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleDiController.java

@@ -0,0 +1,70 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleDi;
+import com.njcn.quality.service.IEleDiService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 19:17
+ */
+@Slf4j
+@RestController
+@RequestMapping("/di")
+@RequiredArgsConstructor
+@Api(tags = "开入信号量数据管理")
+public class EleDiController extends BaseController {
+
+    private final IEleDiService eleDiService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增开入信号量数据")
+    @ApiImplicitParam(name = "eleDi", value = "开入信号量数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleDi eleDi){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，开入信号量数据：{}", methodDescribe, eleDi);
+        boolean result = eleDiService.addDi(eleDi);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改开入信号量数据")
+    @ApiImplicitParam(name = "eleDi", value = "开入信号量数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleDi eleDi){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，开入信号量数据：{}", methodDescribe, eleDi);
+        boolean result = eleDiService.updateDi(eleDi);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleDi> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleDi eleDi = eleDiService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleDi, methodDescribe);
+    }
+
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleDictController.java

@@ -0,0 +1,124 @@
+package com.njcn.quality.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.common.utils.LogUtil;
+import com.njcn.quality.param.DictParam;
+import com.njcn.quality.pojo.po.EleDict;
+import com.njcn.quality.service.IEleDictService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/24 10:59
+ */
+@Slf4j
+@RestController
+@RequestMapping("/eleDict")
+@RequiredArgsConstructor
+@Api(tags = "字典数据管理")
+public class EleDictController extends BaseController {
+
+
+    private final IEleDictService iEleDictService;
+
+    /**
+     * 新增字典表
+     * @author cdf
+     * @date 2022/3/22
+     */
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增字典表")
+    @ApiImplicitParam(name = "dictParam", value = "字典表数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody DictParam dictParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, dictParam);
+        iEleDictService.add(dictParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+    /**
+     * 修改字典
+     * @author cdf
+     * @date 2022/3/22
+     */
+    @PostMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改字典")
+    @ApiImplicitParam(name = "dictUpdateParam", value = "字典表数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody DictParam.DictUpdateParam dictUpdateParam){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, dictUpdateParam);
+        iEleDictService.update(dictUpdateParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+    /**
+     * 删除字典
+     * @author cdf
+     * @date 2022/3/22
+     */
+    @DeleteMapping("/delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("删除字典")
+    @ApiImplicitParam(name = "id", value = "字典表索引", required = true)
+    public HttpResult<Boolean> delete(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("delete");
+        iEleDictService.delete(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+    /**
+     * 查询字典列表
+     * @author cdf
+     * @date 2022/3/22
+     */
+    @PostMapping("/getList")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查询字典列表")
+    public HttpResult<Page<EleDict>> getList(@RequestBody DictParam.DictQueryParam dictQueryParam){
+        String methodDescribe = getMethodDescribe("getList");
+        Page<EleDict> res= iEleDictService.getList(dictQueryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+
+
+    /**
+     * 查询字典
+     * @author cdf
+     * @date 2022/3/22
+     */
+    @PostMapping("/getById")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查询字典")
+    public HttpResult<EleDict> getById(String id){
+        String methodDescribe = getMethodDescribe("getById");
+        EleDict res= iEleDictService.getById(id);
+        if(Objects.nonNull(res)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleDoController.java

@@ -0,0 +1,69 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleDo;
+import com.njcn.quality.service.IEleDoService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 19:28
+ */
+@Slf4j
+@RestController
+@RequestMapping("/do")
+@RequiredArgsConstructor
+@Api(tags = "设备开出数据管理")
+public class EleDoController extends BaseController {
+
+    private final IEleDoService eleDoService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增设备开出数据")
+    @ApiImplicitParam(name = "eleDo", value = "设备开出数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleDo eleDo){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，设备开出数据：{}", methodDescribe, eleDo);
+        boolean result = eleDoService.addDo(eleDo);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改设备开出数据")
+    @ApiImplicitParam(name = "eleDo", value = "设备开出数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleDo eleDo){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，设备开出数据：{}", methodDescribe, eleDo);
+        boolean result = eleDoService.updateDo(eleDo);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleDo> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleDo eleDo = eleDoService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleDo, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleEpdPqdController.java

@@ -0,0 +1,87 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleEpdPqd;
+import com.njcn.quality.service.IEleEpdPqdService;
+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.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 10:02
+ */
+@Slf4j
+@RestController
+@RequestMapping("/epd")
+@RequiredArgsConstructor
+@Api(tags = "电能质量数据管理")
+public class EleEpdPqdController extends BaseController {
+
+    private final IEleEpdPqdService eleEpdPqdService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增电能质量数据")
+    @ApiImplicitParam(name = "eleEpdPqd", value = "电能质量数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleEpdPqd eleEpdPqd){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，电能质量数据为：{}", methodDescribe, eleEpdPqd);
+        boolean result = eleEpdPqdService.addEpd(eleEpdPqd);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改电能质量数据")
+    @ApiImplicitParam(name = "eleEpdPqd", value = "电能质量数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleEpdPqd eleEpdPqd){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，电能质量数据为：{}", methodDescribe, eleEpdPqd);
+        boolean result = eleEpdPqdService.updateEpd(eleEpdPqd);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "名称", required = true),
+            @ApiImplicitParam(name = "phase", value = "相别", required = true)
+    })
+
+    public HttpResult<EleEpdPqd> findByName(@RequestParam String name,@RequestParam String phase){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleEpdPqd eleEpdPqd = eleEpdPqdService.findByName(name,phase);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleEpdPqd, methodDescribe);
+    }
+
+
+    @GetMapping("/getAllEpd")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取所有负荷指标")
+    public HttpResult<List<EleEpdPqd>> getAllEpd() {
+        String methodDescribe = getMethodDescribe("getAllEpd");
+        List<EleEpdPqd> res = eleEpdPqdService.getAllEpd();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleEvtController.java

@@ -0,0 +1,68 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleEvt;
+import com.njcn.quality.service.IEleEvtService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 15:08
+ */
+@Slf4j
+@RestController
+@RequestMapping("/evt")
+@RequiredArgsConstructor
+@Api(tags = "设备事件数据管理")
+public class EleEvtController extends BaseController {
+
+    private final IEleEvtService eleEvtService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增设备事件数据")
+    @ApiImplicitParam(name = "eleEvt", value = "设备事件数据", required = true)
+    public HttpResult<EleEvt> add(@RequestBody EleEvt eleEvt){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，设备事件数据：{}", methodDescribe, eleEvt);
+        EleEvt result = eleEvtService.addEvt(eleEvt);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改设备事件数据")
+    @ApiImplicitParam(name = "eleEvt", value = "设备事件数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleEvt eleEvt){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，设备事件数据：{}", methodDescribe, eleEvt);
+        boolean result = eleEvtService.updateEvt(eleEvt);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleEvt> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleEvt eleEvt = eleEvtService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleEvt, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleEvtParamController.java

@@ -0,0 +1,88 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleEvtParm;
+import com.njcn.quality.service.IEleEvtParamService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 16:18
+ */
+@Slf4j
+@RestController
+@RequestMapping("/evtParam")
+@RequiredArgsConstructor
+@Api(tags = "单个设备事件数据管理")
+public class EleEvtParamController extends BaseController {
+
+    private final IEleEvtParamService eleEvtParamService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增数据")
+    @ApiImplicitParam(name = "eleEvtParam", value = "数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleEvtParm eleEvtParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，数据：{}", methodDescribe, eleEvtParam);
+        boolean result = eleEvtParamService.addEleEvtParam(eleEvtParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改数据")
+    @ApiImplicitParam(name = "eleEvtParam", value = "数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleEvtParm eleEvtParam){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，数据：{}", methodDescribe, eleEvtParam);
+        boolean result = eleEvtParamService.updateEleEvtParam(eleEvtParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleEvtParm> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleEvtParm eleEvtParm = eleEvtParamService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleEvtParm, methodDescribe);
+    }
+
+    @DeleteMapping("/deleteById")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据id删除数据")
+    @ApiImplicitParam(name = "id", value = "id", required = true)
+    public HttpResult<Boolean> deleteById(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("deleteById");
+        LogUtil.njcnDebug(log, "{}，id：{}", methodDescribe, id);
+        boolean result = eleEvtParamService.deleteById(id);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleIntegrityController.java

@@ -0,0 +1,82 @@
+package com.njcn.quality.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.PatternRegex;
+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.common.utils.LogUtil;
+import com.njcn.quality.mapper.EleIntegrityMapper;
+import com.njcn.quality.pojo.vo.EleIntegrityVO;
+import com.njcn.quality.service.IEleIntegrityService;
+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.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.constraints.Pattern;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/31 19:37
+ */
+@Slf4j
+@RestController
+@RequestMapping("/integrity")
+@RequiredArgsConstructor
+@Api(tags = "完整性管理")
+@Validated
+public class EleIntegrityController extends BaseController {
+
+    private final IEleIntegrityService eleIntegrityService;
+
+    private final EleIntegrityMapper eleIntegrityMapper;
+
+    @PostMapping("/getIntegrityTree")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("用能数据完整性树表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", value = "起始时间", required = true),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+    })
+    public HttpResult<List<EleIntegrityVO>> getIntegrityTree(@RequestParam @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") String startTime, @RequestParam @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") String endTime){
+        String methodDescribe = getMethodDescribe("getIntegrityTree");
+        LogUtil.njcnDebug(log, "{}，起始时间：{}，结束时间：{}", methodDescribe, startTime, endTime);
+        List<EleIntegrityVO> list = eleIntegrityService.getIntegrityTree(startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @PostMapping("/getPowerLineId")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取在线用采监测点")
+    @ApiIgnore
+    public HttpResult<List<String>> getPowerLineId(){
+        String methodDescribe = getMethodDescribe("getPowerLineId");
+        List<String> list = eleIntegrityMapper.getPowerLineId();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @PostMapping("/getAirLineId")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取在线空调监测点")
+    @ApiIgnore
+    public HttpResult<List<String>> getAirLineId(){
+        String methodDescribe = getMethodDescribe("getAirLineId");
+        List<String> list = eleIntegrityMapper.getAirLineId();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleLineController.java

@@ -0,0 +1,74 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.param.LineParam;
+import com.njcn.quality.pojo.po.EleLine;
+import com.njcn.quality.pojo.po.LogicDev;
+import com.njcn.quality.service.IEleLineService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/8 14:28
+ */
+@Slf4j
+@RestController
+@RequestMapping("/line")
+@RequiredArgsConstructor
+@Api(tags = "监测点管理")
+public class EleLineController extends BaseController {
+
+    private final IEleLineService lineService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增监测点信息")
+    @ApiImplicitParam(name = "lineParam", value = "监测点信息", required = true)
+    public HttpResult<LogicDev> add(@RequestBody LineParam lineParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，监测点信息为：{}", methodDescribe, lineParam);
+        EleLine line = lineService.add(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @PostMapping("/delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除监测点信息")
+    @ApiImplicitParam(name = "list", value = "逻辑装置id集合", required = true)
+    public HttpResult<Boolean> delete(@RequestParam List<String> list){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，逻辑装置id集合：{}", methodDescribe,list);
+        boolean result = lineService.deleteByList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @GetMapping("/getAllLine")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取所有注册监测点")
+    public HttpResult<List<EleLine>> getAllLine(@RequestParam String netDevName){
+        String methodDescribe = getMethodDescribe("getAllLine");
+        List<EleLine> lineRes = lineService.getAllLine(netDevName);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineRes, methodDescribe);
+    }
+
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleLoadSetController.java

@@ -0,0 +1,68 @@
+package com.njcn.quality.controller;
+
+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.quality.param.EleParam;
+import com.njcn.quality.pojo.vo.EleLoadSetTreeVO;
+import com.njcn.quality.pojo.vo.EleLoadSetVO;
+import com.njcn.quality.service.EleLoadSetService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用能统计类型配置
+ *
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月14日 15:13
+ */
+@Slf4j
+@RestController
+@RequestMapping("/loadset")
+@RequiredArgsConstructor
+@Api(tags = "用能负荷类型配置")
+public class EleLoadSetController extends BaseController {
+
+    private final EleLoadSetService eleLoadSetService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getEleLoadSetDetail")
+    @ApiOperation("用能负荷类型配置详情")
+    public HttpResult<List<EleLoadSetVO>> getEleLoadSetDetail() {
+        String methodDescribe = getMethodDescribe("getEleLoadSetDetail");
+        List<EleLoadSetVO> list = eleLoadSetService.getEleLoadSetDetail();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEleLoadSetTree")
+    @ApiOperation("用能负荷类型配置树")
+    @ApiImplicitParam(name = "eleLoadSetVO", value = "配置参数", required = true)
+    public HttpResult<EleLoadSetTreeVO> getEleLoadSetTree(@RequestBody @Validated EleLoadSetVO eleLoadSetVO) {
+        String methodDescribe = getMethodDescribe("getEleLoadSetTree");
+        EleLoadSetTreeVO list = eleLoadSetService.getEleLoadTree(eleLoadSetVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/add")
+    @ApiOperation("用能负荷类型绑定监测点")
+    @ApiImplicitParam(name = "eleParam", value = "负荷类型配置参数", required = true)
+    public HttpResult<Boolean> add(@RequestBody @Validated EleParam eleParam) {
+        String methodDescribe = getMethodDescribe("add");
+        Boolean list = eleLoadSetService.add(eleParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleLogsController.java

@@ -0,0 +1,25 @@
+package com.njcn.quality.controller;
+
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/4/6 19:55
+ */
+@Slf4j
+@RestController
+@RequestMapping("/logs")
+@RequiredArgsConstructor
+@Api(tags = "用能日志管理")
+public class EleLogsController extends BaseController {
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleMdController.java

@@ -0,0 +1,72 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleMd;
+import com.njcn.quality.service.IEleMdService;
+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.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 13:30
+ */
+@Slf4j
+@RestController
+@RequestMapping("/md")
+@RequiredArgsConstructor
+@Api(tags = "基础测量数据管理")
+public class EleMdController extends BaseController {
+
+    private final IEleMdService eleMdService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增基础测量数据")
+    @ApiImplicitParam(name = "eleMd", value = "基础测量数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleMd eleMd){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，电能质量数据为：{}", methodDescribe, eleMd);
+        boolean result = eleMdService.addMd(eleMd);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改基础测量数据")
+    @ApiImplicitParam(name = "eleMd", value = "基础测量数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleMd eleMd){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，电能质量数据为：{}", methodDescribe, eleMd);
+        boolean result = eleMdService.updateMd(eleMd);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "名称", required = true),
+            @ApiImplicitParam(name = "phase", value = "相别", required = true)
+    })
+    public HttpResult<EleMd> findByName(@RequestParam String name,@RequestParam String phase){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleMd eleMd = eleMdService.findByName(name,phase);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleMd, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleOnlineRateController.java

@@ -0,0 +1,77 @@
+package com.njcn.quality.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.PatternRegex;
+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.common.utils.LogUtil;
+import com.njcn.quality.pojo.dto.OnlineRateDTO;
+import com.njcn.quality.pojo.vo.EleIntegrityVO;
+import com.njcn.quality.service.IEleInformationService;
+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.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.constraints.Pattern;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/4/20 14:57
+ */
+@Slf4j
+@RestController
+@RequestMapping("/onlineRate")
+@RequiredArgsConstructor
+@Api(tags = "在线率管理")
+@Validated
+public class EleOnlineRateController extends BaseController {
+
+    private final IEleInformationService eleInformationService;
+
+    @PostMapping("/getDeviceTime")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("装置在线率数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", value = "起始时间", required = true),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+    })
+    @ApiIgnore
+    public HttpResult<List<OnlineRateDTO>> getDeviceTime(@RequestParam @Pattern(regexp = PatternRegex.TIME_SECOND_FORMAT, message = "时间格式错误") String startTime, @RequestParam @Pattern(regexp = PatternRegex.TIME_SECOND_FORMAT, message = "时间格式错误") String endTime){
+        String methodDescribe = getMethodDescribe("getDeviceTime");
+        LogUtil.njcnDebug(log, "{}，起始时间：{}，结束时间：{}", methodDescribe, startTime, endTime);
+        List<OnlineRateDTO> list = eleInformationService.getDeviceTime(startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @PostMapping("/getOnlineRateTree")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("用能终端在线率树表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", value = "起始时间", required = true),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+    })
+    public HttpResult<List<EleIntegrityVO>> getOnlineRateTree(@RequestParam @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") String startTime, @RequestParam @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") String endTime){
+        String methodDescribe = getMethodDescribe("getOnlineRateTree");
+        LogUtil.njcnDebug(log, "{}，起始时间：{}，结束时间：{}", methodDescribe, startTime, endTime);
+        List<EleIntegrityVO> list = eleInformationService.getOnlineRateTree(startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleParmController.java

@@ -0,0 +1,69 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleParm;
+import com.njcn.quality.service.IEleParmService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 19:44
+ */
+@Slf4j
+@RestController
+@RequestMapping("/parm")
+@RequiredArgsConstructor
+@Api(tags = "设备参数数据管理")
+public class EleParmController extends BaseController {
+
+    private final IEleParmService eleParmService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增设备参数数据")
+    @ApiImplicitParam(name = "eleParm", value = "设备参数数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleParm eleParm){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，设备参数数据：{}", methodDescribe, eleParm);
+        boolean result = eleParmService.addParm(eleParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改设备参数数据")
+    @ApiImplicitParam(name = "eleParm", value = "设备参数数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleParm eleParm){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，设备参数数据：{}", methodDescribe, eleParm);
+        boolean result = eleParmService.updateParm(eleParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleParm> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleParm eleParm = eleParmService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleParm, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleRateSetController.java

@@ -0,0 +1,58 @@
+package com.njcn.quality.controller;
+
+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.quality.pojo.po.EleRateSet;
+import com.njcn.quality.pojo.vo.EleRateVO;
+import com.njcn.quality.service.EleRateSetService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 费率统计配置
+ *
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月13日 19:34
+ */
+@Slf4j
+@RestController
+@RequestMapping("/rate")
+@RequiredArgsConstructor
+@Api(tags = "电度费率配置")
+public class EleRateSetController extends BaseController {
+
+    private final EleRateSetService eleRateSetService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getEleRateDetail")
+    @ApiOperation("费率详情")
+    public HttpResult<List<EleRateVO>> getEleRateDetail() {
+        String methodDescribe = getMethodDescribe("getEleRateDetail");
+        List<EleRateVO> list = eleRateSetService.getEleRateDetail();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/add")
+    @ApiOperation("费率配置")
+    @ApiImplicitParam(name = "eleRateSet", value = "费率参数", required = true)
+    public HttpResult<Boolean> add(@RequestBody @Validated EleRateSet eleRateSet) {
+        String methodDescribe = getMethodDescribe("save");
+        Boolean list = eleRateSetService.add(eleRateSet);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleStatisticalSetController.java

@@ -0,0 +1,68 @@
+package com.njcn.quality.controller;
+
+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.quality.param.EleParam;
+import com.njcn.quality.pojo.vo.EleStatisticalTreeVO;
+import com.njcn.quality.pojo.vo.EleStatisticalVO;
+import com.njcn.quality.service.EleStatisticalSetService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用能统计类型配置
+ *
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月14日 15:13
+ */
+@Slf4j
+@RestController
+@RequestMapping("/statistical")
+@RequiredArgsConstructor
+@Api(tags = "用能统计类型配置")
+public class EleStatisticalSetController extends BaseController {
+
+    private final EleStatisticalSetService eleStatisticalSetService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getEleStatisticalDetail")
+    @ApiOperation("用能统计配置详情")
+    public HttpResult<List<EleStatisticalVO>> getEleStatisticalDetail() {
+        String methodDescribe = getMethodDescribe("getEleStatisticalDetail");
+        List<EleStatisticalVO> list = eleStatisticalSetService.getEleStatisticalDetail();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEleStatisticalTree")
+    @ApiOperation("用能统计配置树")
+    @ApiImplicitParam(name = "eleStatisticalVO", value = "配置参数", required = true)
+    public HttpResult<EleStatisticalTreeVO> getEleStatisticalTree(@RequestBody @Validated EleStatisticalVO eleStatisticalVO) {
+        String methodDescribe = getMethodDescribe("getEleStatisticalTree");
+        EleStatisticalTreeVO list = eleStatisticalSetService.getEleStatisticalTree(eleStatisticalVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/add")
+    @ApiOperation("用能统计绑定指标")
+    @ApiImplicitParam(name = "eleParam", value = "统计类型配置参数", required = true)
+    public HttpResult<Boolean> add(@RequestBody @Validated EleParam eleParam) {
+        String methodDescribe = getMethodDescribe("add");
+        Boolean list = eleStatisticalSetService.add(eleParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleStsController.java

@@ -0,0 +1,68 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleSts;
+import com.njcn.quality.service.IEleStsService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 19:06
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sts")
+@RequiredArgsConstructor
+@Api(tags = "设备状态数据管理")
+public class EleStsController extends BaseController {
+
+    private final IEleStsService eleStsService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增电能质量数据")
+    @ApiImplicitParam(name = "eleSts", value = "电能质量数据", required = true)
+    public HttpResult<Boolean> add(@RequestBody EleSts eleSts){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，电能质量数据为：{}", methodDescribe, eleSts);
+        boolean result = eleStsService.addSts(eleSts);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PutMapping("/update")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("修改电能质量数据")
+    @ApiImplicitParam(name = "eleSts", value = "电能质量数据", required = true)
+    public HttpResult<Boolean> update(@RequestBody EleSts eleSts){
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，电能质量数据为：{}", methodDescribe, eleSts);
+        boolean result = eleStsService.updateSts(eleSts);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @GetMapping("/findByName")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据名称查找数据")
+    @ApiImplicitParam(name = "name", value = "名称", required = true)
+    public HttpResult<EleSts> findByName(@RequestParam String name){
+        String methodDescribe = getMethodDescribe("findByName");
+        LogUtil.njcnDebug(log, "{}，名称为：{}", methodDescribe, name);
+        EleSts eleSts = eleStsService.findByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleSts, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/EleTopicController.java

@@ -0,0 +1,87 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.pojo.po.EleTopic;
+import com.njcn.quality.service.IEleTopicService;
+import com.njcn.web.controller.BaseController;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/22 19:00
+ */
+@Slf4j
+@RestController
+@RequestMapping("/topic")
+@RequiredArgsConstructor
+@Api(tags = "网关主题管理")
+public class EleTopicController extends BaseController {
+
+    private final IEleTopicService topicService;
+
+    /**
+     * 新增网关主题信息
+     * @author xy
+     * @date 2022/3/22 19:02
+     */
+    @PostMapping("add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增网关主题")
+    @ApiImplicitParam(name = "eleTopic", value = "网关主题信息", required = true)
+    public HttpResult<Object> add(@RequestBody EleTopic eleTopic){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，网关主题信息：{}", methodDescribe, eleTopic);
+        boolean result = topicService.addTopic(eleTopic);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 查询网关主题信息
+     * @author xy
+     * @date 2022/3/22 19:02
+     */
+    @GetMapping("list")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.QUERY)
+    @ApiOperation("查询网关主题")
+    @ApiImplicitParam(name = "id", value = "网关id", required = true)
+    public HttpResult<List<EleTopic>> list(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("list");
+        LogUtil.njcnDebug(log, "{}，网关id：{}", methodDescribe, id);
+        List<EleTopic> list = topicService.list(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    /**
+     * 删除网关主题信息
+     * @author xy
+     * @date 2022/3/22 19:02
+     */
+    @DeleteMapping("delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除网关主题")
+    @ApiImplicitParam(name = "id", value = "网关id", required = true)
+    public HttpResult<Boolean> delete(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，网关id：{}", methodDescribe, id);
+        boolean result = topicService.delete(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/GroupArrayController.java

@@ -0,0 +1,64 @@
+package com.njcn.quality.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.quality.service.IGroupArrayService;
+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.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/16 11:12
+ */
+@Slf4j
+@RestController
+@RequestMapping("/groupArray")
+@RequiredArgsConstructor
+@Api(tags = "数据组关系管理")
+public class GroupArrayController extends BaseController {
+
+    private final IGroupArrayService groupArrayService;
+
+    @PutMapping("/groupArrayRelation")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("分配组和数据的关系")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "groupId", value = "groupId", required = true),
+            @ApiImplicitParam(name = "arrayId", value = "arrayId", required = true)
+    })
+    public HttpResult groupArrayRelation(@RequestParam String groupId, @RequestParam String arrayId){
+        String methodDescribe = getMethodDescribe("groupArrayRelation");
+        LogUtil.njcnDebug(log, "{}，组id,数据id：{}", methodDescribe, groupId,arrayId);
+        groupArrayService.groupArrayRelation(groupId,arrayId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+    @DeleteMapping("/deleteGroupArray")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除组和数据关系")
+    @ApiImplicitParam(name = "list", value = "组集合", required = true)
+    public HttpResult<Boolean> deleteGroupArray(@RequestParam List<String> list){
+        String methodDescribe = getMethodDescribe("deleteGroupArray");
+        LogUtil.njcnDebug(log, "{}，组集合：{}", methodDescribe, list);
+        boolean result = groupArrayService.deleteGroupArray(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/HardwareController.java

@@ -0,0 +1,71 @@
+package com.njcn.quality.controller;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/8 10:45
+ */
+
+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.common.utils.LogUtil;
+import com.njcn.quality.param.HardwareParam;
+import com.njcn.quality.pojo.po.DevVersion;
+import com.njcn.quality.pojo.po.Hardware;
+import com.njcn.quality.service.IHardwareService;
+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.*;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/2/28 10:55
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hardware")
+@AllArgsConstructor
+@Api(tags = "硬件管理")
+public class HardwareController extends BaseController {
+
+    private final IHardwareService hardwareService;
+
+    @PostMapping("add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
+    @ApiOperation("新增设备硬件信息")
+    @ApiImplicitParam(name = "hardwareParam", value = "设备硬件信息", required = true)
+    public HttpResult<DevVersion> add(@RequestBody HardwareParam hardwareParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，设备硬件信息为：{}", methodDescribe, hardwareParam);
+        Hardware hardware = hardwareService.addHardware(hardwareParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @DeleteMapping("delete")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除设备硬件信息")
+    @ApiImplicitParam(name = "list", value = "list", required = true)
+    public HttpResult<Boolean> delete(@RequestParam List<String> list){
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，list：{}", methodDescribe, list);
+        boolean result = hardwareService.deleteHardware(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/HighAnalyticController.java

@@ -0,0 +1,188 @@
+package com.njcn.quality.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.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+
+import com.njcn.quality.enums.EnergyResponseEnum;
+import com.njcn.quality.param.ElectComparaParam;
+import com.njcn.quality.param.LoadStatisticParam;
+import com.njcn.quality.pojo.vo.ElectCompareVO;
+import com.njcn.quality.pojo.vo.LoadStatisticVO;
+import com.njcn.quality.pojo.vo.LoadTendencyVO;
+import com.njcn.quality.service.HighAnalyticService;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * pqs
+ * 高级分析
+ * @author cdf
+ * @date 2022/4/14
+ */
+@Slf4j
+@RestController
+@RequestMapping("/advance")
+@AllArgsConstructor
+@Api(tags = "高级分析")
+public class HighAnalyticController extends BaseController {
+
+    private final HighAnalyticService highAnalyticService;
+
+
+    /**
+     * 获取负荷趋势分析
+     * @author cdf
+     * @date 2022/4/15
+     */
+
+    @GetMapping("getLoadTendency")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取负荷趋势分析")
+    public HttpResult<List<LoadTendencyVO>> getLoadTendency(@RequestParam("loadType")String loadType, @RequestParam("startTime")String startTime, @RequestParam("endTime")String endTime){
+        String methodDescribe = getMethodDescribe("getLoadTendency");
+        List<LoadTendencyVO> res = highAnalyticService.getLoadTendency(loadType,startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+    /**
+     * 负荷占比
+     * @author cdf
+     * @date 2022/4/19
+     */
+    @PostMapping("getLoadRate")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("负荷占比分析")
+    public HttpResult<List<Map<String,String>>> getLoadRate(@RequestParam("loadType")String loadType,@RequestParam("startTime")String startTime){
+        String methodDescribe = getMethodDescribe("getLoadRate");
+        List<Map<String,String>> res = highAnalyticService.getLoadRate(loadType,startTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+    /**
+     * 获取负荷趋势分析
+     * @author cdf
+     * @date 2022/4/15
+     */
+
+    @GetMapping("getLoadDetail")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取负荷详情")
+    public HttpResult<List<LoadTendencyVO>> getLoadDetail(@RequestParam("loadType")String loadType,@RequestParam("startTime")String startTime,@RequestParam("endTime")String endTime){
+        String methodDescribe = getMethodDescribe("getLoadDetail");
+        List<LoadTendencyVO> res = highAnalyticService.getLoadDetail(loadType,startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+
+    /**
+     * 负荷统计分析
+     * @author cdf
+     * @date 2022/4/18
+     */
+    @PostMapping("getLoadStatistics")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("负荷统计分析")
+    public HttpResult<List<LoadStatisticVO>> getLoadStatistics(@Validated @RequestBody LoadStatisticParam loadStatisticParam){
+        String methodDescribe = getMethodDescribe("getLoadStatistics");
+        if(loadStatisticParam.getLoadType().size() !=1){
+            if(loadStatisticParam.getValType().size()!=1){
+                throw new BusinessException(EnergyResponseEnum.LOAD_VAL_CONFLICT);
+            }
+        }
+        List<LoadStatisticVO> res = highAnalyticService.getLoadStatistics(loadStatisticParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+
+    /**
+     * 电度趋势分析
+     * @author cdf
+     * @date 2022/4/19
+     */
+    @GetMapping("getElectTendency")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取电度趋势分析")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "loadType", value = "指标类型id", required = true),
+            @ApiImplicitParam(name = "type", value = "0.增量 1.累计", required = true),
+    })
+    public HttpResult<List<LoadTendencyVO>> getElectTendency(@RequestParam("loadType")String loadType,@RequestParam("type")Integer type,@RequestParam("startTime")String startTime,@RequestParam("endTime")String endTime){
+        String methodDescribe = getMethodDescribe("getElectTendency");
+        List<LoadTendencyVO> res = highAnalyticService.getElectTendency(loadType,type,startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+
+    /**
+     * 电度对比分析
+     * @author cdf
+     * @date 2022/4/19
+     */
+    @PostMapping("getElectCompare")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("电度对比分析")
+    public HttpResult<List<ElectCompareVO>> getElectCompare(@RequestBody ElectComparaParam electComparaParam){
+        String methodDescribe = getMethodDescribe("getElectCompare");
+        List<ElectCompareVO> res = highAnalyticService.getElectCompare(electComparaParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+    /**
+     * 电度占比
+     * @author cdf
+     * @date 2022/4/19
+     */
+    @PostMapping("getElectRate")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("电度占比")
+    public HttpResult<List<Map<String,String>>> getElectRate(@RequestBody ElectComparaParam electComparaParam){
+        String methodDescribe = getMethodDescribe("getElectRate");
+        List<Map<String,String>> res = highAnalyticService.getElectRate(electComparaParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+
+    /**
+     * 电度统计分析
+     * @author cdf
+     * @date 2022/4/19
+     */
+    @PostMapping("getElectStatistic")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("电度统计分析")
+    public HttpResult<List<LoadStatisticVO>> getElectStatistic(@Validated @RequestBody ElectComparaParam electComparaParam){
+        String methodDescribe = getMethodDescribe("getElectStatistic");
+        List<LoadStatisticVO> res = highAnalyticService.getElectStatistic(electComparaParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+
+    /**
+     * 获取空调趋势
+     * @author cdf
+     * @date 2022/4/18
+     */
+    @GetMapping("getAirTendency")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取空调趋势")
+    public HttpResult<List<LoadTendencyVO>> getAirTendency(@RequestParam("startTime")String startTime,@RequestParam("endTime")String endTime){
+        String methodDescribe = getMethodDescribe("getAirTendency");
+        List<LoadTendencyVO> res = highAnalyticService.getAirTendency(startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/LogicAccess.java

@@ -0,0 +1,29 @@
+package com.njcn.quality.controller;
+
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/23 21:54
+ */
+@Slf4j
+@RestController
+@RequestMapping("/access")
+@RequiredArgsConstructor
+@Api(tags = "逻辑设备接入管理")
+public class LogicAccess extends BaseController {
+
+
+
+
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/LogicDeviceLineController.java

@@ -0,0 +1,294 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.param.DataHisParam;
+import com.njcn.quality.param.DevCfgParam;
+import com.njcn.quality.param.EnergyBaseParam;
+import com.njcn.quality.param.GroupArrParam;
+import com.njcn.quality.pojo.po.DataSet;
+import com.njcn.quality.pojo.po.LogicDev;
+import com.njcn.quality.pojo.vo.*;
+import com.njcn.quality.service.ILogicDeviceLineService;
+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.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * pqs
+ * 逻辑设备监测点控制器
+ *
+ * @author cdf
+ * @date 2022/2/24
+ */
+@Slf4j
+@RestController
+@RequestMapping("/logic")
+@RequiredArgsConstructor
+@Api(tags = "逻辑设备控制器")
+public class LogicDeviceLineController extends BaseController {
+
+    private final ILogicDeviceLineService iLogicDeviceLineService;
+
+    /**
+     * 获取网关设备树
+     *
+     * @author cdf
+     * @date 2022/3/1
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getEnergyTree")
+    @ApiOperation("获取网关设备树")
+    public HttpResult<List<EnergyDeviceTreeVO>> getEnergyTree() {
+        String methodDescribe = getMethodDescribe("getEnergyTree");
+        List<EnergyDeviceTreeVO> list = iLogicDeviceLineService.getEnergyTree();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    /**
+     * 获取设备详情
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getEnergyDevInfoById")
+    @ApiOperation("获取设备详情")
+    @ApiImplicitParam(name = "id", value = "设备的id", required = true)
+    public HttpResult<LogicDeviceLineInfoVO> getEnergyDevInfoById(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getEnergyDevInfoById");
+        LogicDeviceLineInfoVO logicDeviceLineInfoVO = iLogicDeviceLineService.getEnergyDevInfoById(id);
+        if (Objects.nonNull(logicDeviceLineInfoVO)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, logicDeviceLineInfoVO, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 通过监测点id获取展示模板
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getEnergyTemplateById")
+    @ApiOperation("获取设备实时数据模板详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "设备的id", required = true),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "页面尺寸", required = true)
+    })
+    public HttpResult<IPage<EnergyTemplateVO>> getEnergyTemplateById(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) {
+        String methodDescribe = getMethodDescribe("getEnergyTemplateById");
+        IPage<EnergyTemplateVO> page = iLogicDeviceLineService.getEnergyTemplateById(id, pageNum, pageSize);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+
+    /**
+     * 通过监测点id获取展示分组模板
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getRealGroupTemplateById")
+    @ApiOperation("获取设备实时数据模板详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "设备的id", required = true),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "页面尺寸", required = true)
+    })
+    public HttpResult<IPage<DataGroupTemplateVO>> getRealGroupTemplateById(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) {
+        String methodDescribe = getMethodDescribe("getRealGroupTemplateById");
+        IPage<DataGroupTemplateVO> page = iLogicDeviceLineService.getRealGroupTemplateById(id, pageNum, pageSize);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    /**
+     * 通过监测点id获取展示模板
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/getHistoryTemplateById")
+    @ApiOperation("获取历史设备数据模板详情")
+    @ApiImplicitParam(name = "energyBaseParam",required = true)
+    public HttpResult<IPage<DataGroupTemplateVO>> getHistoryTemplateById(@RequestBody EnergyBaseParam energyBaseParam) {
+        String methodDescribe = getMethodDescribe("getHistoryTemplateById");
+        IPage<DataGroupTemplateVO> page = iLogicDeviceLineService.getHistoryTemplateById(energyBaseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    /**
+     * 通过监测点id获取展示模板统计数据
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getStatisTemplateById")
+    @ApiOperation("获取监测点统计数据模板和数据详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "tab选项id", required = true),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "页面尺寸", required = true),
+            @ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
+    })
+    public HttpResult<IPage<DataGroupTemplateVO>> getStatisTemplateById(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,@RequestParam(value = "lineId")String lineId) {
+
+        String methodDescribe = getMethodDescribe("getStatisTemplateById");
+        IPage<DataGroupTemplateVO> page = iLogicDeviceLineService.getStatisTemplateById(id, pageNum, pageSize,lineId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+
+    /**
+     * 通过监测点id获取展示模板
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getTabTemplateById")
+    @ApiOperation("获取设备数据模板详情")
+    @ApiImplicitParam(name = "id", value = "设备的id", required = true)
+    public HttpResult<List<DataSet>> getTabTemplateById(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getTabTemplateById");
+        List<DataSet> list = iLogicDeviceLineService.getTabTemplateById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取当前数据集的分组情况
+     *
+     * @author cdf
+     * @date 2022/3/16
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getGroupDetailList")
+    @ApiOperation("获取当前数据集的分组情况")
+    @ApiImplicitParam(name = "id", value = "数据集id", required = true)
+    public HttpResult<List<DataGroupTemplateVO>> getGroupDetailList(@RequestParam("id") String setId) {
+        String methodDescribe = getMethodDescribe("getGroupDetailList");
+        List<DataGroupTemplateVO> list = iLogicDeviceLineService.getGroupDetailList(setId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    /**
+     * 重新分组
+     * @author cdf
+     * @date 2022/3/16
+     */
+    @PostMapping("/addGroupArr")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增重新分组")
+    @ApiImplicitParam(name = "groupArrParam", value = "重新分组信息", required = true)
+    public HttpResult<LogicDev> addGroupArr(@RequestBody GroupArrParam groupArrParam) {
+        String methodDescribe = getMethodDescribe("addGroupArr");
+        LogUtil.njcnDebug(log, "{}，分组信息为：{}", methodDescribe, groupArrParam);
+        boolean res =iLogicDeviceLineService.addGroupArr(groupArrParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 获取解析模板
+     * @author cdf
+     * @date 2022/3/18
+     */
+    @GetMapping("/getParseTemplate")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取解析模板")
+    @ApiImplicitParam(name = "setId", value = "数据集id", required = true)
+    public HttpResult<List<String>> getParseTemplate(@RequestParam("setId") String setId){
+        String methodDescribe = getMethodDescribe("getParseTemplate");
+        List<String> list = iLogicDeviceLineService.getParseTemplate(setId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
+    @ApiOperation("新增逻辑设备")
+    @ApiImplicitParam(name = "devCfgParam", value = "逻辑设备信息", required = true)
+    public HttpResult<LogicDev> add(@RequestBody DevCfgParam devCfgParam) {
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，逻辑设备信息为：{}", methodDescribe, devCfgParam);
+        LogicDev logicDev = iLogicDeviceLineService.add(devCfgParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @GetMapping("/getLogicDevByDid")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查询逻辑设备")
+    @ApiImplicitParam(name = "did", value = "设备的did", required = true)
+    public HttpResult<LogicDev> getLogicDevByDid(@RequestParam String did){
+        String methodDescribe = getMethodDescribe("getLogicDevByDid");
+        LogUtil.njcnDebug(log, "{}，设备的did：{}", methodDescribe, did);
+        LogicDev logicDev = iLogicDeviceLineService.getLogicDev(did);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, logicDev, methodDescribe);
+    }
+
+    @GetMapping("/getLogicDevByList")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据网关查询逻辑设备")
+    @ApiImplicitParam(name = "list", value = "网关集合", required = true)
+    public HttpResult<List<LogicDev>> getLogicDevByPid(@RequestParam List<String> list){
+        String methodDescribe = getMethodDescribe("getLogicDevByList");
+        LogUtil.njcnDebug(log, "{}，网关集合：{}", methodDescribe, list);
+        List<LogicDev> result = iLogicDeviceLineService.getLogicDevByPid(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @DeleteMapping("/deleteByVersionId")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("根据版本id删除逻辑设备")
+    @ApiImplicitParam(name = "id", value = "逻辑设备版本id", required = true)
+    public HttpResult<Boolean> deleteByVersionId(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("deleteByVersionId");
+        LogUtil.njcnDebug(log, "{}，设备的did：{}", methodDescribe, id);
+        boolean result = iLogicDeviceLineService.deleteByVersionId(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @GetMapping("/getLogicDevByVersionId")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("根据版本id查询逻辑设备")
+    @ApiImplicitParam(name = "id", value = "逻辑设备版本id", required = true)
+    public HttpResult<List<LogicDev>> getLogicDevByVersionId(@RequestParam String id){
+        String methodDescribe = getMethodDescribe("getLogicDevByVersionId");
+        LogUtil.njcnDebug(log, "{}，设备的did：{}", methodDescribe, id);
+        List<LogicDev> list = iLogicDeviceLineService.getLogicDevByVersionId(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @PostMapping("/getHisData")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取历史数据")
+    @ApiImplicitParam(name = "dataHisParam", value = "参数", required = true)
+    public HttpResult<List<DataHisVO>> getHisData(@RequestBody DataHisParam dataHisParam){
+        String methodDescribe = getMethodDescribe("getHisData");
+        List<DataHisVO> list = iLogicDeviceLineService.getHisData(dataHisParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/ModelController.java

@@ -0,0 +1,70 @@
+package com.njcn.quality.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.common.utils.LogUtil;
+import com.njcn.quality.service.IModelService;
+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.RestController;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/2/28 10:55
+ */
+@Slf4j
+@RestController
+@RequestMapping("/interact")
+@AllArgsConstructor
+@Api(tags = "交互功能管理")
+public class ModelController extends BaseController {
+
+    private final IModelService modelService;
+
+    @PostMapping("/deviceRegister")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("联网装置注册请求")
+    @ApiImplicitParam(name = "json", value = "mqtt数据", required = true)
+    public HttpResult<String> deviceRegister(String json){
+        String methodDescribe = getMethodDescribe("deviceRegister");
+        LogUtil.njcnDebug(log, "{}，mqtt数据：{}", methodDescribe, json);
+        String result = modelService.deviceRegister(json);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+//    @PostMapping("/deviceAccess")
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @ApiOperation("设备接入")
+//    @ApiImplicitParam(name = "json", value = "mqtt数据", required = true)
+//    public HttpResult<String> deviceAccess(String json){
+//        String methodDescribe = getMethodDescribe("deviceAccess");
+//        LogUtil.njcnDebug(log, "{}，mqtt数据：{}", methodDescribe, json);
+//        String result = modelService.deviceAccess(json);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+//    }
+
+    @PostMapping("/deviceData")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("设备数据(模板)")
+    @ApiImplicitParam(name = "json", value = "mqtt数据", required = true)
+    public HttpResult<String> deviceData(String json){
+        String methodDescribe = getMethodDescribe("deviceData");
+        LogUtil.njcnDebug(log, "{}，mqtt数据：{}", methodDescribe, json);
+        String result = modelService.deviceData(json);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/controller/NetDevController.java

@@ -0,0 +1,141 @@
+package com.njcn.quality.controller;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.common.utils.LogUtil;
+import com.njcn.quality.param.NetDevParam;
+import com.njcn.quality.pojo.po.NetDev;
+import com.njcn.quality.pojo.vo.NetDevInfoVO;
+import com.njcn.quality.service.INetDevService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-02-22
+ */
+@Slf4j
+@RestController
+@RequestMapping("/netDev")
+@RequiredArgsConstructor
+@Api(tags = "网关控制器")
+public class NetDevController extends BaseController {
+
+    private final INetDevService netDevService;
+
+    /**
+     * 新增网关
+     * @author cdf
+     * @date 2022/2/22
+     */
+    @PostMapping("add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增网关设备")
+    @ApiImplicitParam(name = "netDevParam", value = "网关设备", required = true)
+    public HttpResult<Object> add(@RequestBody NetDevParam netDevParam){
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，网关设备数据为：{}", methodDescribe, netDevParam);
+        boolean result = netDevService.addNetDev(netDevParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+
+
+
+    /**
+     * 分页查询网关设备数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/list")
+    @ApiOperation("查询网关设备")
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    public HttpResult<Page<NetDev>> list(@RequestBody @Validated NetDevParam.NetDevQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("list");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        Page<NetDev> result = netDevService.listNetDev(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+    /**
+     * 修改网关设备数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改网关设备")
+    @ApiImplicitParam(name = "updateParam", value = "网关设备数据", required = true)
+    public HttpResult<Object> update(@RequestBody @Validated NetDevParam.NetDevUpdateParam updateParam) {
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，网关设备数据为：{}", methodDescribe, updateParam);
+        boolean result = netDevService.updateNetDev(updateParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+
+    /**
+     * 删除网关设备
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation("删除网关设备")
+    @ApiImplicitParam(name = "ids", value = "网关设备索引", required = true)
+    public HttpResult<Object> delete(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = netDevService.deleteNetDev(ids);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+
+    /**
+     * 查询网关详细信息
+     * @author cdf
+     * @date 2022/3/28
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getNetDevInfo")
+    @ApiOperation("查询网关设备")
+    @ApiImplicitParam(name = "id", value = "查询参数", required = true)
+    public HttpResult<NetDevInfoVO> getNetDevInfo(@RequestParam("id")String id) {
+        String methodDescribe = getMethodDescribe("getNetDevInfo");
+        NetDevInfoVO netDevInfo  = netDevService.getNetDevInfo(id);
+        if(Objects.nonNull(netDevInfo)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, netDevInfo, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+    }
+
+}
+

pqs-quality/quality-boot/src/main/java/com/njcn/quality/handler/MqttMessageHandler.java

@@ -0,0 +1,182 @@
+package com.njcn.quality.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.quality.enums.EnergyResponseEnum;
+import com.njcn.quality.pojo.constant.ApiParam;
+import com.njcn.quality.pojo.dto.DeviceOperateDTO;
+import com.njcn.quality.pojo.dto.RegisterDTO;
+import com.njcn.quality.pojo.po.EleLogs;
+import com.njcn.quality.service.IEleLogsService;
+import com.njcn.quality.service.IModelService;
+import com.njcn.redis.utils.RedisUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Objects;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年03月23日 09:41
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+public class MqttMessageHandler {
+
+    private final MqttPublisher publisher;
+
+    private final IModelService modelService;
+
+    private final RedisUtil redisUtil;
+
+    private final IEleLogsService eleLogsService;
+
+    /**
+     * 设备注册
+     */
+    @MqttSubscribe(value = "/device/register",qos = 1)
+    public void register(String topic, MqttMessage message, @Payload String payload) {
+        String result = modelService.deviceRegister(new String(message.getPayload(), StandardCharsets.UTF_8));
+        publisher.send("/platform/register",result,1,false);
+        EleLogs eleLogs = new EleLogs();
+        eleLogs.setType(1);
+        //设备取消注册，需要通知平台
+        Gson gson = new Gson();
+        RegisterDTO.RegisterRequest registerDTO = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), RegisterDTO.RegisterRequest.class);
+        RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class);
+        if (registerDTO.getParam().getType() == 0){
+            eleLogs.setType(0);
+            if (response.getCode() == 200 && response.getParam().getRes() == 1){
+                DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO();
+                deviceOperateDTO.setNdid(registerDTO.getParam().getNDid());
+                deviceOperateDTO.setDid(response.getParam().getDid());
+                deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000));
+                deviceOperateDTO.setMessage("装置取消注册");
+                deviceOperateDTO.setType("003");
+                publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false);
+            }
+        }
+        //将日志存库
+        eleLogs.setNdid(registerDTO.getParam().getNDid());
+        eleLogs.setReqTime(LocalDateTime.ofEpochSecond(Long.parseLong(registerDTO.getTimestamp()), 0, ZoneOffset.ofHours(8)));
+        eleLogs.setInfo(response.getMsg());
+        eleLogs.setCreateTime(LocalDateTime.now());
+        eleLogsService.addLogs(eleLogs);
+    }
+
+    /**
+     * 设备接入
+     */
+    @MqttSubscribe(value = "/device/pltreq/{version}/{edgeId}",qos = 1)
+    public void access(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId,@NamedValue("version") String version, @Payload String payload) throws InterruptedException {
+        String result = modelService.deviceAccess(new String(message.getPayload(), StandardCharsets.UTF_8),edgeId);
+        Gson gson = new Gson();
+        RegisterDTO.RegisterRequest registerDTO = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), RegisterDTO.RegisterRequest.class);
+        RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class);
+        //设备接入成功，需要通知平台
+        if (response.getCode() == 200 && Objects.equals(response.getType(), ApiParam.REP_LINKUP)){
+            DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO();
+            deviceOperateDTO.setNdid(edgeId);
+            deviceOperateDTO.setDid(registerDTO.getParam().getDid());
+            deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000));
+            deviceOperateDTO.setMessage("装置上线");
+            deviceOperateDTO.setType("004");
+            publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false);
+            deviceOperateDTO.setMessage("主题更新");
+            deviceOperateDTO.setType("002");
+            publisher.send("/device/operate",gson.toJson(deviceOperateDTO),1,false);
+        }
+        //有装置异常需要主动下线，需要通知平台
+        if (response.getCode() == 300 && Objects.equals(response.getType(), ApiParam.REP_HEARTBEAT)){
+            DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO();
+            deviceOperateDTO.setNdid(edgeId);
+            deviceOperateDTO.setDid(registerDTO.getParam().getDid());
+            deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000));
+            deviceOperateDTO.setMessage("装置下线");
+            deviceOperateDTO.setType("005");
+            publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false);
+            response.setCode(Integer.parseInt(EnergyResponseEnum.SUCCESS.getCode()));
+            result = gson.toJson(response);
+        }
+        /**
+         *  如果心跳超过3分钟，下线当前网关所有装置，需要通知平台，记录数据库掉线时间
+         *  使用redis的过期时间做处理
+         */
+        redisUtil.saveByKeyWithExpire("MQTT:" + edgeId,registerDTO.getTimestamp(),180L);
+        redisUtil.saveByKeyWithExpire(edgeId,registerDTO.getTimestamp(),200L);
+        //将日志存库
+        if (!Objects.equals(response.getType(), ApiParam.REP_HEARTBEAT)){
+            EleLogs eleLogs = new EleLogs();
+            eleLogs.setType(2);
+            eleLogs.setNdid(edgeId);
+            eleLogs.setReqTime(LocalDateTime.ofEpochSecond(Long.parseLong(registerDTO.getTimestamp()), 0, ZoneOffset.ofHours(8)));
+            eleLogs.setInfo(response.getMsg());
+            eleLogs.setCreateTime(LocalDateTime.now());
+            eleLogsService.addLogs(eleLogs);
+        }
+        //回复装置信息
+        publisher.send("/device/pltrep/"+version+"/" + edgeId,result,1,false);
+
+//        //询问模板数据 暂时线下传递模板数据
+//        Gson gson = new Gson();
+//        AccessDTO.AccessResponse response = gson.fromJson(result,AccessDTO.AccessResponse.class);
+//        if (response.getCode() == Integer.parseInt(EnergyResponseEnum.NO_MODEL_FIND.getCode())){
+//            AskDataDTO.AskDataRequest askDataDTO = new AskDataDTO.AskDataRequest();
+//            askDataDTO.setTimestamp(Long.toString(System.currentTimeMillis()/1000));
+//            askDataDTO.setLevel(0);
+//            askDataDTO.setType(ApiParam.CMD_DEV_DATA);
+//            AskDataParamDTO askDataParamDTO = new AskDataParamDTO();
+//            askDataParamDTO.setDataType(DataType.TEMPLATE);
+//            askDataParamDTO.setOperate(ModelState.READ);
+//            askDataParamDTO.setStartTime(Long.toString(System.currentTimeMillis()/1000));
+//            askDataDTO.setParam(askDataParamDTO);
+//            publisher.send("/platform/command/v1/" + edgeId,gson.toJson(askDataDTO),1,false);
+//        }
+    }
+
+
+    /**
+     * 获取模板信息
+     */
+    @MqttSubscribe(value = "/platform/reply/{version}/{edgeId}",qos = 1)
+    public void replyTemplate(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId, @Payload String payload) {
+        String result = modelService.deviceData(new String(message.getPayload(), StandardCharsets.UTF_8));
+        //模板发生变更通知其他云服务
+        Gson gson = new Gson();
+        RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class);
+        if (Objects.equals(response.getCode(),200)){
+            DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO();
+            deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()));
+            deviceOperateDTO.setMessage("模板更新");
+            deviceOperateDTO.setType("001");
+            publisher.send("/device/operate",gson.toJson(deviceOperateDTO),1,false);
+        }
+    }
+
+    /**
+     * 获取网关订阅的主题
+     */
+    @MqttSubscribe(value = "/device/topic/{edgeId}",qos = 1)
+    public void subscribeTopic(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId, @Payload String payload) {
+        modelService.subscribeTopic(new String(message.getPayload(), StandardCharsets.UTF_8),edgeId);
+    }
+
+
+    @MqttSubscribe(value = "/platform/devack/#",qos = 1)
+    public void airOperation(String topic, MqttMessage message, @Payload String payload){
+        System.out.println(message.toString());
+
+    }
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/listener/RedisKeyExpirationListener.java

@@ -0,0 +1,76 @@
+package com.njcn.quality.listener;
+
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.github.tocrhz.mqtt.publisher.MqttPublisher;
+import com.njcn.quality.pojo.dto.DeviceOperateDTO;
+import com.njcn.quality.service.IModelService;
+import com.njcn.quality.service.INetDevService;
+import com.njcn.redis.utils.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年04月02日 14:31
+ */
+@Slf4j
+@Component
+public class RedisKeyExpirationListener extends KeyExpirationEventMessageListener {
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Resource
+    private IModelService modelService;
+
+    @Resource
+    private MqttPublisher publisher;
+
+    @Resource
+    private INetDevService netDevService;
+
+    public RedisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
+        super(listenerContainer);
+    }
+
+
+    /**
+     * 针对redis数据失效事件，进行数据处理
+     * 注意message.toString()可以获取失效的key
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public void onMessage(Message message, byte[] pattern) {
+        if (StringUtils.isBlank(message.toString())) {
+            return;
+        }
+        //判断失效的key是否为MQTT消费端存入的
+        String expiredKey = message.toString();
+        if(expiredKey.startsWith("MQTT:")){
+            Gson gson = new Gson();
+            String ndid = expiredKey.split(":")[1];
+            //网关下线
+            netDevService.offlineNetDev(ndid);
+            String result = (String) redisUtil.getObjectByKey(ndid);
+            //装置下线
+            List<String> list = modelService.monitorHeartbeat(ndid,result);
+            //生成通知报文
+            DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO();
+            deviceOperateDTO.setNdid(ndid);
+            deviceOperateDTO.setDid(list);
+            deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000));
+            deviceOperateDTO.setMessage("装置下线");
+            deviceOperateDTO.setType("005");
+            publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false);
+        }
+    }
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/AirSetMapper.java

@@ -0,0 +1,13 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.AirSet;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/4/21
+ */
+public interface AirSetMapper extends BaseMapper<AirSet> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/AirStrategyMapper.java

@@ -0,0 +1,13 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.AirStrategy;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/4/21
+ */
+public interface AirStrategyMapper extends BaseMapper<AirStrategy> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/DataArrayMapper.java

@@ -0,0 +1,17 @@
+package com.njcn.quality.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.DataArray;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-03-03
+ */
+public interface DataArrayMapper extends BaseMapper<DataArray> {
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/DataGroupMapper.java

@@ -0,0 +1,28 @@
+package com.njcn.quality.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.quality.pojo.po.DataGroup;
+import com.njcn.quality.pojo.vo.DataGroupTemplateVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-03-03
+ */
+public interface DataGroupMapper extends BaseMapper<DataGroup> {
+
+
+    Page<DataGroupTemplateVO> getGroupDataList(IPage<DataGroupTemplateVO> page, @Param("id") String id);
+
+    List<DataGroupTemplateVO> getGroupList(@Param("id") String id);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/DataMouldMapper.java

@@ -0,0 +1,17 @@
+package com.njcn.quality.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.DataMould;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-03-03
+ */
+public interface DataMouldMapper extends BaseMapper<DataMould> {
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/DataSetMapper.java

@@ -0,0 +1,17 @@
+package com.njcn.quality.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.DataSet;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-03-03
+ */
+public interface DataSetMapper extends BaseMapper<DataSet> {
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/DevVersionMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.DevVersion;
+
+public interface DevVersionMapper extends BaseMapper<DevVersion> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleActrlMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleActrl;
+
+public interface EleActrlMapper extends BaseMapper<EleActrl> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleAlmMapper.java

@@ -0,0 +1,10 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleALM;
+
+/**
+ * @author 徐扬
+ */
+public interface EleAlmMapper extends BaseMapper<EleALM> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleBindMapper.java

@@ -0,0 +1,24 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.DataArray;
+import com.njcn.quality.pojo.po.EleBind;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/3/30
+ */
+public interface EleBindMapper extends BaseMapper<EleBind> {
+
+    /**
+     * 通过监测点获取监测点详细数据
+     * @author cdf
+     * @date 2022/3/30
+     */
+    List<DataArray> getArrByLineId(@Param("lineId") String lineId, @Param("phase")String phase);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleCtrlMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleCtrl;
+
+public interface EleCtrlMapper extends BaseMapper<EleCtrl> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleDiMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleDi;
+
+public interface EleDiMapper extends BaseMapper<EleDi> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleDictMapper.java

@@ -0,0 +1,10 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleDict;
+
+/**
+ * @author 徐扬
+ */
+public interface EleDictMapper extends BaseMapper<EleDict> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleDoMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleDo;
+
+public interface EleDoMapper extends BaseMapper<EleDo> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleEpdMapper.java

@@ -0,0 +1,24 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleEpdPqd;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface EleEpdMapper extends BaseMapper<EleEpdPqd> {
+
+    /**
+     * 查询所有数据
+     * @param conId 指标id
+     * @return 结果
+     */
+    List<EleEpdPqd> getEleEpdPqdNoList(@Param("conId")String conId);
+
+    /**
+     * 查询所有数据
+     * @param conId 指标id
+     * @return 结果
+     */
+    List<EleEpdPqd> getEleEpdPqdList(@Param("conId")String conId);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleEvtMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleEvt;
+
+public interface EleEvtMapper extends BaseMapper<EleEvt> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleEvtParamMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleEvtParm;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 16:20
+ */
+
+public interface EleEvtParamMapper extends BaseMapper<EleEvtParm> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleInformationMapper.java

@@ -0,0 +1,10 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleInformation;
+
+/**
+ * @author 徐扬
+ */
+public interface EleInformationMapper extends BaseMapper<EleInformation> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleIntegrityMapper.java

@@ -0,0 +1,17 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleIntegrity;
+
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+public interface EleIntegrityMapper extends BaseMapper<EleIntegrity> {
+
+    List<String> getPowerLineId();
+
+    List<String> getAirLineId();
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleLineMapper.java

@@ -0,0 +1,19 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleLine;
+
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+public interface EleLineMapper extends BaseMapper<EleLine> {
+
+    /**
+     * 通过网关名称获取网关下的监测点信息
+     * @author cdf
+     * @date 2022/3/29
+     */
+    List<EleLine> getAllLine(String netDevString);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleLoadSetMapper.java

@@ -0,0 +1,37 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleLoadSet;
+import com.njcn.quality.pojo.vo.EleLoadSetVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月15日 14:34
+ */
+public interface EleLoadSetMapper extends BaseMapper<EleLoadSet> {
+
+    /**
+     * 字典类型
+     * @param typeName 名称
+     * @return 结果
+     */
+    List<EleLoadSetVO> getEleLoadSetDetail(@Param("typeName")String typeName);
+
+    /**
+     * 获取所有负荷关联监测点信息
+     * @author cdf
+     * @date 2022/4/20
+     */
+    List<String> getAllLineListRelation(@Param("dicId")String dicId);
+
+    /**
+     * 根据字典id获取绑定的监测点
+     * @author cdf
+     * @date 2022/4/26
+     */
+    List<String> getAllLineListRelationIds(@Param("list")List<String> list);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleLogsMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleLogs;
+
+public interface EleLogsMapper extends BaseMapper<EleLogs> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleMdMapper.java

@@ -0,0 +1,23 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleMd;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface EleMdMapper extends BaseMapper<EleMd> {
+    /**
+     * 查询所有数据
+     * @param conId 指标id
+     * @return 结果
+     */
+    List<EleMd> getEleMdNoList(@Param("conId")String conId);
+
+    /**
+     * 查询所有数据
+     * @param conId 指标id
+     * @return 结果
+     */
+    List<EleMd> getEleMdList(@Param("conId")String conId);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleParmMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleParm;
+
+public interface EleParmMapper extends BaseMapper<EleParm> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleRateSetMappser.java

@@ -0,0 +1,32 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleRateSet;
+import com.njcn.quality.pojo.vo.EleRateVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月13日 19:55
+ */
+public interface EleRateSetMappser extends BaseMapper<EleRateSet> {
+    /**
+     * 获取费率配置
+     * @param typeName 字典类型
+     * @return 结果
+     */
+    List<EleRateVO> getEleRateDetail(@Param("typeName")String typeName);
+
+
+    /**
+     * 获取费率详情
+     * @author cdf
+     * @date 2022/4/19
+     */
+    List<EleRateVO> getEleRateById(@Param("id")String id);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleStatisticalSetMapper.java

@@ -0,0 +1,24 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.njcn.quality.pojo.po.EleStatisticalSet;
+import com.njcn.quality.pojo.vo.EleStatisticalVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月14日 15:16
+ */
+public interface EleStatisticalSetMapper extends BaseMapper<EleStatisticalSet> {
+
+    /**
+     * 字典类型
+     * @param typeName 名称
+     * @return 结果
+     */
+    List<EleStatisticalVO> getEleStatisticalDetail(@Param("typeName")String typeName);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleStsMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleSts;
+
+public interface EleStsMapper extends BaseMapper<EleSts> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/EleTopicMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.EleTopic;
+
+public interface EleTopicMapper extends BaseMapper<EleTopic> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/GroupArrayMapper.java

@@ -0,0 +1,10 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.GroupArray;
+
+/**
+ * @author 徐扬
+ */
+public interface GroupArrayMapper extends BaseMapper<GroupArray> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/HardwareMapper.java

@@ -0,0 +1,17 @@
+package com.njcn.quality.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.Hardware;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-03-03
+ */
+public interface HardwareMapper extends BaseMapper<Hardware> {
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/LogicAccessMapper.java

@@ -0,0 +1,10 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.LogicAccess;
+
+/**
+ * @author 徐扬
+ */
+public interface LogicAccessMapper extends BaseMapper<LogicAccess> {
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/LogicDeviceLineMapper.java

@@ -0,0 +1,124 @@
+package com.njcn.quality.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.quality.pojo.dto.NetAndDevByLineDTO;
+import com.njcn.quality.pojo.po.DataArray;
+import com.njcn.quality.pojo.po.DataSet;
+import com.njcn.quality.pojo.po.LogicDev;
+import com.njcn.quality.pojo.vo.EnergyDeviceTreeVO;
+import com.njcn.quality.pojo.vo.EnergyTemplateVO;
+import com.njcn.quality.pojo.vo.LogicDeviceLineInfoVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/3/1
+ */
+public interface LogicDeviceLineMapper extends BaseMapper<LogicDev> {
+
+
+    /**
+     * 获取逻辑设备树
+     *
+     * @author cdf
+     * @date 2022/3/1
+     */
+    List<EnergyDeviceTreeVO> getLogicDevList();
+
+
+    /**
+     * 获取逻辑设备树
+     *
+     * @author cdf
+     * @date 2022/3/1
+     */
+    List<EnergyDeviceTreeVO> getEleLineList();
+
+
+
+    /**
+     * 获取设备详情
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    LogicDeviceLineInfoVO getDevInfo(@Param("id") String id);
+
+    /**
+     * 逻辑设备树
+     * @return 结果
+     */
+    List<EnergyDeviceTreeVO> getEleNoBindsLineList();
+
+    /**
+     * 逻辑设备树
+     * @param loadId 参数
+     * @return 结果
+     */
+    List<EnergyDeviceTreeVO> getEleBindsLineList(@Param("loadId") String loadId);
+
+
+    /**
+     * 获取历史数据详情模板
+     *
+     * @author cdf
+     * @date 2022/3/2
+     */
+    Page<EnergyTemplateVO> getHistoryTemplateById(IPage<EnergyTemplateVO> page, @Param("id") String id, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
+
+
+    /**
+     * 获取tab模板
+     *
+     * @param id 设备id
+     * @author cdf
+     * @date 2022/3/2
+     */
+    List<DataSet> getTabTemplateById(@Param("id") String id);
+
+
+    /**
+     * 获取数据集下的分组详情
+     *
+     * @param id 数据集id
+     * @author cdf
+     * @date 2022/3/14
+     */
+    List<DataArray> getGroupDataBySetId(@Param("id") String id);
+
+    List<EnergyTemplateVO> getAllDataBySet(@Param("id") String id);
+
+
+    /**
+     * 获取数据详情
+     *
+     * @author cdf
+     * @date 2022/3/15
+     */
+    List<EnergyTemplateVO> getDataList(@Param("className") String className, @Param("ids") List<String> ids);
+
+
+    /**
+     * 获取解析模板用于实时数据解析
+     *
+     * @author cdf
+     * @date 2022/3/18
+     */
+    List<String> getParseTemplate(@Param("setId") String setId);
+
+
+    /**
+     * 通过监测点获取设备网关
+     * @author cdf
+     * @date 2022/4/22
+     */
+    List<NetAndDevByLineDTO> getNetAndDevByLineIds(@Param("lineIds") List<String> lineIds);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/NetDevMapper.java

@@ -0,0 +1,36 @@
+package com.njcn.quality.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.quality.pojo.po.NetDev;
+import com.njcn.quality.pojo.vo.EnergyDeviceTreeVO;
+import com.njcn.quality.pojo.vo.NetDevInfoVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-02-22
+ */
+public interface NetDevMapper extends BaseMapper<NetDev> {
+
+    /**
+     * 获取所有网关
+     * @author cdf
+     * @date 2022/3/2
+     */
+    List<EnergyDeviceTreeVO> getNetDevList();
+
+    /**
+     * 获取网关详细信息
+     * @author cdf
+     * @date 2022/3/28
+     */
+    NetDevInfoVO getNetDevDetail(@Param("id") String id);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/DataGroupMapper.xml

@@ -0,0 +1,17 @@
+<?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.quality.mapper.DataGroupMapper">
+
+
+    <select id="getGroupDataList" resultType="DataGroupTemplateVO">
+        select id,pid,name,sort,1 as level from ele_data_group
+        where pid = #{id}
+        order by sort
+    </select>
+
+    <select id="getGroupList" resultType="DataGroupTemplateVO">
+        select id,pid,name,sort from ele_data_group
+        where pid = #{id}
+        order by sort
+    </select>
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleBindMapper.xml

@@ -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.quality.mapper.EleBindMapper">
+
+
+    <select id="getArrByLineId" resultType="DataArray">
+        select e.* from ele_line a
+        inner join ele_logic_dev b on a.pid = b.id
+        inner join ele_data_mould c on b.idx = c.id
+        inner join ele_data_set d on d.pid = c.id
+        inner join ele_data_array e on d.id = e.pid
+        where a.line_id= #{lineId}
+        <if test="phase!=null and phase!=''">
+            and e.phase = #{phase}
+        </if>
+    </select>
+
+
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleEpdPqdMapper.xml

@@ -0,0 +1,41 @@
+<?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.quality.mapper.EleEpdMapper">
+    <select id="getEleEpdPqdNoList" resultType="EleEpdPqd">
+        SELECT
+            *
+        FROM
+            ele_epd_pqd epd
+        WHERE
+                epd.id
+        NOT IN (
+                    SELECT
+                        sta.con_id
+                    FROM
+                        ele_statistical_set sta
+                    WHERE
+                        sta.id = #{conId}
+                )
+        order by
+            epd.idx
+    </select>
+
+    <select id="getEleEpdPqdList" resultType="EleEpdPqd">
+        SELECT
+            *
+        FROM
+            ele_epd_pqd epd
+        WHERE
+                epd.id
+        IN (
+                    SELECT
+                        sta.con_id
+                    FROM
+                        ele_statistical_set sta
+                    WHERE
+                        sta.id = #{conId}
+                )
+        order by
+            epd.idx
+    </select>
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleIntergrityMapper.xml

@@ -0,0 +1,29 @@
+<?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.quality.mapper.EleIntegrityMapper">
+
+    <select id="getPowerLineId" resultType="string">
+        SELECT
+            D.Line_Id
+        FROM
+            ele_net_dev A,
+            ele_logic_access B,
+            ele_logic_dev C,
+            ele_line D
+        WHERE
+            A.NDID = '00B78D110001$GW$PQS570' AND A.Id = B.Pid AND B.State = 2 AND B.Did = C.Did AND C.Type != 'ACgw' AND C.Id = D.Pid ORDER BY Line_Id
+    </select>
+
+    <select id="getAirLineId" resultType="string">
+    SELECT
+        D.Line_Id
+    FROM
+        ele_net_dev A,
+        ele_logic_access B,
+        ele_logic_dev C,
+        ele_line D
+    WHERE
+        (A.NDID = '00B78D110002$GW$PQS570' or A.NDID = '00B78D110003$GW$PQS570') AND A.Id = B.Pid AND B.State = 2 AND B.Did = C.Did AND C.Type != 'ACgw' AND C.Id = D.Pid ORDER BY Line_Id
+    </select>
+
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleLineMapper.xml

@@ -0,0 +1,15 @@
+<?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.quality.mapper.EleLineMapper">
+
+
+    <select id="getAllLine" resultType="EleLine">
+        select a.* from ele_line a
+        inner join ele_logic_dev b on a.pid = b.id
+        inner join ele_logic_access c on b.did = c.did
+        inner join ele_net_dev d on c.pid = d.id
+        where d.name = #{netDevName}
+    </select>
+
+
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleLoadSetMapper.xml

@@ -0,0 +1,35 @@
+<?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.quality.mapper.EleLoadSetMapper">
+    <select id="getEleLoadSetDetail" resultType="EleLoadSetVO">
+        SELECT
+            dic.id loadId,
+            dic.NAME loadName,
+            dic.algo_describe flag
+        FROM
+            sys_dict_data dic
+        INNER JOIN
+            sys_dict_type type on dic.Type_Id = type.Id
+        WHERE
+            type.name =#{typeName}
+        ORDER BY
+            dic.sort
+    </select>
+
+    <select id="getAllLineListRelation" resultType="String">
+        select  c.line_id from sys_dict_data a
+        inner join ele_load_set b on a.id = b.id
+        inner join ele_line c on b.line_id = c.line_id
+        where a.id = #{dicId}
+    </select>
+
+    <select id="getAllLineListRelationIds" resultType="String">
+        select  c.line_id from sys_dict_data a
+        inner join ele_load_set b on a.id = b.id
+        inner join ele_line c on b.line_id = c.line_id
+        where a.id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleMdMapper.xml

@@ -0,0 +1,31 @@
+<?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.quality.mapper.EleMdMapper">
+    <select id="getEleMdNoList" resultType="EleMd">
+        SELECT *
+        FROM ele_md md
+        WHERE md.id
+            NOT IN (
+                  SELECT sta.con_id
+                  FROM ele_statistical_set sta
+                  WHERE sta.id = #{conId}
+              )
+          AND md.Class_Id = "power_quality_data"
+          AND md.unit in("W","Var")
+        order by md.idx
+    </select>
+
+    <select id="getEleMdList" resultType="EleMd">
+        SELECT *
+        FROM ele_md md
+        WHERE md.id
+            IN (
+                  SELECT sta.con_id
+                  FROM ele_statistical_set sta
+                  WHERE sta.id = #{conId}
+              )
+          AND md.Class_Id = "power_quality_data"
+          AND md.unit in("W","Var")
+        order by md.idx
+    </select>
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleRateSetMapper.xml

@@ -0,0 +1,34 @@
+<?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.quality.mapper.EleRateSetMappser">
+    <select id="getEleRateDetail" resultType="EleRateVO">
+        SELECT
+            dic.id rateTypeId,
+            dic.NAME rateTypeName,
+            COALESCE(rate.time,'-') rateTypeTime,
+            COALESCE(rate.rate,'-') rate
+        FROM
+            sys_dict_data dic
+        LEFT JOIN
+            ele_rate_set rate ON dic.Id = rate.Id
+        INNER JOIN
+            sys_dict_type type on dic.Type_Id = type.Id
+        WHERE
+            type.name =#{typeName}
+        ORDER BY
+            dic.sort
+    </select>
+
+    <select id="getEleRateById" resultType="EleRateVO">
+        SELECT
+            dic.id rateTypeId,
+            dic.NAME rateTypeName,
+            COALESCE(rate.time,'-') rateTypeTime,
+            COALESCE(rate.rate,'-') rate
+        FROM
+            sys_dict_data dic
+        LEFT JOIN
+            ele_rate_set rate ON dic.Id = rate.Id
+        WHERE dic.id = #{id}
+    </select>
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/EleStatisticalSetMapper.xml

@@ -0,0 +1,17 @@
+<?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.quality.mapper.EleStatisticalSetMapper">
+    <select id="getEleStatisticalDetail" resultType="EleStatisticalVO">
+        SELECT
+            dic.id statisticalId,
+            dic.NAME statisticalName
+        FROM
+            sys_dict_data dic
+        INNER JOIN
+            sys_dict_type type on dic.Type_Id = type.Id
+        WHERE
+            type.name =#{typeName}
+        ORDER BY
+            dic.sort
+    </select>
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/LogicDeviceLineMapper.xml

@@ -0,0 +1,188 @@
+<?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.quality.mapper.LogicDeviceLineMapper">
+
+
+    <select id="getLogicDevList" resultType="EnergyDeviceTreeVO">
+        select a.id,a.pid,a.name,2 as level,b.state
+        from ele_logic_dev a
+        inner join ele_logic_access b on a.did = b.did
+        where a.state = 1
+        order by a.did
+    </select>
+
+    <select id="getEleLineList" resultType="EnergyDeviceTreeVO">
+        select id,pid,name,line_id,3 as level from ele_line
+        where state = 1
+        order by ele_line.idx
+    </select>
+
+
+
+
+    <select id="getEleNoBindsLineList" resultType="EnergyDeviceTreeVO">
+        SELECT id,
+               pid,
+               NAME,
+               3 AS LEVEL,
+               Line_Id lineId
+        FROM ele_line
+        WHERE state = 1
+          AND Line_Id NOT IN (
+            SELECT Line_Id
+            FROM ele_load_set
+        )
+        ORDER BY ele_line.idx
+    </select>
+
+    <select id="getEleBindsLineList" resultType="EnergyDeviceTreeVO">
+        SELECT
+            id,
+            pid,
+            NAME,
+            3 AS LEVEL,
+            Line_Id lineId
+        FROM
+            ele_line
+        WHERE
+            state = 1
+          AND
+                Line_Id  IN (
+                SELECT
+                    Line_Id
+                FROM
+                    ele_load_set
+                WHERE
+                    id = #{loadId})
+
+        ORDER BY
+            ele_line.idx
+    </select>
+
+    <select id="getDevInfo" resultType="LogicDeviceLineInfoVO">
+        select a.id,
+        a.pid,
+        a.did,
+        a.name,
+        b.name netDevName,
+        b.ndid,
+        a.address,
+        a.position,
+        a.create_time,
+        a.state from ele_logic_dev a
+        inner join ele_net_dev b on a.pid = b.id
+        where a.id = #{id}
+        and a.state = 1
+    </select>
+
+
+
+    <select id="getTabTemplateById" resultType="DataSet">
+        select
+        c.id,
+        c.name,
+        c.another_name,
+        c.idx,
+        c.store_flag
+        from
+        ele_logic_dev a
+        inner join ele_data_mould b on a.idx = b.id
+        inner join ele_data_set c on b.id = c.pid
+        where a.id = #{id}
+        order by c.idx
+    </select>
+
+
+    <select id="getGroupDataBySetId" resultType="DataArray">
+        SELECT
+	    b.id pid,
+	    d.id,
+	    d.data_id,
+	    d.sort,
+	    d.class_name
+FROM
+	ele_data_set a
+	INNER JOIN ele_data_group b ON a.id = b.pid
+	INNER JOIN ele_group_arr c ON b.id = c.group_id
+	INNER JOIN ele_data_array d ON c.arr_id = d.id
+WHERE
+	a.id = #{id}
+    </select>
+
+
+    <select id="getAllDataBySet" resultType="EnergyTemplateVO">
+        SELECT
+	    b.id pid,
+	    d.id,
+	    d.data_id,
+	    d.sort,
+	    d.phase,
+	    d.class_name,
+	    d.another_name name,
+	    2 as level
+FROM
+	ele_data_set a
+	INNER JOIN ele_data_group b ON a.id = b.pid
+	INNER JOIN ele_group_arr c ON b.id = c.group_id
+	INNER JOIN ele_data_array d ON c.arr_id = d.id
+WHERE
+	a.id = #{id}
+    </select>
+
+
+
+
+    <select id="getDataList" resultType="EnergyTemplateVO">
+        select b.id,
+        b.name,
+        a.sort,
+        b.class_id,
+        <if test="className == 'ele_epd_pqd'">
+        b.phase,
+        b.type,
+        b.unit,
+        </if>
+        <if test="className == 'ele_md'">
+            b.phase,
+            b.type,
+            b.unit,
+        </if>
+        <if test="className == 'ele_ctrl'">
+           1 as operationType,
+           b.max_num,
+           b.min_num,
+           b.ctl_value,
+        </if>
+        a.another_name
+        from ele_data_array a inner join ${className} b on a.data_id = b.id
+        where a.id in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        order by sort
+
+    </select>
+
+
+    <select id="getParseTemplate" resultType="String">
+        select
+        type
+        from ele_data_array
+        where pid = #{setId}
+        order by sort
+    </select>
+
+
+    <select id="getNetAndDevByLineIds" resultType="NetAndDevByLineDTO">
+        select a.line_id,b.did devId,c.ndid,a.name lineName from ele_line a
+        inner join ele_logic_dev b on a.pid = b.id
+        inner join ele_net_dev c on b.pid = c.id
+        where a.state = 1
+        and a.id in
+        <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/mapper/mapping/NetDevMapper.xml

@@ -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.quality.mapper.NetDevMapper">
+
+
+    <select id="getNetDevList" resultType="EnergyDeviceTreeVO">
+        select id,name,1 as level from ele_net_dev
+        where state = 1
+        order by sort
+    </select>
+
+    <select id="getNetDevDetail" resultType="NetDevInfoVO">
+        select a.*,b.version versionId,c.* from ele_net_dev a
+        inner join ele_dev_version b on a.version_id = b.id
+        inner join ele_hardware c on a.id = c.id
+        where a.state = 1
+        and a.id = #{id}
+    </select>
+</mapper>

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/EleAirStrategyService.java

@@ -0,0 +1,67 @@
+package com.njcn.quality.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.quality.param.AirStrategyParam;
+import com.njcn.quality.pojo.po.AirStrategy;
+import com.njcn.quality.pojo.vo.AirStrategyVO;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/4/21
+ */
+public interface EleAirStrategyService extends IService<AirStrategy> {
+
+    Page<AirStrategy> listAirStrategy(AirStrategyParam.AirStrategyQueryParam airStrategyQueryParam);
+
+    /**
+     * 新增空调策略
+     *
+     * @param airStrategyParam 空调策略数据
+     * @return 操作结果
+     */
+    boolean addAirStrategy(AirStrategyParam airStrategyParam);
+
+    /**
+     * 修改空调策略
+     *
+     * @param updateParam 空调策略数据
+     * @return 操作结果
+     */
+    boolean updateAirStrategy(AirStrategyParam.AirUpdateParam updateParam);
+
+    /**
+     * 批量逻辑删除空调策略数据
+     * @param id id
+     * @return 操作结果
+     */
+    boolean deleteAirStrategy(String id);
+
+    /**
+     * 获取空调策略信息
+     * @param id id
+     * @return NetDev
+     */
+    AirStrategyVO findById(String id);
+
+
+    /**
+     * 停止执行任务
+     * @author cdf
+     * @date 2022/4/22
+     */
+    boolean startAirStrategy(String id);
+
+
+    /**
+     * 定时执行任务
+     * @author cdf
+     * @date 2022/4/22
+     */
+    boolean dealAirStrategyId(String id,String operation);
+
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/EleLoadSetService.java

@@ -0,0 +1,30 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.param.EleParam;
+import com.njcn.quality.pojo.vo.EleLoadSetTreeVO;
+import com.njcn.quality.pojo.vo.EleLoadSetVO;
+
+import java.util.List;
+
+/**
+ *
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月15日 14:24
+ */
+public interface EleLoadSetService {
+
+    /**
+     * 详情
+     * @return 结果
+     */
+    List<EleLoadSetVO> getEleLoadSetDetail();
+
+    /**
+     * 绑定监测点树
+     * @return 结果
+     */
+    EleLoadSetTreeVO getEleLoadTree(EleLoadSetVO eleLoadSetVO);
+
+    Boolean add(EleParam eleParam);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/EleRateSetService.java

@@ -0,0 +1,24 @@
+package com.njcn.quality.service;
+
+
+import com.njcn.quality.pojo.po.EleRateSet;
+import com.njcn.quality.pojo.vo.EleRateVO;
+
+import java.util.List;
+
+/**
+ * 费率配置
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月13日 19:36
+ */
+public interface EleRateSetService {
+
+    /**
+     * 获取费率配置
+     * @return 结果
+     */
+    List<EleRateVO> getEleRateDetail();
+
+    boolean add(EleRateSet eleRateSet);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/EleStatisticalSetService.java

@@ -0,0 +1,38 @@
+package com.njcn.quality.service;
+
+
+
+import com.njcn.quality.param.EleParam;
+import com.njcn.quality.pojo.vo.EleStatisticalTreeVO;
+import com.njcn.quality.pojo.vo.EleStatisticalVO;
+
+import java.util.List;
+
+/**
+ * 用能统计类型配置
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年04月14日 15:15
+ */
+public interface EleStatisticalSetService {
+    /**
+     * 详情
+     * @return 结果
+     */
+    List<EleStatisticalVO> getEleStatisticalDetail();
+
+    /**
+     * 树
+     * @param eleStatisticalVO 参数
+     * @return 结果
+     */
+    EleStatisticalTreeVO getEleStatisticalTree(EleStatisticalVO eleStatisticalVO);
+
+    /**
+     * 绑定
+     * @param id id
+     * @param ids ids
+     * @return 结果
+     */
+    Boolean add(EleParam eleParam);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/HighAnalyticService.java

@@ -0,0 +1,87 @@
+package com.njcn.quality.service;
+
+
+
+
+import com.njcn.quality.param.ElectComparaParam;
+import com.njcn.quality.param.LoadStatisticParam;
+import com.njcn.quality.pojo.vo.ElectCompareVO;
+import com.njcn.quality.pojo.vo.LoadStatisticVO;
+import com.njcn.quality.pojo.vo.LoadTendencyVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/4/14
+ */
+public interface HighAnalyticService {
+
+
+    /**
+     * 获取负荷趋势分析
+     * @author cdf
+     * @date 2022/4/15
+     */
+    List<LoadTendencyVO> getLoadTendency(String loadType, String start, String end);
+
+
+    List<LoadTendencyVO> getLoadDetail(String loadType,String start,String end);
+
+    /**
+     * 负荷占比
+     * @author cdf
+     * @date 2022/4/28
+     */
+    List<Map<String, String>> getLoadRate(String loadType,String start);
+
+    /**
+     * 负荷统计分析
+     * @author cdf
+     * @date 2022/4/18
+     */
+    List<LoadStatisticVO> getLoadStatistics(LoadStatisticParam loadStatisticParam);
+
+
+    /**
+     * 获取电度趋势分析
+     * @author cdf
+     * @date 2022/4/15
+     */
+    List<LoadTendencyVO> getElectTendency(String loadType,Integer type,String start,String end);
+
+
+    /**
+     * 获取电度比较分析
+     * @author cdf
+     * @date 2022/4/15
+     */
+    List<ElectCompareVO> getElectCompare(ElectComparaParam electComparaParam);
+
+
+    /**
+     * 电度占比
+     * @author cdf
+     * @date 2022/4/27
+     */
+    List<Map<String, String>> getElectRate(ElectComparaParam electComparaParam);
+
+    /**
+     * 电度统计分析
+     * @author cdf
+     * @date 2022/4/19
+     */
+    List<LoadStatisticVO> getElectStatistic(ElectComparaParam electComparaParam);
+
+
+
+    /**
+     * 获取空调趋势
+     * @author cdf
+     * @date 2022/4/15
+     */
+    List<LoadTendencyVO> getAirTendency(String start,String end);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IDataArrayService.java

@@ -0,0 +1,34 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.param.DataArrayParam;
+import com.njcn.quality.pojo.po.DataArray;
+
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+public interface IDataArrayService {
+
+    /**
+     * 功能描述: 新增装置详细模板数据
+     *
+     * @param dataArrayParam
+     * @return com.njcn.energy.pojo.po.DataArray
+     * @author xy
+     * @date 2022/3/9 15:51
+     */
+    DataArray addDataArray(DataArrayParam dataArrayParam);
+
+
+    /**
+     * 功能描述: 新增装置详细模板数据
+     *
+     * @param list
+     * @return com.njcn.energy.pojo.po.DataArray
+     * @author xy
+     * @date 2022/3/9 15:51
+     */
+    boolean deleteDataArray(List<String> list);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IDataGroupService.java

@@ -0,0 +1,51 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.param.DataGroupParam;
+import com.njcn.quality.pojo.po.DataGroup;
+
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+public interface IDataGroupService {
+
+    /**
+     * 功能描述: 新增分组数据
+     *
+     * @param dataGroupParam 分组参数
+     * @return boolean
+     * @author xy
+     * @date 2022/3/16 9:27
+     */
+    DataGroup addDataGroup(DataGroupParam dataGroupParam);
+
+    /**
+     * 批量新增组
+     * @author cdf
+     * @date 2022/3/17
+     * @param list 分组参数
+     * @return boolean
+     */
+    boolean batchAdd(List<DataGroup> list);
+    /**
+     * 功能描述: 根据数据集id查询分组信息
+     *
+     * @param list
+     * @return java.util.List<com.njcn.energy.pojo.po.DataGroup>
+     * @author xy
+     * @date 2022/3/17 10:41
+     */
+    List<DataGroup> findGroupById(List<String> list);
+
+    /**
+     * 功能描述: 根据数据集id查询分组信息
+     *
+     * @param list 数据集id
+     * @return java.util.List<com.njcn.energy.pojo.po.DataGroup>
+     * @author xy
+     * @date 2022/3/17 10:41
+     */
+    boolean deleteDataGroup(List<String> list);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IDataSetService.java

@@ -0,0 +1,44 @@
+package com.njcn.quality.service;
+
+
+import com.njcn.quality.param.DataSetParam;
+import com.njcn.quality.pojo.po.DataSet;
+
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+public interface IDataSetService {
+
+    /**
+     * 功能描述: 新增数据集
+     *
+     * @param dataSetParam
+     * @return com.njcn.energy.pojo.po.DataSet
+     * @author xy
+     * @date 2022/3/9 10:18
+     */
+    DataSet add(DataSetParam dataSetParam);
+
+    /**
+     * 功能描述: 根据id删除数据集
+     *
+     * @param id 主键
+     * @return boolean
+     * @author xy
+     * @date 2022/3/17 9:39
+     */
+    boolean delete(String id);
+
+    /**
+     * 功能描述: 根据id查询数据集
+     *
+     * @param id
+     * @return java.util.List<com.njcn.energy.pojo.po.DataSet>
+     * @author xy
+     * @date 2022/3/17 10:30
+     */
+    List<DataSet> findSetById(String id);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IDevModelService.java

@@ -0,0 +1,43 @@
+package com.njcn.quality.service;
+import com.njcn.quality.param.DataModelParam;
+import com.njcn.quality.pojo.po.DataMould;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author 徐扬
+ */
+public interface IDevModelService {
+
+    /**
+     * 功能描述: 新增设备数据模板表
+     *
+     * @param dataModelParam
+     * @return com.njcn.energy.pojo.po.DataMould
+     * @author xy
+     * @date 2022/3/8 20:44
+     */
+    DataMould addDataMould(DataModelParam dataModelParam);
+
+    /**
+     * 功能描述: 删除模板
+     *
+     * @param id
+     * @return boolean
+     * @author xy
+     * @date 2022/3/17 14:15
+     */
+    boolean deleteById(String id);
+
+    /**
+     * 功能描述: 查找模板
+     *
+     * @param name
+     * @param version
+     * @param time
+     * @return com.njcn.energy.pojo.po.DataMould
+     * @author xy
+     * @date 2022/3/23 19:29
+     */
+    DataMould findMould(String name, String version, String time);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IDevVersionService.java

@@ -0,0 +1,29 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.param.DevVersionParam;
+import com.njcn.quality.pojo.po.DevVersion;
+
+/**
+ * @author 徐扬
+ */
+public interface IDevVersionService {
+
+    /**
+     * 新增网关设备
+     *
+     * @param devVersionParam 设备版本信息
+     * @return 操作结果
+     */
+    DevVersion addDevVersion(DevVersionParam devVersionParam);
+
+    /**
+     * 功能描述: 删除设备版本信息
+     *
+      * @param id
+     * @return
+     * @author xy
+     * @date 2022/3/17 16:30
+     */
+    boolean deleteDevVersion(String id);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleActrlService.java

@@ -0,0 +1,39 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.pojo.po.EleActrl;
+
+/**
+ * @author 徐扬
+ */
+public interface IEleActrlService {
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleActrl
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean addActrl(EleActrl eleActrl);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleActrl
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean updateActrl(EleActrl eleActrl);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param name
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    EleActrl findByName(String name);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleAlmService.java

@@ -0,0 +1,46 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.pojo.po.EleALM;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 18:48
+ */
+
+public interface IEleAlmService {
+
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleAlM
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean addAlm(EleALM eleAlM);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleAlM
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean updateAlm(EleALM eleAlM);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param name
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    EleALM findByName(String name);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleBindService.java

@@ -0,0 +1,37 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.param.ElDataBindParam;
+import com.njcn.quality.pojo.po.EleBind;
+import com.njcn.quality.pojo.vo.YunCaiDataVO;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/3/30
+ */
+public interface IEleBindService {
+
+    /**
+     * 新增绑定关系
+     * @author cdf
+     * @date 2022/3/30
+     */
+    boolean addBind(ElDataBindParam elDataBindParam);
+
+    /**
+     * 获取所有绑定关系
+     * @author cdf
+     * @date 2022/3/30
+     */
+    List<EleBind> getList(String ndid);
+
+/**
+ * 获取指定系统下的数据
+ * @author cdf
+ * @date 2022/3/30
+ */
+    List<YunCaiDataVO> getLineListDetail(List<String> lineList);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleCtrlService.java

@@ -0,0 +1,40 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.pojo.po.EleCtrl;
+
+/**
+ * @author 徐扬
+ */
+public interface IEleCtrlService {
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleCtrl
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean addCtrl(EleCtrl eleCtrl);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleCtrl
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean updateCtrl(EleCtrl eleCtrl);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param name
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    EleCtrl findByName(String name);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleDiService.java

@@ -0,0 +1,39 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.pojo.po.EleDi;
+
+/**
+ * @author 徐扬
+ */
+public interface IEleDiService {
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleDi
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean addDi(EleDi eleDi);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleDi
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean updateDi(EleDi eleDi);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param name
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    EleDi findByName(String name);
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleDictService.java

@@ -0,0 +1,78 @@
+package com.njcn.quality.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.quality.param.DictParam;
+import com.njcn.quality.pojo.po.EleDict;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/24 10:59
+ */
+
+public interface IEleDictService {
+
+    /**
+     * 功能描述: 根据名称查询字段数据
+     *
+     * @param name 字典名称
+     * @return com.njcn.energy.pojo.po.EleDict
+     * @author xy
+     * @date 2022/3/24 11:08
+     */
+    EleDict findDictByName(String name);
+
+    /**
+     * 功能描述: 查询influxDB表名
+     *
+     * @param name 字典名称
+     * @return com.njcn.energy.pojo.po.EleDict
+     * @author xy
+     * @date 2022/3/24 11:08
+     */
+    EleDict findTableName(String name);
+
+
+    /**
+     * 新增字典
+     * @author cdf
+     * @date 2022/3/22
+     */
+    boolean add(DictParam dictParam);
+
+    /**
+     * 修改字典
+     * @author cdf
+     * @date 2022/3/22
+     */
+    boolean update(DictParam.DictUpdateParam dictUpdateParam);
+
+
+    /**
+     * 删除字典
+     * @author cdf
+     * @date 2022/3/22
+     */
+    boolean delete(String id);
+
+
+    /**
+     * 查询字典列表
+     * @author cdf
+     * @date 2022/3/22
+     */
+    Page<EleDict> getList(DictParam.DictQueryParam dictQueryParam);
+
+
+
+    /**
+     * 查询字典
+     * @author cdf
+     * @date 2022/3/22
+     */
+    EleDict getById(String id);
+
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleDoService.java

@@ -0,0 +1,40 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.pojo.po.EleDo;
+
+/**
+ * @author 徐扬
+ */
+public interface IEleDoService {
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleDo
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean addDo(EleDo eleDo);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleDo
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean updateDo(EleDo eleDo);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param name
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    EleDo findByName(String name);
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleEpdPqdService.java

@@ -0,0 +1,50 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.pojo.po.EleEpdPqd;
+
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+public interface IEleEpdPqdService {
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleEpdPqd
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean addEpd(EleEpdPqd eleEpdPqd);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param eleEpdPqd
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean updateEpd(EleEpdPqd eleEpdPqd);
+
+    /**
+     * 功能描述: 新增EPD PQD数据
+     *
+     * @param name
+     * @param name
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    EleEpdPqd findByName(String name,String phase);
+
+    /**
+     * 获取所有负荷指标
+     * @author cdf
+     * @date 2022/4/15
+     */
+    List<EleEpdPqd> getAllEpd();
+
+}

pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/IEleEvtParamService.java

@@ -0,0 +1,55 @@
+package com.njcn.quality.service;
+
+import com.njcn.quality.pojo.po.EleEvtParm;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/3/15 16:19
+ */
+
+public interface IEleEvtParamService {
+
+    /**
+     * 功能描述: 新增eleEvt数据
+     *
+     * @param eleEvtParam
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+   boolean addEleEvtParam(EleEvtParm eleEvtParam);
+
+    /**
+     * 功能描述: 修改eleEvt数据
+     *
+     * @param eleEvtParam
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean updateEleEvtParam(EleEvtParm eleEvtParam);
+
+    /**
+     * 功能描述: 根据名称查找
+     *
+     * @param name
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    EleEvtParm findByName(String name);
+
+    /**
+     * 功能描述: 根据id删除
+     *
+     * @param id
+     * @return boolean
+     * @author xy
+     * @date 2022/3/15 10:11
+     */
+    boolean deleteById(String id);
+
+}