接口调整

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/AnalysisController.java

@@ -142,13 +142,13 @@ public class AnalysisController extends AbstractController {
 			String time = DateUtils.format((Date) list.get(i).get("create_time"),"yyyy-MM-dd HH:mm:ss");
 
 			temperatureListDetail.add(time);
-			temperatureListDetail.add((String) list.get(i).get("temperature"));
+			temperatureListDetail.add(list.get(i).get("temperature").toString());
 
 			humidityListDetail.add(time);
-			humidityListDetail.add((String) list.get(i).get("humidity"));
+			humidityListDetail.add(list.get(i).get("humidity").toString());
 
 			carbonDioxideListDetail.add(time);
-			carbonDioxideListDetail.add((String) list.get(i).get("carbon_dioxide"));
+			carbonDioxideListDetail.add(list.get(i).get("carbon_dioxide").toString());
 
 			temperatureList.add(temperatureListDetail);
 			humidityList.add(humidityListDetail);

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/AnalysisServiceImpl.java

@@ -136,7 +136,7 @@ public class AnalysisServiceImpl implements AnalysisService {
         for (int i = 0; i < page.getRecords().size(); i++) {
             List<String> listDetail = new ArrayList<String>();
             listDetail.add(DateUtils.format((Date) page.getRecords().get(i).get("create_time"),"yyyy-MM-dd HH:mm:ss"));
-            listDetail.add((String) page.getRecords().get(i).get("electric_energy"));
+            listDetail.add(page.getRecords().get(i).get("electric_energy").toString());
             listTj.add(listDetail);
         }
         return listTj;
@@ -165,7 +165,7 @@ public class AnalysisServiceImpl implements AnalysisService {
         for (int i = 0; i < list.size(); i++) {
             List<String> listDetail = new ArrayList<String>();
             listDetail.add(DateUtils.format((Date) list.get(i).get("create_time"),"yyyy-MM-dd HH:mm:ss"));
-            listDetail.add((String) list.get(i).get("electric_energy"));
+            listDetail.add(list.get(i).get("electric_energy").toString());
             listTj.add(listDetail);
         }
         return listTj;

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/DlswjInfoServiceImpl.java

@@ -61,11 +61,11 @@ public class DlswjInfoServiceImpl extends MyBaseServiceImpl<DlswjInfoDao, DlswjI
     @Override
     public List<Map<String, Object>> queryListByParam(Integer type) {
         List<Map<String,Object>> list = new ArrayList<>();
-        if(Constants.STRING_1.equals(type)){
+        if(type == Constants.INT_1){
             list = dlswjInfoHourService.queryListByParam(type);
-        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+        }else if(type == Constants.INT_2 || type == Constants.INT_3){
             list = dlswjInfoDayService.queryListByParam(type);
-        }else if(Constants.STRING_4.equals(type)){
+        }else if(type == Constants.INT_4){
             list = dlswjInfoMonthService.queryListByParam(type);
         }
         return list;

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/FlrbInfoServiceImpl.java

@@ -61,11 +61,11 @@ public class FlrbInfoServiceImpl extends MyBaseServiceImpl<FlrbInfoDao, FlrbInfo
     @Override
     public List<Map<String, Object>> queryListByParam(Integer type) {
         List<Map<String,Object>> list = new ArrayList<>();
-        if(Constants.STRING_1.equals(type)){
+        if(type == Constants.INT_1){
             list = flrbInfoHourService.queryListByParam(type);
-        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+        }else if(type == Constants.INT_2 || type == Constants.INT_3){
             list = flrbInfoDayService.queryListByParam(type);
-        }else if(Constants.STRING_4.equals(type)){
+        }else if(type == Constants.INT_4){
             list = flrbInfoMonthService.queryListByParam(type);
         }
         return list;

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/JfktgInfoServiceImpl.java

@@ -61,11 +61,11 @@ public class JfktgInfoServiceImpl extends MyBaseServiceImpl<JfktgInfoDao, JfktgI
     @Override
     public List<Map<String, Object>> queryListByParam(Integer type) {
         List<Map<String,Object>> list = new ArrayList<>();
-        if(Constants.STRING_1.equals(type)){
+        if(type == Constants.INT_1){
             list = jfktgInfoHourService.queryListByParam(type);
-        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+        }else if(type == Constants.INT_2 || type == Constants.INT_3){
             list = jfktgInfoDayService.queryListByParam(type);
-        }else if(Constants.STRING_4.equals(type)){
+        }else if(type == Constants.INT_4){
             list = jfktgInfoMonthService.queryListByParam(type);
         }
         return list;

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/JfktpInfoServiceImpl.java

@@ -62,11 +62,11 @@ public class JfktpInfoServiceImpl extends MyBaseServiceImpl<JfktpInfoDao, JfktpI
     @Override
     public List<Map<String, Object>> queryListByParam(Integer type) {
         List<Map<String,Object>> list = new ArrayList<>();
-        if(Constants.STRING_1.equals(type)){
+        if(type == Constants.INT_1){
             list = jfktpInfoHourService.queryListByParam(type);
-        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+        }else if(type == Constants.INT_2|| type == Constants.INT_3){
             list = jfktpInfoDayService.queryListByParam(type);
-        }else if(Constants.STRING_4.equals(type)){
+        }else if(type == Constants.INT_4){
             list = jfktpInfoMonthService.queryListByParam(type);
         }
         return list;

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/PfjInfoServiceImpl.java

@@ -61,11 +61,11 @@ public class PfjInfoServiceImpl extends MyBaseServiceImpl<PfjInfoDao, PfjInfo> i
     @Override
     public List<Map<String, Object>> queryListByParam(Integer type) {
         List<Map<String,Object>> list = new ArrayList<>();
-        if(Constants.STRING_1.equals(type)){
+        if(type == Constants.INT_1){
             list = pfjInfoHourService.queryListByParam(type);
-        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+        }else if(type == Constants.INT_2 || type == Constants.INT_3){
             list = pfjInfoDayService.queryListByParam(type);
-        }else if(Constants.STRING_4.equals(type)){
+        }else if(type == Constants.INT_4){
             list = pfjInfoMonthService.queryListByParam(type);
         }
         return list;

microservice-admin/src/main/resources/mapper/eq/DlswjInfoDayMapper.xml

@@ -64,7 +64,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from dlswj_info_day
 		where 1=1
 		<if test="type == 2">

microservice-admin/src/main/resources/mapper/eq/DlswjInfoHourMapper.xml

@@ -61,10 +61,10 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from dlswj_info_hour
 		where 1=1
-		<if test="params.type == 1">
+		<if test="type == 1">
 			and TO_DAYS(create_time) = TO_DAYS(NOW())
 		</if>
 		group by create_time

microservice-admin/src/main/resources/mapper/eq/DlswjInfoMonthMapper.xml

@@ -61,7 +61,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from dlswj_info_month
 		where 1=1
 		<if test="type == 4">

microservice-admin/src/main/resources/mapper/eq/FlrbInfoDayMapper.xml

@@ -64,7 +64,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from flrb_info_day
 		where 1=1
 		<if test="type == 2">

microservice-admin/src/main/resources/mapper/eq/FlrbInfoHourMapper.xml

@@ -61,10 +61,10 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from flrb_info_hour
 		where 1=1
-		<if test="params.type == 1">
+		<if test="type == 1">
 			and TO_DAYS(create_time) = TO_DAYS(NOW())
 		</if>
 		group by create_time

microservice-admin/src/main/resources/mapper/eq/FlrbInfoMonthMapper.xml

@@ -61,7 +61,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from flrb_info_month
 		where 1=1
 		<if test="type == 4">

microservice-admin/src/main/resources/mapper/eq/JfktgInfoDayMapper.xml

@@ -64,7 +64,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from jfktg_info_day
 		where 1=1
 		<if test="type == 2">

microservice-admin/src/main/resources/mapper/eq/JfktgInfoHourMapper.xml

@@ -61,10 +61,10 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from jfktg_info_hour
 		where 1=1
-		<if test="params.type == 1">
+		<if test="type == 1">
 			and TO_DAYS(create_time) = TO_DAYS(NOW())
 		</if>
 		group by create_time

microservice-admin/src/main/resources/mapper/eq/JfktgInfoMonthMapper.xml

@@ -61,7 +61,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from jfktg_info_month
 		where 1=1
 		<if test="type == 4">

microservice-admin/src/main/resources/mapper/eq/JfktpInfoDayMapper.xml

@@ -64,7 +64,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from jfktp_info_day
 		where 1=1
 		<if test="type == 2">

microservice-admin/src/main/resources/mapper/eq/JfktpInfoHourMapper.xml

@@ -61,10 +61,10 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from jfktp_info_hour
 		where 1=1
-		<if test="params.type == 1">
+		<if test="type == 1">
 			and TO_DAYS(create_time) = TO_DAYS(NOW())
 		</if>
 		group by create_time

microservice-admin/src/main/resources/mapper/eq/JfktpInfoMonthMapper.xml

@@ -61,7 +61,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from jfktp_info_month
 		where 1=1
 		<if test="type == 4">

microservice-admin/src/main/resources/mapper/eq/PfjInfoDayMapper.xml

@@ -64,7 +64,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from pfj_info_day
 		where 1=1
 		<if test="type == 2">

microservice-admin/src/main/resources/mapper/eq/PfjInfoHourMapper.xml

@@ -60,10 +60,10 @@
 	</select>
 
     <select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from pfj_info_hour
 		where 1=1
-		<if test="params.type == 1">
+		<if test="type == 1">
 			and TO_DAYS(create_time) = TO_DAYS(NOW())
 		</if>
 		group by create_time

microservice-admin/src/main/resources/mapper/eq/PfjInfoMonthMapper.xml

@@ -61,7 +61,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
 		from pfj_info_month
 		where 1=1
 		<if test="type == 4">

microservice-admin/src/main/resources/mapper/eq/SnqxzInfoHourMapper.xml

@@ -59,7 +59,7 @@
 			and TO_DAYS(t.create_time) = TO_DAYS(NOW())
 		</if>
 		<if test="params.type == 2">
-			and YEARWEEK(date_format(t.create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1);
+			and YEARWEEK(date_format(t.create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
 		</if>
 		<if test="params.type == 3">
 			and DATE_FORMAT(t.create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
@@ -115,7 +115,10 @@
 		<if test="type == 4">
 			and DATE_FORMAT( create_time, '%Y' ) = DATE_FORMAT( CURDATE() , '%Y' )
 		</if>
-		group by region,create_time
+		<if test="region!=null">
+			and region = #{region}
+		</if>
+		group by create_time
 		order by create_time
 	</select>