Merge branch 'master' into energy-manage-shiyue

energy-manage-service/src/main/java/com/energy/manage/service/controller/homepage/HomePageController.java

@@ -1,8 +1,10 @@
 package com.energy.manage.service.controller.homepage;
 
 import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.service.homepage.HomePageService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2024/6/13 13:52
  * @desc
  */
+@Api(value = "HomePageController",tags = "首页查询")
 @RestController
 @RequestMapping("/homePage")
 public class HomePageController extends BaseServiceController {
@@ -23,6 +26,7 @@ public class HomePageController extends BaseServiceController {
     private HomePageService homePageService;
 
     @ApiOperation("驾驶舱首页查询")
+    @UserLoginToken
     @GetMapping("/queryStatistics")
     public ResultResp queryStatistics(@RequestParam("codeNumber") String codeNumber,
                             @RequestParam("codeType") String codeType){
@@ -31,6 +35,7 @@ public class HomePageController extends BaseServiceController {
 
 
     @ApiOperation("驾驶舱首页查询操作记录")
+    @UserLoginToken
     @GetMapping("/queryOptionRecords")
     public ResultResp queryOptionRecords(@RequestParam("codeNumber") String codeNumber,
                             @RequestParam("codeType") String codeType){

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -315,9 +315,6 @@ public class AnalysisServiceImpl implements AnalysisService {
             try {
                 //值不能为空且值为list的时候list长度不能为0
                 if(field.get(analysisDto) != null){
-//                if(field.get(analysisDto) != null
-//                        && List.class.isAssignableFrom(field.getType())
-//                        && ((List)field.get(analysisDto)).size() > 0){
                     //放置值不为空的属性
 //                    propertyNames.add(field.getName());
                     updateNodesByPropertyName(rootNode, field.getName(), field.get(analysisDto),scada);

energy-manage-service/src/main/resources/mybatis/windexceptioncount/WindExceptionCountMapper.xml

@@ -46,14 +46,14 @@
     <select id="selectByfieldCodes" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo">
         select
             count.*,
-            batch.field_code
+            batch.field_code,
             batch.field_name
         from
             wind_exception_count count
-        left join wind_fied_batch batch
+        left join wind_field_batch batch
         on batch.batch_code = count.batch_code
         where
-            batch_code in (
+            batch.batch_code in (
                 select distinct
                     batch_code
                 from