Browse Source

纠正数据

liaoyitao 1 month ago
parent
commit
ce2e6f40ea

+ 2 - 2
src/main/java/com/lqkj/ioc/mapper/SecurityPerceptionMapper.java

@@ -28,12 +28,12 @@ public interface SecurityPerceptionMapper {
28 28
     @Select("SELECT sdd.dict_label, COUNT(ei.elevator_id) " +
29 29
             "FROM sys_dict_data sdd " +
30 30
             "LEFT JOIN elevator_info ei ON sdd.dict_value::integer = ei.status " +
31
-            "WHERE sdd.dict_type = 'elevator_info_status' and sdd.dict_value IN ('3', '7', '8') GROUP BY sdd.dict_code")
31
+            "WHERE sdd.dict_type = 'elevator_info_status' and sdd.dict_value IN ('3', '7', '8') GROUP BY sdd.dict_label")
32 32
     List<Map<String, Object>> elevatorAlarmDistribution();
33 33
 
34 34
     @Select("SELECT sdd.dict_label, COUNT(ei.equipment_id) " +
35 35
             "FROM sys_dict_data sdd " +
36 36
             "LEFT JOIN equipment_info ei ON sdd.dict_value::integer = ei.brand " +
37
-            "WHERE sdd.dict_type = 'equip_brand' GROUP BY sdd.dict_code")
37
+            "WHERE sdd.dict_type = 'equip_brand' GROUP BY sdd.dict_label")
38 38
     List<Map<String, Object>> countChargingStationBrands();
39 39
 }

+ 0 - 5
src/main/resources/db/migration/V1_12__data.sql

@@ -308,11 +308,6 @@ INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "d
308 308
 INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (358, 7, '医疗健康', '31', 'park_industry_type_classification', NULL, 'default', 'f', 't', '超级管理员', '2024-12-04 15:28:08.927566', NULL, NULL, NULL, NULL, 2);
309 309
 INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (359, 1, '用水量', '60,50,58,66,80,73,90', 'energy_consumption_statistics', NULL, 'default', 'f', 't', '超级管理员', '2024-12-04 18:04:27.793167', NULL, NULL, NULL, NULL, 2);
310 310
 INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (360, 2, '用电量', '80,60,45,58,80,90,98', 'energy_consumption_statistics', NULL, 'default', 'f', 't', '超级管理员', '2024-12-04 18:05:57.07573', NULL, NULL, NULL, NULL, 2);
311
-INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (401, 1, '学校', '2000', 'land_use_situation', NULL, 'default', 'f', 't', '超级管理员', '2024-12-05 16:44:57.655211', NULL, NULL, NULL, NULL, 2);
312
-INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (402, 2, '商业机构', '2800', 'land_use_situation', NULL, 'default', 'f', 't', '超级管理员', '2024-12-05 16:45:15.896936', NULL, NULL, NULL, NULL, 2);
313
-INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (403, 3, '酒店', '1500', 'land_use_situation', NULL, 'default', 'f', 't', '超级管理员', '2024-12-05 16:45:29.044991', NULL, NULL, NULL, NULL, 2);
314
-INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (404, 4, '政府机构', '800', 'land_use_situation', NULL, 'default', 'f', 't', '超级管理员', '2024-12-05 16:45:41.684989', NULL, NULL, NULL, NULL, 2);
315
-INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (405, 5, '医疗', '3600', 'land_use_situation', NULL, 'default', 'f', 't', '超级管理员', '2024-12-05 16:46:03.115815', NULL, NULL, NULL, NULL, 2);
316 311
 INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (406, 2, '公共资源', '15万㎡', 'resource_info', NULL, 'default', 'f', 't', '超级管理员', '2024-12-04 14:58:52.168899', NULL, NULL, NULL, NULL, 2);
317 312
 INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (407, 5, '园区总人数', '3000人', 'resource_info', NULL, 'default', 'f', 't', '超级管理员', '2024-12-04 14:59:50.184462', NULL, NULL, NULL, NULL, 2);
318 313
 INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id") VALUES (408, 6, '教育科研', '18', 'park_industry_type_classification', NULL, 'default', 'f', 't', '超级管理员', '2024-12-04 15:27:52.324368', NULL, NULL, NULL, NULL, 2);