添加注释2+环比分析

fiveep-controller/src/main/java/com/bizmatics/controller/web/JobController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
+ * 未知模块
  * @author yq
  * @date 2021/8/25 15:37
  */
@@ -18,6 +19,11 @@ public class JobController {
     @Autowired
     public RatAnalogTask ratAnalogTask;
 
+    /**
+     * 未知接口
+     * @param startTime
+     * @param endTime
+     */
     @RequestMapping("addHadJobByDate")
     public void addHadJobByDate(@RequestParam(required = false) Date startTime,
                                 @RequestParam(required = false) Date endTime){

fiveep-controller/src/main/java/com/bizmatics/controller/web/RtSwitchDataController.java

@@ -6,8 +6,6 @@ import com.bizmatics.service.RtSwitchDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,16 +27,23 @@ public class RtSwitchDataController {
 
     /**
      * 查看单个信息
+     *
      * @return
      */
     @GetMapping("one")
-    public ApiResult<List<Map<String,Object>>> getOne(@RequestParam Integer siteId){
+    public ApiResult<List<Map<String, Object>>> getOne(@RequestParam Integer siteId) {
         return ApiResult.success(rtSwitchDataService.getOne(siteId));
     }
 
 
+    /**
+     * 伍继PC1.0-运行状态统计上部分查询
+     *
+     * @param siteId 站点ID
+     * @return
+     */
     @RequestMapping("LoopStatus")
-    public ApiResult<List<Map<String,Object>>> getLoopStatus(@RequestParam Integer siteId){
+    public ApiResult<List<Map<String, Object>>> getLoopStatus(@RequestParam Integer siteId) {
         return ApiResult.success(rtSwitchDataService.getLoopStatus(siteId));
     }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteController.java

@@ -52,6 +52,7 @@ public class SiteController {
     }
 
     /**
+     * 未知
      * @param name 站点名称
      * @return
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/SupervisionController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-10-26
- */
-@Controller
-@RequestMapping("/supervision")
-public class SupervisionController {
-
-}
-

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -15,6 +15,7 @@ import com.bizmatics.model.vo.DataManagementVO;
 import com.bizmatics.model.vo.HtAnalogDataVo;
 import com.bizmatics.persistence.mapper.HtAnalogDataMapper;
 import com.bizmatics.service.*;
+import com.bizmatics.service.util.FieldEscapeUtils;
 import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.*;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -375,10 +376,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                             if (fiied.equals("dataTime")){
                                 map.put(fiied,fields[i].get(htAnalogDataVo));
                             }else {
-                                String targetValue = fields[2].get(htAnalogDataVo) + "_" + fields[i].getName();
-                                if (dataManagementOneVO.getDisplayField().contains(targetValue)){
-                                    map.put(targetValue,fields[i].get(htAnalogDataVo));
-                                }
+                                map.put(fields[2].get(htAnalogDataVo)+"_"+fiied,fields[i].get(htAnalogDataVo));
                             }
                         }catch (Exception e){
 
@@ -508,6 +506,8 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
 
         List<CommonIcoVO> reListOne = new ArrayList<>();
         for (int i = 0; i < dataManagementOneVO.getDisplayField().size(); i++) {
+            String fieldValue = dataManagementOneVO.getDisplayField().get(i).split("_")[1];
+            String name = FieldEscapeUtils.fieldEscapeUtils(fieldValue);
             for (int j = 0; j < reList.size(); j++) {
                 List<Object> a = new ArrayList<>();
                 List<Object> time = new ArrayList<>();
@@ -518,15 +518,13 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                     }
                 }
                 if (a.size()>0){
-                    reListOne.add(CommonIcoVO.builder().list(a).listDate(time).build());
+                    reListOne.add(CommonIcoVO.builder().name(name).list(a).listDate(time).build());
                 }
             }
         }
         return reListOne;
     }
 
-//    public String
-
     @Override
     public List<CommonIcoVO> monthlyReport(String deviceCode, int cycle, String startTime, String endTime) {
         List<Object> eppList = new ArrayList<>();

fiveep-service/src/main/java/com/bizmatics/service/util/FieldEscapeUtils.java

@@ -19,7 +19,7 @@ import java.util.Map;
  */
 public class FieldEscapeUtils
 {
-   public String fieldEscapeUtils(String fieldValue){
+   public static String fieldEscapeUtils(String fieldValue){
        String field=null;
        switch (fieldValue) {
            case "Busot":