Browse Source

添加智慧办公模块接口

liuhaotian 2 năm trước cách đây
mục cha
commit
450ed50dcf
25 tập tin đã thay đổi với 358 bổ sung22 xóa
  1. 4 0
      pom.xml
  2. 6 0
      src/main/java/com/sky/ioc/controller/carbon/CarbonController.java
  3. 33 0
      src/main/java/com/sky/ioc/controller/dashboard/AssetsController.java
  4. 8 1
      src/main/java/com/sky/ioc/controller/dashboard/DashboardController.java
  5. 30 0
      src/main/java/com/sky/ioc/controller/dashboard/DiningRoomController.java
  6. 41 0
      src/main/java/com/sky/ioc/controller/dashboard/ElectricityController.java
  7. 2 2
      src/main/java/com/sky/ioc/controller/dashboard/PersonnelController.java
  8. 29 1
      src/main/java/com/sky/ioc/controller/dashboard/UseColdController.java
  9. 26 1
      src/main/java/com/sky/ioc/controller/dashboard/UseHeatController.java
  10. 40 2
      src/main/java/com/sky/ioc/controller/dashboard/WaterController.java
  11. 1 1
      src/main/java/com/sky/ioc/controller/life/HealthHomeController.java
  12. 1 1
      src/main/java/com/sky/ioc/controller/life/ParkingController.java
  13. 1 1
      src/main/java/com/sky/ioc/controller/life/RestaurantController.java
  14. 2 4
      src/main/java/com/sky/ioc/controller/life/SupermarketController.java
  15. 10 1
      src/main/java/com/sky/ioc/controller/work/WorkController.java
  16. 6 2
      src/main/java/com/sky/ioc/service/canteen/RestaurantService.java
  17. 29 0
      src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java
  18. 5 0
      src/main/java/com/sky/ioc/service/carbon/CarbonService.java
  19. 15 1
      src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java
  20. 4 1
      src/main/java/com/sky/ioc/service/personnel/PersonnelService.java
  21. 6 3
      src/main/java/com/sky/ioc/service/personnel/impl/PersonnelServiceImpl.java
  22. 12 0
      src/main/java/com/sky/ioc/service/space/SpaceService.java
  23. 31 0
      src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java
  24. 6 0
      src/main/java/com/sky/ioc/service/supermarket/SupermarketService.java
  25. 10 0
      src/main/java/com/sky/ioc/service/supermarket/impl/SupermarketServiceImpl.java

+ 4 - 0
pom.xml

@@ -55,6 +55,10 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

+ 6 - 0
src/main/java/com/sky/ioc/controller/carbon/CarbonController.java

@@ -1,13 +1,19 @@
 package com.sky.ioc.controller.carbon;
 
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /** 双碳
  * @author LunCe*/
+@Api("数智双碳")
 @Slf4j
 @RestController
 @RequestMapping("/carbon")
 public class CarbonController {
+
+
+
+
 }

+ 33 - 0
src/main/java/com/sky/ioc/controller/dashboard/AssetsController.java

@@ -1,6 +1,12 @@
 package com.sky.ioc.controller.dashboard;
 
+import com.sky.ioc.service.assets.AssetsService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,10 +15,37 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ---- 资产
  */
 
+@Api("智能看板----资产")
 @Slf4j
 @RestController
 @RequestMapping("assets")
 public class AssetsController {
 
 
+    @Autowired
+    private AssetsService assetsService;
+
+
+    @ApiOperation("查询智能看板资产画像的汇总信息")
+    @GetMapping("getAssetCount")
+    public ReturnMsg getAssetCount(){
+        return assetsService.getAssetCount();
+    }
+
+
+    @ApiOperation("查询智能看板资产画像的投资分布")
+    @GetMapping("getInvestmentDistribution")
+    public ReturnMsg getInvestmentDistribution(){
+        return assetsService.getInvestmentDistribution();
+    }
+
+    @ApiOperation("查询智能看板资产画像的资产年限")
+    @GetMapping("getAssetLife")
+    public ReturnMsg  getAssetLife(){
+        return assetsService.getAssetLife();
+    }
+
+
+
+
 }

+ 8 - 1
src/main/java/com/sky/ioc/controller/dashboard/DashboardController.java

@@ -3,6 +3,7 @@ package com.sky.ioc.controller.dashboard;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +11,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/** 智能看板 */
+/** 智能看板
+ * @author LunCe*/
+@Api("智能看板")
 @Slf4j
 @RestController
 @RequestMapping("/dashboard")
@@ -47,4 +50,8 @@ public class DashboardController {
     public ReturnMsg getCarbonQuota(){
         return carbonService.getCarbonQuota();
     }
+
+
+
+
 }

+ 30 - 0
src/main/java/com/sky/ioc/controller/dashboard/DiningRoomController.java

@@ -1,6 +1,12 @@
 package com.sky.ioc.controller.dashboard;
 
+import com.sky.ioc.service.canteen.RestaurantService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,8 +15,32 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ---- 餐厅
  */
 
+@Api("智能看板----餐厅")
 @Slf4j
 @RestController
 @RequestMapping("dining_room")
 public class DiningRoomController {
+
+
+    @Autowired
+    private RestaurantService restaurantService;
+
+
+    @ApiOperation("查询智能看板统计画像的餐厅消费态势的核心指标")
+    @GetMapping("getRestaurantConsumption")
+    public ReturnMsg getRestaurantConsumption(){
+        return restaurantService.getRestaurantConsumption();
+    }
+
+
+
+    @ApiOperation("查询智能看板统计画像的餐厅统计消费信息报表")
+    @GetMapping("getRestaurantConsumptionChart")
+    public ReturnMsg  getPersonnelInfoList(){
+        return restaurantService.getRestaurantConsumptionChart();
+    }
+
+
+
+
 }

+ 41 - 0
src/main/java/com/sky/ioc/controller/dashboard/ElectricityController.java

@@ -1,6 +1,12 @@
 package com.sky.ioc.controller.dashboard;
 
+import com.sky.ioc.service.energy.EnergyService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,8 +15,43 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ---- 用电
  */
 
+
+@Api("智能看板----用电")
 @Slf4j
 @RestController
 @RequestMapping("electricity")
 public class ElectricityController {
+
+    @Autowired
+    private EnergyService energyService;
+
+
+    @ApiOperation("查询智能看板统计画像的用电核心指标")
+    @GetMapping("getElectricityCoreIndicators")
+    public ReturnMsg getElectricityCoreIndicators(){
+        return energyService.getElectricityCoreIndicators();
+    }
+
+
+
+
+    @ApiOperation("查询智能看板统计画像的用电信息报表")
+    @GetMapping("getElectricityInfoList")
+    public ReturnMsg  getElectricityInfoList(){
+        return energyService.getElectricityInfoList();
+    }
+
+
+
+    @ApiOperation("查询智能看板统计画像的用电圆形信息报表")
+    @GetMapping("getElectricityCircleInfoList")
+    public ReturnMsg  getElectricityCircleInfoList(){
+        return energyService.getElectricityCircleInfoList();
+    }
+
+
+
+
+
+
 }

+ 2 - 2
src/main/java/com/sky/ioc/controller/dashboard/PersonnelController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 
 
-@Api("智慧楼宇 ------人员")
+@Api("智能看板 ------人员")
 @Slf4j
 @RestController
 @RequestMapping("personnel")
@@ -26,7 +26,7 @@ public class PersonnelController {
     private PersonnelService personnelService;
 
 
-    @ApiOperation("查询智能看板统计画像的统计人员信息")
+    @ApiOperation("查询智能看板统计画像的统计人员核心指标")
     @GetMapping("getPersonnelInfoCount")
     public ReturnMsg getPersonnelInfoCount(){
         return personnelService.personnelInfoCount();

+ 29 - 1
src/main/java/com/sky/ioc/controller/dashboard/UseColdController.java

@@ -1,7 +1,13 @@
 package com.sky.ioc.controller.dashboard;
 
 
+import com.sky.ioc.service.energy.EnergyService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -11,9 +17,31 @@ import org.springframework.web.bind.annotation.RestController;
  */
 
 
-
+@Api("智能看板----用冷")
 @Slf4j
 @RestController
 @RequestMapping("use_cold")
 public class UseColdController {
+
+
+    @Autowired
+    private EnergyService energyService;
+
+    @ApiOperation("查询智能看板统计画像的用冷心指标")
+    @GetMapping("getUseColdCoreIndicators")
+    public ReturnMsg getUseColdCoreIndicators(){
+        return energyService.getUseColdCoreIndicators();
+    }
+
+
+
+    @ApiOperation("查询智能看板统计画像的用冷信息报表")
+    @GetMapping("getUseColdInfoList")
+    public ReturnMsg  getUseColdInfoList(){
+        return energyService.getUseColdInfoList();
+    }
+
+
+
+
 }

+ 26 - 1
src/main/java/com/sky/ioc/controller/dashboard/UseHeatController.java

@@ -1,6 +1,12 @@
 package com.sky.ioc.controller.dashboard;
 
+import com.sky.ioc.service.energy.EnergyService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,9 +15,28 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ----  用热
  */
 
-
+@Api("智能看板----用热")
 @Slf4j
 @RestController
 @RequestMapping("use_heat")
 public class UseHeatController {
+
+    @Autowired
+    private EnergyService energyService;
+
+    @ApiOperation("查询智能看板统计画像的用热核心指标")
+    @GetMapping("getUseHeatCoreIndicators")
+    public ReturnMsg getUseHeatCoreIndicators(){
+        return energyService.getUseHeatCoreIndicators();
+    }
+
+
+
+    @ApiOperation("查询智能看板统计画像的用热信息报表")
+    @GetMapping("getUseHeatInfoList")
+    public ReturnMsg  getUseHeatInfoList(){
+        return energyService.getUseHeatInfoList();
+    }
+
+
 }

+ 40 - 2
src/main/java/com/sky/ioc/controller/dashboard/WaterController.java

@@ -1,6 +1,12 @@
 package com.sky.ioc.controller.dashboard;
 
+import com.sky.ioc.service.energy.EnergyService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,11 +15,43 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ----  用水
  */
 
-
-
+@Api("智能看板----用水")
 @Slf4j
 @RestController
 @RequestMapping("water")
 public class WaterController {
 
+
+    @Autowired
+    private EnergyService energyService;
+
+
+
+
+    @ApiOperation("查询智能看板统计画像的用水核心指标")
+    @GetMapping("getWaterCoreIndicators")
+    public ReturnMsg getWaterCoreIndicators(){
+        return energyService.getWaterCoreIndicators();
+    }
+
+
+
+    @ApiOperation("查询智能看板统计画像的用水信息报表")
+    @GetMapping("getWaterInfoList")
+    public ReturnMsg  getWaterInfoList(){
+        return energyService.getWaterInfoList();
+    }
+
+
+
+    @ApiOperation("查询智能看板统计画像的用水圆形信息报表")
+    @GetMapping("getWaterCircleInfoList")
+    public ReturnMsg  getWaterCircleInfoList(){
+        return energyService.getWaterCircleInfoList();
+    }
+
+
+
+
+
 }

+ 1 - 1
src/main/java/com/sky/ioc/controller/life/HealthHomeController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * @author LunCe
  */
-@Api("健康小屋")
+@Api("智享生活----健康小屋")
 @Slf4j
 @RestController
 @RequestMapping("healthhome")

+ 1 - 1
src/main/java/com/sky/ioc/controller/life/ParkingController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 
 
-@Api("智慧餐厅")
+@Api("智享生活----智慧餐厅")
 @Slf4j
 @RestController
 @RequestMapping("parking")

+ 1 - 1
src/main/java/com/sky/ioc/controller/life/RestaurantController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 智慧餐厅
  */
 
-@Api("智慧餐厅")
+@Api("智享生活----智慧餐厅")
 @Slf4j
 @RestController
 @RequestMapping("/restaurant")

+ 2 - 4
src/main/java/com/sky/ioc/controller/life/SupermarketController.java

@@ -16,12 +16,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @Author LunCe
  * @Date 2023/2/10 14:17
  **/
-
-
-@Api("无人超市")
+@Api("智享生活----无人超市")
 @Slf4j
 @RestController
-@RequestMapping("/supermarket")
+@RequestMapping("/life_supermarket")
 public class SupermarketController {
 
 

+ 10 - 1
src/main/java/com/sky/ioc/controller/work/WorkController.java

@@ -1,12 +1,21 @@
 package com.sky.ioc.controller.work;
 
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/** 智慧办公 */
+/** 智慧办公
+ * @author LunCe*/
+@Api("智慧办公")
 @Slf4j
 @RestController
 @RequestMapping("/work")
 public class WorkController {
+
+
+
+
+
 }

+ 6 - 2
src/main/java/com/sky/ioc/service/canteen/RestaurantService.java

@@ -3,8 +3,8 @@ package com.sky.ioc.service.canteen;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
- * TODO 餐厅
- * @Description
+ * TODO
+ * @Description 餐厅
  * @Author LunCe
  * @date 2023/2/22 11:29
  */
@@ -22,4 +22,8 @@ public interface RestaurantService {
     ReturnMsg getProfitAnalysis(Integer dateType);
 
     ReturnMsg getMealAnalysis(Integer dateType);
+
+    ReturnMsg getRestaurantConsumption();
+
+    ReturnMsg getRestaurantConsumptionChart();
 }

+ 29 - 0
src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

@@ -1,10 +1,14 @@
 package com.sky.ioc.service.canteen.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Objects;
+
 
 /**
  * @author LunCe
@@ -78,4 +82,29 @@ public class RestaurantServiceImpl implements RestaurantService {
     public ReturnMsg getMealAnalysis(Integer dateType) {
         return ReturnMsg.ok(FalseData.REPORTFORMSMAP.get(dateType));
     }
+
+    /**
+     * TODO 查询智能看板统计画像的餐厅消费态势的核心指标
+     * @Description
+     * @Return com.sky.ioc.tool.ReturnMsg
+     * @Author LunCe
+     * @date 2023/2/22 15:22
+     */
+    @Override
+    public ReturnMsg getRestaurantConsumption() {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+    }
+
+
+    /**
+     * TODO
+     * @Description 查询智能看板统计画像的餐厅统计消费信息报表
+     * @Return com.sky.ioc.tool.ReturnMsg
+     * @Author LunCe
+     * @date 2023/2/22 15:22
+     */
+    @Override
+    public ReturnMsg getRestaurantConsumptionChart() {
+        return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
+    }
 }

+ 5 - 0
src/main/java/com/sky/ioc/service/carbon/CarbonService.java

@@ -13,4 +13,9 @@ public interface CarbonService {
 
     ReturnMsg getCarbonQuota();
 
+    String getPrintingCoreIndicators();
+
+    String getPrintingCostTrend();
+
+    String getConferenceRoomInfo();
 }

+ 15 - 1
src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java

@@ -39,7 +39,6 @@ public class CarbonServiceImpl implements CarbonService {
         listMap.get(1).put("consumed",500);
         listMap.get(1).put("carbonQuota",200);
 
-
         listMap.get(2).put("info","郑分");
         listMap.get(2).put("consumed",500);
         listMap.get(2).put("carbonQuota",402);
@@ -53,4 +52,19 @@ public class CarbonServiceImpl implements CarbonService {
         listMap.get(4).put("carbonQuota",520);
         return ReturnMsg.ok(listMap);
     }
+
+    @Override
+    public String getPrintingCoreIndicators() {
+        return null;
+    }
+
+    @Override
+    public String getPrintingCostTrend() {
+        return null;
+    }
+
+    @Override
+    public String getConferenceRoomInfo() {
+        return null;
+    }
 }

+ 4 - 1
src/main/java/com/sky/ioc/service/personnel/PersonnelService.java

@@ -3,7 +3,10 @@ package com.sky.ioc.service.personnel;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
- * @author LunCe
+ * TODO 人员
+ * @Description
+ * @Author LunCe
+ * @date 2023/2/22 15:13
  */
 public interface PersonnelService {
     ReturnMsg personnelInfoCount();

+ 6 - 3
src/main/java/com/sky/ioc/service/personnel/impl/PersonnelServiceImpl.java

@@ -9,13 +9,16 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
- * @author LunCe
+ * TODO  人员
+ * @Description
+ * @Author LunCe
+ * @date 2023/2/22 15:14
  */
-
-
 @Service
 public class PersonnelServiceImpl implements PersonnelService {
 
+
+
     @Override
     public ReturnMsg personnelInfoCount() {
         List<Map<String,Object>> listMap = new ArrayList<>();

+ 12 - 0
src/main/java/com/sky/ioc/service/space/SpaceService.java

@@ -11,4 +11,16 @@ import com.sky.ioc.tool.ReturnMsg;
 public interface SpaceService {
 
     ReturnMsg getBuildingSituation();
+
+    String getFloorCoreIndicators();
+
+    String getAccessPersonnel();
+
+    String getFloorList();
+
+    String getMeetingCoreIndicators();
+
+    String getConferenceRoomInfo();
+
+    String getMeetingCostTrend();
 }

+ 31 - 0
src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -49,4 +49,35 @@ public class SpaceServiceImpl implements SpaceService {
         jsonObject1.put("totalArea","15000㎡");
         return ReturnMsg.ok(jsonObject1);
     }
+
+    @Override
+    public String getFloorCoreIndicators() {
+        return null;
+    }
+
+    @Override
+    public String getAccessPersonnel() {
+        return null;
+    }
+
+    @Override
+    public String getFloorList() {
+        return null;
+    }
+
+    @Override
+    public String getMeetingCoreIndicators() {
+        return null;
+    }
+
+
+    @Override
+    public String getConferenceRoomInfo() {
+        return null;
+    }
+
+    @Override
+    public String getMeetingCostTrend() {
+        return null;
+    }
 }

+ 6 - 0
src/main/java/com/sky/ioc/service/supermarket/SupermarketService.java

@@ -9,9 +9,15 @@ import com.sky.ioc.tool.ReturnMsg;
  * @Date 2023/2/10 14:19
  **/
 public interface SupermarketService {
+
+
     ReturnMsg getCoreIndicators(Integer dateType);
 
     ReturnMsg getQuotientAnalysiss(Integer dateType);
 
     ReturnMsg getProductRanking(Integer dateType);
+
+    ReturnMsg getSupermarketInfoList();
+
+    ReturnMsg getSupermarketCoreIndicators();
 }

+ 10 - 0
src/main/java/com/sky/ioc/service/supermarket/impl/SupermarketServiceImpl.java

@@ -28,4 +28,14 @@ public class SupermarketServiceImpl implements SupermarketService {
     public ReturnMsg getProductRanking(Integer dateType) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST5);
     }
+
+    @Override
+    public ReturnMsg getSupermarketInfoList() {
+       return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+    }
+
+    @Override
+    public ReturnMsg getSupermarketCoreIndicators() {
+        return  ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+    }
 }