包名调整

2023-06-08 14:11:08 +08:00
parent ac4ad7d679
commit 818538f34d
80 changed files with 184 additions and 202 deletions
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java
@@ -0,0 +1,80 @@
+package com.njcn.csharmonic.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+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.csharmonic.service.CsConfigurationService;
+import com.njcn.minioss.bo.MinIoUploadResDTO;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.njcn.csharmonic.param.CsConfigurationParm;
+import com.njcn.csharmonic.pojo.vo.CsConfigurationVO;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+* (cs_configuration)表控制层
+*
+* @author xxxxx
+*/
+@Slf4j
+@RestController
+@RequestMapping("/csconfiguration")
+@Api(tags = "组态项目")
+@AllArgsConstructor
+public class CsConfigurationController extends BaseController {
+    private final CsConfigurationService csConfigurationService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增组态项目")
+    @ApiImplicitParam(name = "csConfigurationParm", value = "新增组态项目参数", required = true)
+    public HttpResult<Boolean> add(@RequestBody @Validated CsConfigurationParm csConfigurationParm){
+        String methodDescribe = getMethodDescribe("add");
+
+        boolean save = csConfigurationService.add (csConfigurationParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/audit")
+    @ApiOperation("修改组态项目")
+    @ApiImplicitParam(name = "auditParm", value = "修改组态项目参数", required = true)
+    public HttpResult<Boolean> audit(@RequestBody @Validated CsConfigurationParm.CsConfigurationAuditParam auditParm){
+        String methodDescribe = getMethodDescribe("audit");
+
+        boolean save = csConfigurationService.audit (auditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryPage")
+    @ApiOperation("组态项目分页查询")
+    @ApiImplicitParam(name = "csConfigurationQueryParam", value = "组态项目查询参数", required = true)
+    public HttpResult<IPage<CsConfigurationVO>> queryPage(@RequestBody @Validated CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam ){
+        String methodDescribe = getMethodDescribe("queryPage");
+
+        IPage<CsConfigurationVO> page  = csConfigurationService.queryPage (csConfigurationQueryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
+    @PostMapping("/uploadImage")
+    @ApiOperation("上传底图")
+    @ApiImplicitParam(name = "file", value = "底图文件", required = true)
+    public HttpResult<MinIoUploadResDTO> uploadImage(@RequestParam("file") MultipartFile issuesFile){
+        String methodDescribe = getMethodDescribe("uploadImage");
+        String filePath = csConfigurationService.uploadImage(issuesFile);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(issuesFile.getOriginalFilename(),filePath), methodDescribe);
+    }
+}
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java
@@ -0,0 +1,20 @@
+package com.njcn.csharmonic.controller;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+* (cs_net_dev)表控制层
+*
+* @author xxxxx
+*/
+@Slf4j
+@RestController
+@RequestMapping("/csnetdev")
+@Api(tags = "组态页面")
+@AllArgsConstructor
+public class CsNetDevPOController extends BaseController {
+
+}
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java
@@ -0,0 +1,65 @@
+package com.njcn.csharmonic.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csharmonic.service.CsPagePOService;
+import com.njcn.csharmonic.pojo.vo.CsPageVO;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import com.njcn.csharmonic.param.CsPageParm;
+import org.springframework.web.bind.annotation.*;
+
+/**
+* (cs_page)表控制层
+*
+* @author xxxxx
+*/
+@RestController
+@RequestMapping("/cspage")
+@Api(tags = "组态项目页面")
+@AllArgsConstructor
+public class CsPagePOController  extends BaseController {
+    private final CsPagePOService csPagePOService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增组态页面")
+    @ApiImplicitParam(name = "csPageParm", value = "新增组态项目参数", required = true)
+    public HttpResult<CsPageVO> add(@RequestBody @Validated CsPageParm csPageParm){
+        String methodDescribe = getMethodDescribe("add");
+
+        CsPageVO csPageVO = csPagePOService.add (csPageParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csPageVO, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/audit")
+    @ApiOperation("修改组态页面")
+    @ApiImplicitParam(name = "auditParm", value = "修改组态项目参数", required = true)
+    public HttpResult<Boolean> audit(@RequestBody @Validated CsPageParm.CsPageParmAuditParam auditParm){
+        String methodDescribe = getMethodDescribe("audit");
+
+        boolean save = csPagePOService.audit (auditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryPage")
+    @ApiOperation("组态页面分页查询")
+    @ApiImplicitParam(name = "csPageParam", value = "组态项目查询参数", required = true)
+    public HttpResult<IPage<CsPageVO>> queryPage(@RequestBody @Validated CsPageParm.CsPageParmQueryParam csPageParam ){
+        String methodDescribe = getMethodDescribe("queryPage");
+
+        IPage<CsPageVO> page  = csPagePOService.queryPage (csPageParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+}
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java
@@ -0,0 +1,76 @@
+package com.njcn.csharmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.vo.LineTargetVO;
+import com.njcn.csharmonic.pojo.vo.RtDataVO;
+import com.njcn.csharmonic.pojo.vo.TargetDetailVO;
+import com.njcn.csharmonic.service.ILineTargetService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/6/1 10:03
+ */
+@Slf4j
+@RestController
+@RequestMapping("/lineTarget")
+@Api(tags = "组态指标绑定")
+@AllArgsConstructor
+public class LineTargetController extends BaseController {
+
+    private final ILineTargetService lineTargetService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/target")
+    @ApiOperation("监测点指标")
+    @ApiImplicitParam(name = "lineId", value = "监测点Id", required = true)
+    public HttpResult<List<LineTargetVO>> getLineTarget(@RequestParam("lineId") String lineId) {
+        String methodDescribe = getMethodDescribe("getLineTarget");
+        List<LineTargetVO> list = lineTargetService.getLineTarget(lineId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/targetDetail")
+    @ApiOperation("获取指标数据类型和相别")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pid", value = "数据集id", required = true),
+        @ApiImplicitParam(name = "name", value = "名称", required = true)
+    })
+    public HttpResult<TargetDetailVO> getTargetDetail(@RequestParam("pid") String pid, @RequestParam("name") String name) {
+        String methodDescribe = getMethodDescribe("getTargetDetail");
+        TargetDetailVO list = lineTargetService.getTargetDetail(pid,name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/lineData")
+    @ApiOperation("获取指标数据")
+    @ApiImplicitParam(name = "id", value = "组态页面id", required = true)
+    @Deprecated
+    public HttpResult<List<RtDataVO>> getLineData(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getLineData");
+        List<RtDataVO> list = lineTargetService.getLineData(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java
@@ -0,0 +1,86 @@
+package com.njcn.csharmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csharmonic.service.StableDataService;
+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 com.njcn.csharmonic.param.ThdDataQueryParm;
+import com.njcn.csharmonic.pojo.vo.ThdDataVO;
+
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2023/5/18  8:51【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/stable")
+@Api(tags = "稳态数据展示")
+@AllArgsConstructor
+public class StableDataController extends BaseController {
+
+    private final StableDataService stableDataService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryFisrtThdData")
+    @ApiOperation("查询谐波畸变率实时数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "devId", value = "设备id", required = true),
+            @ApiImplicitParam(name = "statisticalName", value = "统计指标name", required = true)
+    })
+    public HttpResult<List<ThdDataVO>> queryFisrtThdData(@RequestParam("devId") String devId, @RequestParam("statisticalName") String statisticalName) {
+        String methodDescribe = getMethodDescribe("queryThdData");
+        List<ThdDataVO> list = stableDataService.queryThdData(devId, statisticalName);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryThdDataByTime")
+    @ApiOperation("查询时间段内谐波畸变率")
+    @ApiImplicitParam(name = "thdDataQueryParm", value = "查询参数", required = true)
+    public HttpResult<List<ThdDataVO>> queryThdDataByTime(@RequestBody @Validated ThdDataQueryParm thdDataQueryParm) {
+        String methodDescribe = getMethodDescribe("queryThdDataByTime");
+        List<ThdDataVO> list = stableDataService.queryThdDataByTime(thdDataQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryFisrtThdContent")
+    @ApiOperation("查询谐波含量实时数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "devId", value = "设备id", required = true),
+            @ApiImplicitParam(name = "statisticalName", value = "统计指标name", required = true)
+    })
+    public HttpResult<List<ThdDataVO>> queryFisrtThdContent(@RequestParam("devId") String devId, @RequestParam("statisticalName") String statisticalName) {
+        String methodDescribe = getMethodDescribe("queryFisrtThdContent");
+        List<ThdDataVO> list = stableDataService.queryFisrtThdContent(devId, statisticalName);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryThdContentByTime")
+    @ApiOperation("查询时间段内谐波畸变率")
+    @ApiImplicitParam(name = "thdDataQueryParm", value = "查询参数", required = true)
+    public HttpResult<List<ThdDataVO>> queryThdContentByTime(@RequestBody @Validated ThdDataQueryParm thdDataQueryParm) {
+        String methodDescribe = getMethodDescribe("queryThdContentByTime");
+        List<ThdDataVO> list = stableDataService.queryThdContentByTime(thdDataQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+
+    }
+}