增加采集站字段

device_cars/src/main/java/com/xr/device_car/config/getconfigvalue/StaticProperties.java

@@ -35,4 +35,10 @@ public class StaticProperties {
     @Value("${udp.server.port}")
     private Integer udpPort;
 
+    @Value("${station.id}")
+    private Integer stationId;
+
+    @Value("${station.name}")
+    private String stationName;
+
 }

device_cars/src/main/java/com/xr/device_car/config/utils/StaticPropUtil.java

@@ -22,6 +22,10 @@ public class StaticPropUtil {
 
     public static Integer udpPort;
 
+    public static Integer stationId;
+
+    public static String stationName;
+
     public static void initDingDingProp(StaticProperties dingProperties){
         imagePath = dingProperties.getPath();
         imageUrl = dingProperties.getUrl();
@@ -32,6 +36,8 @@ public class StaticPropUtil {
         minioSecret=dingProperties.getMinioSecret();
         udpHost=dingProperties.getUdpHost();
         udpPort=dingProperties.getUdpPort();
+        stationId = dingProperties.getStationId();
+        stationName = dingProperties.getStationName();
     }
 
 }

device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java

@@ -31,8 +31,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
+import java.util.*;
 import java.util.List;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
@@ -356,4 +355,48 @@ public class MeterConfigController {
         return sum;
     }
 
+    @RequestMapping("/queryMeterList")
+    public Result<?> queryMeterList(){
+        QueryWrapper<MeterConfig> query = new QueryWrapper<>();
+        query.eq("status",1);
+        List<MeterConfig> list = meterConfigService.list(query);
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("name",StaticPropUtil.stationName);
+        map1.put("value",list.size());
+
+        List<Map<String,Object>> ml1 = new ArrayList<>();
+        QueryWrapper<MeterConfig> query1 = new QueryWrapper<>();
+        query1.eq("status",1);
+        query1.select("owning_interval");
+        query1.groupBy("owning_interval");
+        List<MeterConfig> list1 = meterConfigService.list(query1);
+        for(MeterConfig meter:list1){
+            Map<String,Object> map2 = new HashMap<>();
+            QueryWrapper<MeterConfig> query2 = new QueryWrapper<>();
+            query2.eq("status",1);
+            query2.eq("owning_interval",meter.getOwningInterval());
+            List<MeterConfig> list2 = meterConfigService.list(query2);
+            map2.put("name",meter.getOwningInterval());
+            map2.put("value",list2.size());
+            List<MeterConfig> list3 = meterConfigService.selectConfigByTypes(meter);
+            List<Map<String,Object>> ml2 = new ArrayList<>();
+            for (MeterConfig config:list3){
+                Map<String,Object> map3 = new HashMap<>();
+                map3.put("name",config.getMeterType());
+                QueryWrapper<MeterConfig> query3 = new QueryWrapper<>();
+                query3.eq("status",1);
+                query3.eq("owning_interval",meter.getOwningInterval());
+                query3.eq("type_id",config.getTypeId());
+                int count = meterConfigService.count(query3);
+                map3.put("value",count);
+                map3.put("children",new ArrayList<>());
+                ml2.add(map3);
+            }
+            map2.put("children",ml2);
+            ml1.add(map2);
+        }
+        map1.put("children",ml1);
+        return Result.OK(map1);
+    }
+
 }

device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java

@@ -68,6 +68,9 @@ public class MeterConfig implements Serializable {
     @TableField(exist = false)
     private String cameraName;
 
+    @TableField(exist = false)
+    private String meterType;
+
     /**
      * 表计类型配置编号
      */

device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterConfigMapper.java

@@ -8,6 +8,8 @@ import com.xr.device_car.modules.analysis.entity.MeterConfig;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author asus
 * @description 针对表【meter_config(表计属性配置表)】的数据库操作Mapper
@@ -19,6 +21,8 @@ public interface MeterConfigMapper extends BaseMapper<MeterConfig> {
 
     IPage<MeterConfig> selectConfigByPage(@Param("page") IPage<MeterConfig> page,
                                    @Param(Constants.WRAPPER) Wrapper<MeterConfig> wrapper);
+
+    List<MeterConfig> selectConfigByTypes(MeterConfig meterConfig);
 }
 
 

device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterConfigService.java

@@ -6,6 +6,8 @@ import com.xr.device_car.modules.analysis.entity.MeterConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xr.device_car.modules.analysis.vo.MeterMaxMinSaveVo;
 
+import java.util.List;
+
 /**
 * @author asus
 * @description 针对表【meter_config(表计属性配置表)】的数据库操作Service
@@ -18,4 +20,6 @@ public interface MeterConfigService extends IService<MeterConfig> {
 
     boolean saveMaxMin(MeterMaxMinSaveVo vo);
 
+    List<MeterConfig> selectConfigByTypes(MeterConfig meterConfig);
+
 }

device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterConfigServiceImpl.java

@@ -12,6 +12,8 @@ import com.xr.device_car.modules.analysis.mapper.MeterConfigMapper;
 import com.xr.device_car.modules.analysis.vo.MeterMaxMinSaveVo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author asus
 * @description 针对表【meter_config(表计属性配置表)】的数据库操作Service实现
@@ -39,6 +41,11 @@ public class MeterConfigServiceImpl extends ServiceImpl<MeterConfigMapper, Meter
         return update(updateWrapper);
     }
 
+    @Override
+    public List<MeterConfig> selectConfigByTypes(MeterConfig meterConfig) {
+        return ((MeterConfigMapper)this.baseMapper).selectConfigByTypes(meterConfig);
+    }
+
 }
 
 

device_cars/src/main/resources/application-dev.yml

@@ -92,3 +92,6 @@ udp:
   server:
     host: 172.26.4.59
     port: 9300
+station:
+  id: 1
+  name: 中山站

device_cars/src/main/resources/application-prod.yml

@@ -92,3 +92,6 @@ udp:
   server:
     host: 192.168.1.100
     port: 9300
+station:
+  id: 1
+  name: 中山站

device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml

@@ -51,4 +51,10 @@
         left join meter_type c on a.type_id=c.id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="selectConfigByTypes" resultType="com.xr.device_car.modules.analysis.entity.MeterConfig">
+        select b.meter_type,a.type_id from meter_config a left join meter_type b
+        on a.type_id = b.id where a.status = 1 and a.owning_interval = #{owningInterval}
+        group by b.meter_type,a.type_id
+    </select>
 </mapper>