diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java index 914db39..1c6d858 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java @@ -14,5 +14,6 @@ import java.util.stream.Stream; public interface DataParam { List phases = Stream.of("A","B","C","T").collect(Collectors.toList()); List statMethods = Stream.of("avg","max","min","cp95").collect(Collectors.toList()); + long FILE_SIZE = 10 * 1024 * 1024; } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java index 2257e8b..75e1080 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java @@ -21,7 +21,8 @@ public enum AlgorithmResponseEnum { DATA_ERROR("A00503","存在相同的数据"), LINE_DATA_ERROR ("A00504","设备下监测点数据缺失"), ENGINEERING_DATA_ERROR ("A00505","工程数据数据缺失"), - ELEEPDPQD_DATA_ERROR ("A00505","统计指标据数据缺失"), + ELEEPDPQD_DATA_ERROR ("A00506","统计指标据数据缺失"), + FILE_SIZE_ERROR ("A00507","文件不能超过10M"), ; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java index b81d893..e64f4cd 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java @@ -60,5 +60,5 @@ public interface AppProjectMapper extends BaseMapper { // " order by a.create_time desc", // ""} // ) - Page getPageVo(Page returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm); + Page getPageVo(Page returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm, @Param("userId") String userId); } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml index 81f986c..5ae8aca 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml @@ -25,6 +25,9 @@