运营监管分析大屏调整验收相关内容

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/CommonController.java

@@ -51,4 +51,25 @@ public class CommonController extends BaseController {
                                                      @RequestParam(value = "secondMenuKey") String secondMenuKey) {
         return ResponseHelper.buildResponse(commonService.analysisCityMapData(firstMenuKey, secondMenuKey));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "运营监管分析右侧安全监管-两个清单", notes = "运营监管分析右侧安全监管-两个清单")
+    @RequestMapping(value = "/analysis/twoLists", method = RequestMethod.GET)
+    public ResponseModel<Object> analysisTwoLists(@RequestParam(value = "type") String type) {
+        return ResponseHelper.buildResponse(commonService.analysisTwoLists(type));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "运营监管分析右侧安全监管-专项整治", notes = "运营监管分析右侧安全监管-专项整治")
+    @RequestMapping(value = "/analysis/specialRectification", method = RequestMethod.GET)
+    public ResponseModel<Object> analysisSpecialRectification(@RequestParam(value = "type") String type) {
+        return ResponseHelper.buildResponse(commonService.analysisSpecialRectification(type));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "运营监管分析右侧安全监察-环状单值图", notes = "运营监管分析右侧安全监察-环状单值图")
+    @RequestMapping(value = "/analysis/safetySupervision", method = RequestMethod.GET)
+    public ResponseModel<Object> analysisSafetySupervision(@RequestParam(value = "type") String type) {
+        return ResponseHelper.buildResponse(commonService.analysisSafetySupervision(type));
+    }
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/CommonService.java

@@ -8,4 +8,9 @@ public interface CommonService {
 
     Object analysisCityMapData(String firstMenuKey, String secondMenuKey);
 
+    Object analysisTwoLists(String type);
+
+    Object analysisSpecialRectification(String type);
+
+    Object analysisSafetySupervision(String type);
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/CommonServiceImpl.java

@@ -16,6 +16,10 @@ import com.yeejoin.amos.boot.module.ys.api.enums.MaintenanceExpiredEarlyWarningE
 import com.yeejoin.amos.boot.module.ys.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.ys.biz.service.CommonService;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -40,8 +44,11 @@ import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
+import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
 /**
  * 公共服务实现类
@@ -362,4 +369,61 @@ public class CommonServiceImpl implements CommonService {
     public Object analysisCityMapData(String firstMenuKey, String secondMenuKey) {
         return new JSONObject().fluentPut("records", Collections.singletonList(jsonData.get(firstMenuKey).get(secondMenuKey)));
     }
+
+    private static final Random random = new Random();
+
+    public static List<Integer> generateIntegers(int min, int max, int count) {
+        return random.ints(count, min, max + 1)
+                .boxed()
+                .collect(Collectors.toList());
+    }
+
+    private static Result generatingFakeData() {
+        List<Integer> allNumbers = generateIntegers(0, 3, 24);
+
+        List<Integer> lineData = allNumbers.subList(0, 8);
+        List<Integer> barData1 = allNumbers.subList(8, 16);
+        List<Integer> barData2 = allNumbers.subList(16, 24);
+
+        String lineDataStr = lineData.stream().map(String::valueOf).collect(Collectors.joining(","));
+        String barData1Str = barData1.stream().map(String::valueOf).collect(Collectors.joining(","));
+        String barData2Str = barData2.stream().map(String::valueOf).collect(Collectors.joining(","));
+        return new Result(lineDataStr, barData1Str, barData2Str);
+    }
+
+    @Data
+    @Getter
+    private static class Result {
+        private String lineDataStr;
+        private String barData1Str;
+        private String barData2Str;
+
+        public Result(String lineDataStr, String barData1Str, String barData2Str) {
+            this.lineDataStr = lineDataStr;
+            this.barData1Str = barData1Str;
+            this.barData2Str = barData2Str;
+        }
+    }
+
+    @Override
+    public Object analysisTwoLists(String type) {
+        Result fakeData = generatingFakeData();
+        String twoListsTemplate = "{\"seriesData\":[{\"data\":[%s],\"name\":\"正常点\",\"type\":\"line\",\"key\":\"default\",\"yAxisIndex\":1,\"smooth\":false},{\"barWidth\":18,\"stack\":\"巡检点\",\"data\":[%s],\"name\":\"异常点\",\"type\":\"bar\",\"key\":\"default\",\"smooth\":false},{\"barWidth\":18,\"stack\":\"巡检点\",\"data\":[%s],\"type\":\"bar\",\"key\":\"default\",\"smooth\":false}],\"axisData\":[\"使用\\n单位\",\"安全检\\n察部门\",\"专委会\\n成员单\",\"检验检\\n测机构\",\"人员考\\n试机构\",\"行业\\n协会\",\"生产\\n单位\",\"经营\\n单位\"]}";
+        String result = String.format(twoListsTemplate, fakeData.getLineDataStr(), fakeData.getBarData1Str(), fakeData.getBarData2Str());
+        return JSONObject.parseObject(result);
+    }
+
+    @Override
+    public Object analysisSpecialRectification(String type) {
+        Result fakeData = generatingFakeData();
+        String specialRectificationTemplate = "{\"seriesData\":[{\"data\":[%s],\"name\":\"正常点\",\"type\":\"line\",\"key\":\"default\",\"yAxisIndex\":1,\"smooth\":false},{\"barWidth\":18,\"stack\":\"巡检点\",\"data\":[%s],\"name\":\"异常点\",\"type\":\"bar\",\"key\":\"default\",\"smooth\":false},{\"barWidth\":18,\"stack\":\"巡检点\",\"data\":[%s],\"type\":\"bar\",\"key\":\"default\",\"smooth\":false}],\"axisData\":[\"电梯\",\"锅炉\",\"压力\\n容器\",\"压力\\n管道\",\"大型游\\n乐设施\",\"索道\",\"场内机\\n动车\",\"起重\\n机械\"]}";
+        String result = String.format(specialRectificationTemplate, fakeData.getLineDataStr(), fakeData.getBarData1Str(), fakeData.getBarData2Str());
+        return JSONObject.parseObject(result);
+    }
+
+    @Override
+    public Object analysisSafetySupervision(String type) {
+        String template = "{\"seriesData\":[%s]}";
+        return JSONObject.parseObject(String.format(template, "0".equals(type) ? "88.3" : "92.1"));
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/resources/json/analysisCityMapData.json

 {
   "底数清": {
-    "设备": {
+    "特种设备数量": {
       "YULINNUM": "116256",
       "YANANNUM": "61979",
       "HANCHENGNUM": "21668",