From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 一月 2025 16:40:32 +0800
Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段； 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询； 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口”
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
index f841907..8e49596 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
@@ -1,7 +1,13 @@
package com.dy.pipIrrGlobal.util;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.dy.common.mybatis.envm.IEnum;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 琛屾斂鍖哄垝绾у埆
@@ -9,11 +15,11 @@
*/
public enum DistrictLevel implements IEnum {
+ Province((byte)0, "鐪�"),
City((byte)1, "甯�"),
County((byte)2, "鍘�"),
Town((byte)3, "闀�"),
- Village((byte)4, "鏉�"),
- Group((byte)5, "缁�");
+ Village((byte)4, "鏉�") ;
@EnumValue
public Byte code ;
@@ -24,6 +30,18 @@
this.name = name ;
}
+ //鐢ㄦ潵杞琷son
+ public static List<Map> LevelList = new ArrayList<>();
+ static {
+ DistrictLevel[] all = DistrictLevel.values();
+ for (DistrictLevel one : all) {
+ Map<String, Object> objMap = new HashMap<>();
+ objMap.put("code", one.code);
+ objMap.put("name", one.name);
+ LevelList.add(objMap) ;
+ }
+ }
+
@Override
public Byte getCode() {
return this.code ;
@@ -33,4 +51,19 @@
public String getName() {
return this.name ;
}
+
+ public static DistrictLevel get(Byte code){
+ if(code.byteValue() == Province.code.byteValue()) {
+ return Province;
+ }else if(code.byteValue() == City.code.byteValue()){
+ return City ;
+ }else if(code.byteValue() == County.code.byteValue()){
+ return County ;
+ }else if(code.byteValue() == Town.code.byteValue()){
+ return Town ;
+ }else if(code.byteValue() == Village.code.byteValue()){
+ return Village ;
+ }
+ return null ;
+ }
}
--
Gitblit v1.8.0