接口调整

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SnqxzInfoHour.java

@@ -33,6 +33,9 @@ public class SnqxzInfoHour implements Serializable {
 	/** 类型(1手动，2节能) */
 	@ApiModelProperty(value="类型(1手动，2节能)",name="type")
 	private Integer type;
+	/** 区域(1候车大厅，2办公区域) */
+	@ApiModelProperty(value="区域(1候车大厅，2办公区域)",name="region")
+	private Integer region;
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;

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

@@ -128,7 +128,7 @@ public class AnalysisController extends AbstractController {
 		if(StringUtils.isNotBlank(resourceId)){
 			list = snqxzInfoHourService.getList(resourceId,type);
 		}else{
-
+			list = snqxzInfoHourService.getListFx(region,type);
 		}
 		List<List<String>> temperatureList = new ArrayList<List<String>>();
 		List<List<String>> humidityList = new ArrayList<List<String>>();
@@ -161,13 +161,24 @@ public class AnalysisController extends AbstractController {
 	}
 
 	/**
-	 * 获取用电数据
+	 * 获取用电数据-统计图表
+	 * @return
+	 */
+	@ApiOperation(value="获取用电数据-统计图表", notes="获取用电数据-统计图表")
+	@GetMapping("/getEnergyTb")
+	public R getEnergyTb(@RequestParam("resourceId") String resourceId,@RequestParam("type") Integer type,@RequestParam("resourceType") String resourceType) {
+		List<List<String>> list = analysisService.getEnergyListTb(resourceId,type,resourceType);
+		return R.ok().put("list", list);
+	}
+
+	/**
+	 * 获取能耗数据分析
 	 * @return
 	 */
-	@ApiOperation(value="获取用电数据", notes="获取用电数据")
-	@GetMapping("/getEnergyTj")
-	public R getEnergyTj(@RequestParam("resourceId") String resourceId,@RequestParam("type") Integer type,@RequestParam("resourceType") String resourceType) {
-		List<List<String>> list = analysisService.getEnergyList(resourceId,type,resourceType);
+	@ApiOperation(value="获取能耗数据分析", notes="获取能耗数据分析")
+	@GetMapping("/getEnergyFx")
+	public R getEnergyFx(@RequestParam("type") Integer type,@RequestParam("resourceType") String resourceType) {
+		List<List<String>> list = analysisService.getEnergyListFx(type,resourceType);
 		return R.ok().put("list", list);
 	}
 

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/DlswjInfoDayDao.java

@@ -35,4 +35,6 @@ public interface DlswjInfoDayDao extends MyBaseMapper<DlswjInfoDay> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/DlswjInfoHourDao.java

@@ -33,8 +33,8 @@ public interface DlswjInfoHourDao extends MyBaseMapper<DlswjInfoHour> {
      */
     List<DlswjInfoHour> queryPageList(DlswjInfoHourModel model);
 
-    List<Map<String, Object>> querySum();
-
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/DlswjInfoMonthDao.java

@@ -35,4 +35,6 @@ public interface DlswjInfoMonthDao extends MyBaseMapper<DlswjInfoMonth> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/FlrbInfoDayDao.java

@@ -40,4 +40,6 @@ public interface FlrbInfoDayDao extends MyBaseMapper<FlrbInfoDay> {
      */
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/FlrbInfoHourDao.java

@@ -35,4 +35,6 @@ public interface FlrbInfoHourDao extends MyBaseMapper<FlrbInfoHour> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/FlrbInfoMonthDao.java

@@ -35,4 +35,6 @@ public interface FlrbInfoMonthDao extends MyBaseMapper<FlrbInfoMonth> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/JfktgInfoDayDao.java

@@ -40,4 +40,6 @@ public interface JfktgInfoDayDao extends MyBaseMapper<JfktgInfoDay> {
      */
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/JfktgInfoHourDao.java

@@ -35,4 +35,6 @@ public interface JfktgInfoHourDao extends MyBaseMapper<JfktgInfoHour> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/JfktgInfoMonthDao.java

@@ -35,4 +35,6 @@ public interface JfktgInfoMonthDao extends MyBaseMapper<JfktgInfoMonth> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/JfktpInfoDayDao.java

@@ -40,4 +40,6 @@ public interface JfktpInfoDayDao extends MyBaseMapper<JfktpInfoDay> {
      */
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/JfktpInfoHourDao.java

@@ -35,4 +35,6 @@ public interface JfktpInfoHourDao extends MyBaseMapper<JfktpInfoHour> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/JfktpInfoMonthDao.java

@@ -35,4 +35,6 @@ public interface JfktpInfoMonthDao extends MyBaseMapper<JfktpInfoMonth> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/PfjInfoDayDao.java

@@ -40,4 +40,6 @@ public interface PfjInfoDayDao extends MyBaseMapper<PfjInfoDay> {
      */
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
             @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/PfjInfoHourDao.java

@@ -35,4 +35,6 @@ public interface PfjInfoHourDao extends MyBaseMapper<PfjInfoHour> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/PfjInfoMonthDao.java

@@ -35,4 +35,6 @@ public interface PfjInfoMonthDao extends MyBaseMapper<PfjInfoMonth> {
 
     Page<Map<String, Object>> queryPageListByParam(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("params") Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(@Param("type")Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SnqxzInfoHourDao.java

@@ -43,4 +43,6 @@ public interface SnqxzInfoHourDao extends MyBaseMapper<SnqxzInfoHour> {
                                                    @Param("params") Map<String, Object> params);
 
     List<Map<String,Object>> getList(@Param("resourceId")String resourceId, @Param("type") Integer type);
+
+    List<Map<String, Object>> getListFx(@Param("region")Integer region,@Param("type") Integer type);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SnqxzInfoHourModel.java

@@ -27,4 +27,6 @@ public class SnqxzInfoHourModel extends BaseModel {
 	private java.lang.String stationId;
 	/** 创建时间 */
 	private java.util.Date createTime;
+	/** 区域(1候车大厅，2办公区域) */
+	private Integer region;
 }

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

@@ -11,5 +11,7 @@ public interface AnalysisService {
 
     Map<String,Object> getSyParam();
 
-    List<List<String>> getEnergyList(String resourceId, Integer type, String resourceType);
+    List<List<String>> getEnergyListTb(String resourceId, Integer type, String resourceType);
+
+    List<List<String>> getEnergyListFx(Integer type, String resourceType);
 }

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

@@ -26,4 +26,6 @@ public interface DlswjInfoDayService extends MyBaseService<DlswjInfoDay> {
 
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -23,7 +23,7 @@ public interface DlswjInfoHourService extends MyBaseService<DlswjInfoHour> {
      */
     List<DlswjInfoHour> queryPageList(DlswjInfoHourModel model);
 
-    List<Map<String,Object>> querySum();
-
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface DlswjInfoMonthService extends MyBaseService<DlswjInfoMonth> {
 
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -27,4 +27,6 @@ public interface DlswjInfoService extends MyBaseService<DlswjInfo> {
     List<Map<String, Object>> getList();
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -30,4 +30,6 @@ public interface FlrbInfoDayService extends MyBaseService<FlrbInfoDay> {
      * @return
      */
     Page<Map<String,Object>> queryPageListByParam(Page<Map<String, Object>> page, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -25,4 +25,6 @@ public interface FlrbInfoHourService extends MyBaseService<FlrbInfoHour> {
     List<FlrbInfoHour> queryPageList(FlrbInfoHourModel model);
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -25,4 +25,6 @@ public interface FlrbInfoMonthService extends MyBaseService<FlrbInfoMonth> {
     List<FlrbInfoMonth> queryPageList(FlrbInfoMonthModel model);
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface FlrbInfoService extends MyBaseService<FlrbInfo> {
     List<Map<String, Object>> getList();
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -30,4 +30,6 @@ public interface JfktgInfoDayService extends MyBaseService<JfktgInfoDay> {
      * @return
      */
     Page<Map<String,Object>> queryPageListByParam(Page<Map<String, Object>> page, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -25,4 +25,6 @@ public interface JfktgInfoHourService extends MyBaseService<JfktgInfoHour> {
     List<JfktgInfoHour> queryPageList(JfktgInfoHourModel model);
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -25,4 +25,6 @@ public interface JfktgInfoMonthService extends MyBaseService<JfktgInfoMonth> {
     List<JfktgInfoMonth> queryPageList(JfktgInfoMonthModel model);
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface JfktgInfoService extends MyBaseService<JfktgInfo> {
     List<Map<String, Object>> getList();
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -30,4 +30,6 @@ public interface JfktpInfoDayService extends MyBaseService<JfktpInfoDay> {
      * @return
      */
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface JfktpInfoHourService extends MyBaseService<JfktpInfoHour> {
 
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface JfktpInfoMonthService extends MyBaseService<JfktpInfoMonth> {
 
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface JfktpInfoService extends MyBaseService<JfktpInfo> {
     List<Map<String, Object>> getList();
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -30,4 +30,5 @@ public interface PfjInfoDayService extends MyBaseService<PfjInfoDay> {
      */
     Page<Map<String,Object>> queryPageListByParam(Page<Map<String, Object>> page,Map<String, Object> params);
 
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface PfjInfoHourService extends MyBaseService<PfjInfoHour> {
 
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -25,4 +25,6 @@ public interface PfjInfoMonthService extends MyBaseService<PfjInfoMonth> {
     List<PfjInfoMonth> queryPageList(PfjInfoMonthModel model);
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -26,4 +26,6 @@ public interface PfjInfoService extends MyBaseService<PfjInfo> {
     List<Map<String, Object>> getList();
 
     Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params);
+
+    List<Map<String, Object>> queryListByParam(Integer type);
 }

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

@@ -32,4 +32,6 @@ public interface SnqxzInfoHourService extends MyBaseService<SnqxzInfoHour> {
     Page<Map<String,Object>> queryPageListByParam(Page<Map<String, Object>> page, Map<String, Object> params);
 
     List<Map<String,Object>> getList(String resourceId, Integer type);
+
+    List<Map<String, Object>> getListFx(Integer region, Integer type);
 }

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

@@ -110,7 +110,7 @@ public class AnalysisServiceImpl implements AnalysisService {
     }
 
     @Override
-    public List<List<String>> getEnergyList(String resourceId, Integer type, String resourceType) {
+    public List<List<String>> getEnergyListTb(String resourceId, Integer type, String resourceType) {
         Page<Map<String, Object>> page = new Page<>();
         Map<String,Object> params = new HashMap<>(16);
         params.put("resourceId",resourceId);
@@ -141,4 +141,33 @@ public class AnalysisServiceImpl implements AnalysisService {
         }
         return listTj;
     }
+
+    @Override
+    public List<List<String>> getEnergyListFx(Integer type, String resourceType) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        if(Constants.ID_PFJ.equals(resourceType)){
+            list = pfjInfoService.queryListByParam(type);
+        }else if(Constants.ID_JFKTP.equals(resourceType)){
+            list = jfktpInfoService.queryListByParam(type);
+        }else if(Constants.ID_JFKTG.equals(resourceType)){
+            list = jfktgInfoService.queryListByParam(type);
+        }else if(Constants.ID_FHJLM.equals(resourceType)){
+
+        }else if(Constants.ID_FLRBJZ.equals(resourceType)){
+            list = flrbInfoService.queryListByParam(type);
+        }else if(Constants.ID_SLJFG.equals(resourceType)){
+
+        }else if(Constants.ID_SLSWJ.equals(resourceType)){
+            list = dlswjInfoService.queryListByParam(type);
+        }
+
+        List<List<String>> listTj = new ArrayList<List<String>>();
+        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"));
+            listTj.add(listDetail);
+        }
+        return listTj;
+    }
 }

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

@@ -32,4 +32,8 @@ public class DlswjInfoDayServiceImpl extends MyBaseServiceImpl<DlswjInfoDayDao,
         return baseMapper.queryPageListByParam(pageTask,params);
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -28,13 +28,13 @@ public class DlswjInfoHourServiceImpl extends MyBaseServiceImpl<DlswjInfoHourDao
     }
 
     @Override
-    public List<Map<String, Object>> querySum() {
-        return baseMapper.querySum();
+    public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params) {
+        return baseMapper.queryPageListByParam(pageTask,params);
     }
 
     @Override
-    public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params) {
-        return baseMapper.queryPageListByParam(pageTask,params);
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
     }
 
 }

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

@@ -32,5 +32,8 @@ public class DlswjInfoMonthServiceImpl extends MyBaseServiceImpl<DlswjInfoMonthD
         return baseMapper.queryPageListByParam(pageTask,params);
     }
 
-
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -13,6 +13,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -56,4 +57,17 @@ public class DlswjInfoServiceImpl extends MyBaseServiceImpl<DlswjInfoDao, DlswjI
         }
         return page;
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        if(Constants.STRING_1.equals(type)){
+            list = dlswjInfoHourService.queryListByParam(type);
+        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+            list = dlswjInfoDayService.queryListByParam(type);
+        }else if(Constants.STRING_4.equals(type)){
+            list = dlswjInfoMonthService.queryListByParam(type);
+        }
+        return list;
+    }
 }

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

@@ -30,4 +30,9 @@ public class FlrbInfoDayServiceImpl extends MyBaseServiceImpl<FlrbInfoDayDao, Fl
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> page, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(page,params);
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -31,5 +31,8 @@ public class FlrbInfoHourServiceImpl extends MyBaseServiceImpl<FlrbInfoHourDao,
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(pageTask,params);
     }
-
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -31,4 +31,9 @@ public class FlrbInfoMonthServiceImpl extends MyBaseServiceImpl<FlrbInfoMonthDao
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(pageTask,params);
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -13,6 +13,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -57,4 +58,17 @@ public class FlrbInfoServiceImpl extends MyBaseServiceImpl<FlrbInfoDao, FlrbInfo
         return page;
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        if(Constants.STRING_1.equals(type)){
+            list = flrbInfoHourService.queryListByParam(type);
+        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+            list = flrbInfoDayService.queryListByParam(type);
+        }else if(Constants.STRING_4.equals(type)){
+            list = flrbInfoMonthService.queryListByParam(type);
+        }
+        return list;
+    }
+
 }

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

 package com.devplatform.admin.modules.eq.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.stereotype.Service;
-
-import com.devplatform.admin.modules.eq.model.JfktgInfoDayModel;
 import com.devplatform.admin.modules.eq.bean.JfktgInfoDay;
 import com.devplatform.admin.modules.eq.dao.JfktgInfoDayDao;
+import com.devplatform.admin.modules.eq.model.JfktgInfoDayModel;
 import com.devplatform.admin.modules.eq.service.JfktgInfoDayService;
 import com.devplatform.common.service.impl.MyBaseServiceImpl;
+import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -34,4 +31,9 @@ public class JfktgInfoDayServiceImpl extends MyBaseServiceImpl<JfktgInfoDayDao,
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> page, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(page,params);
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -32,4 +32,8 @@ public class JfktgInfoHourServiceImpl extends MyBaseServiceImpl<JfktgInfoHourDao
         return baseMapper.queryPageListByParam(pageTask,params);
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -32,4 +32,8 @@ public class JfktgInfoMonthServiceImpl extends MyBaseServiceImpl<JfktgInfoMonthD
         return baseMapper.queryPageListByParam(pageTask,params);
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -13,6 +13,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -57,4 +58,17 @@ public class JfktgInfoServiceImpl extends MyBaseServiceImpl<JfktgInfoDao, JfktgI
         return page;
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        if(Constants.STRING_1.equals(type)){
+            list = jfktgInfoHourService.queryListByParam(type);
+        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+            list = jfktgInfoDayService.queryListByParam(type);
+        }else if(Constants.STRING_4.equals(type)){
+            list = jfktgInfoMonthService.queryListByParam(type);
+        }
+        return list;
+    }
+
 }

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

@@ -31,4 +31,9 @@ public class JfktpInfoDayServiceImpl extends MyBaseServiceImpl<JfktpInfoDayDao,
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> page, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(page,params);
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

 package com.devplatform.admin.modules.eq.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.stereotype.Service;
-
-import com.devplatform.admin.modules.eq.model.JfktpInfoHourModel;
 import com.devplatform.admin.modules.eq.bean.JfktpInfoHour;
 import com.devplatform.admin.modules.eq.dao.JfktpInfoHourDao;
+import com.devplatform.admin.modules.eq.model.JfktpInfoHourModel;
 import com.devplatform.admin.modules.eq.service.JfktpInfoHourService;
 import com.devplatform.common.service.impl.MyBaseServiceImpl;
+import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +30,9 @@ public class JfktpInfoHourServiceImpl extends MyBaseServiceImpl<JfktpInfoHourDao
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(pageTask,params);
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

 package com.devplatform.admin.modules.eq.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.stereotype.Service;
-
-import com.devplatform.admin.modules.eq.model.JfktpInfoMonthModel;
 import com.devplatform.admin.modules.eq.bean.JfktpInfoMonth;
 import com.devplatform.admin.modules.eq.dao.JfktpInfoMonthDao;
+import com.devplatform.admin.modules.eq.model.JfktpInfoMonthModel;
 import com.devplatform.admin.modules.eq.service.JfktpInfoMonthService;
 import com.devplatform.common.service.impl.MyBaseServiceImpl;
+import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +30,9 @@ public class JfktpInfoMonthServiceImpl extends MyBaseServiceImpl<JfktpInfoMonthD
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> pageTask, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(pageTask,params);
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -13,6 +13,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -58,4 +59,17 @@ public class JfktpInfoServiceImpl extends MyBaseServiceImpl<JfktpInfoDao, JfktpI
         return page;
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        if(Constants.STRING_1.equals(type)){
+            list = jfktpInfoHourService.queryListByParam(type);
+        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+            list = jfktpInfoDayService.queryListByParam(type);
+        }else if(Constants.STRING_4.equals(type)){
+            list = jfktpInfoMonthService.queryListByParam(type);
+        }
+        return list;
+    }
+
 }

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

@@ -32,4 +32,9 @@ public class PfjInfoDayServiceImpl extends MyBaseServiceImpl<PfjInfoDayDao, PfjI
         return baseMapper.queryPageListByParam(page,params);
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
+
 }

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

@@ -31,4 +31,9 @@ public class PfjInfoHourServiceImpl extends MyBaseServiceImpl<PfjInfoHourDao, Pf
     public Page<Map<String, Object>> queryPageListByParam(Page<Map<String, Object>> page, Map<String, Object> params) {
         return baseMapper.queryPageListByParam(page,params);
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
 }

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

@@ -32,4 +32,9 @@ public class PfjInfoMonthServiceImpl extends MyBaseServiceImpl<PfjInfoMonthDao,
         return baseMapper.queryPageListByParam(pageTask,params);
     }
 
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        return baseMapper.queryListByParam(type);
+    }
+
 }

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

@@ -13,6 +13,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -56,4 +57,17 @@ public class PfjInfoServiceImpl extends MyBaseServiceImpl<PfjInfoDao, PfjInfo> i
         }
         return page;
     }
+
+    @Override
+    public List<Map<String, Object>> queryListByParam(Integer type) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        if(Constants.STRING_1.equals(type)){
+            list = pfjInfoHourService.queryListByParam(type);
+        }else if(Constants.STRING_2.equals(type) || Constants.STRING_3.equals(type)){
+            list = pfjInfoDayService.queryListByParam(type);
+        }else if(Constants.STRING_4.equals(type)){
+            list = pfjInfoMonthService.queryListByParam(type);
+        }
+        return list;
+    }
 }

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

@@ -35,4 +35,9 @@ public class SnqxzInfoHourServiceImpl extends MyBaseServiceImpl<SnqxzInfoHourDao
     public List<Map<String,Object>> getList(String resourceId, Integer type) {
         return baseMapper.getList(resourceId,type);
     }
+
+    @Override
+    public List<Map<String, Object>> getListFx(Integer region, Integer type) {
+        return baseMapper.getListFx(region,type);
+    }
 }

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

@@ -44,7 +44,7 @@
 	</select>
 
 	<select id="queryPageListByParam" resultType="java.util.Map">
-		select t.* from pfj_info_day t
+		select t.* from dlswj_info_day t
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
 			and t.resource_id = #{params.resourceId}
@@ -62,6 +62,20 @@
 			ORDER BY t.create_time
 		</if>
 	</select>
+
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from dlswj_info_day
+		where 1=1
+		<if test="type == 2">
+			and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1);
+		</if>
+		<if test="type == 3">
+			and DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

@@ -42,10 +42,6 @@
 		${pager.mysqlQueryCondition}
 	</if>
 	</select>
-    <select id="querySum" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5))) from dlswj_info_hour where TO_DAYS(create_time) = TO_DAYS(NOW())
-		group by create_time order by create_time
-	</select>
 
 	<select id="queryPageListByParam" resultType="java.util.Map">
 		select t.* from dlswj_info_hour t
@@ -64,6 +60,17 @@
 		</if>
 	</select>
 
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from dlswj_info_hour
+		where 1=1
+		<if test="params.type == 1">
+			and TO_DAYS(create_time) = TO_DAYS(NOW())
+		</if>
+		group by create_time
+		order by create_time
+	</select>
+
 </mapper>
 
 

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

@@ -44,7 +44,7 @@
 	</select>
 
 	<select id="queryPageListByParam" resultType="java.util.Map">
-		select t.* from pfj_info_month t
+		select t.* from dlswj_info_month t
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
 			and t.resource_id = #{params.resourceId}
@@ -60,6 +60,16 @@
 		</if>
 	</select>
 
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from dlswj_info_month
+		where 1=1
+		<if test="type == 4">
+			and DATE_FORMAT(create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

@@ -63,6 +63,19 @@
 		</if>
 	</select>
 
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from flrb_info_day
+		where 1=1
+		<if test="type == 2">
+			and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1);
+		</if>
+		<if test="type == 3">
+			and DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

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

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

@@ -59,6 +59,17 @@
 			ORDER BY t.create_time
 		</if>
 	</select>
+
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from flrb_info_month
+		where 1=1
+		<if test="type == 4">
+			and DATE_FORMAT(create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

@@ -62,6 +62,20 @@
 			ORDER BY t.create_time
 		</if>
 	</select>
+
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from jfktg_info_day
+		where 1=1
+		<if test="type == 2">
+			and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1);
+		</if>
+		<if test="type == 3">
+			and DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

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

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

@@ -59,6 +59,17 @@
 			ORDER BY t.create_time
 		</if>
 	</select>
+
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from jfktg_info_month
+		where 1=1
+		<if test="type == 4">
+			and DATE_FORMAT(create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

@@ -63,6 +63,19 @@
 		</if>
 	</select>
 
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from jfktp_info_day
+		where 1=1
+		<if test="type == 2">
+			and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1);
+		</if>
+		<if test="type == 3">
+			and DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

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

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

@@ -59,6 +59,17 @@
 			ORDER BY t.create_time
 		</if>
 	</select>
+
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from jfktp_info_month
+		where 1=1
+		<if test="type == 4">
+			and DATE_FORMAT(create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

@@ -63,6 +63,20 @@
 		</if>
 	</select>
 
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from pfj_info_day
+		where 1=1
+		<if test="type == 2">
+			and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1);
+		</if>
+		<if test="type == 3">
+			and DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
+
 </mapper>
 
 

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

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

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

@@ -59,6 +59,17 @@
 			ORDER BY t.create_time
 		</if>
 	</select>
+
+	<select id="queryListByParam" resultType="java.util.Map">
+		select create_time,sum(cast(electric_energy as decimal(10, 5)))
+		from pfj_info_month
+		where 1=1
+		<if test="type == 4">
+			and DATE_FORMAT(create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
+		</if>
+		group by create_time
+		order by create_time
+	</select>
 </mapper>
 
 

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

@@ -9,13 +9,14 @@
 	    <result column="humidity" property="humidity"/>
 	    <result column="carbon_dioxide" property="carbonDioxide"/>
 	    <result column="type" property="type"/>
+	    <result column="region" property="region"/>
 	    <result column="station_id" property="stationId"/>
 	    <result column="create_time" property="createTime"/>
 	</resultMap>
 
 	<!-- snqxz_info_hour table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,temperature,humidity,carbon_dioxide,type,station_id,create_time
+		id,resource_id,temperature,humidity,carbon_dioxide,type,station_id,create_time,region
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -27,6 +28,7 @@
 		<if test="humidity!=null and humidity!=''">and t.humidity = #{humidity}</if>
 		<if test="carbonDioxide!=null and carbonDioxide!=''">and t.carbon_dioxide = #{carbonDioxide}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
+		<if test="region!=null ">and t.region = #{region}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
 	</sql>
@@ -91,7 +93,30 @@
 			and DATE_FORMAT( create_time, '%Y' ) = DATE_FORMAT( CURDATE() , '%Y' )
 		</if>
 		order by create_time
+	</select>
 
+    <select id="getListFx" resultType="java.util.Map">
+		select
+		AVG(cast(temperature as decimal(10, 1))) as temperature,
+		AVG(cast(humidity as decimal(10, 2))) as humidity,
+		AVG(cast(carbon_dioxide as decimal(10, 2))) as carbon_dioxide,
+		create_time
+		from snqxz_info_hour
+		where 1=1
+		<if test="type == 1">
+			and TO_DAYS(create_time) = TO_DAYS(NOW())
+		</if>
+		<if test="type == 2">
+			and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
+		</if>
+		<if test="type == 3">
+			and DATE_FORMAT(create_time,'%Y%m')=DATE_FORMAT(CURDATE(), '%Y%m' )
+		</if>
+		<if test="type == 4">
+			and DATE_FORMAT( create_time, '%Y' ) = DATE_FORMAT( CURDATE() , '%Y' )
+		</if>
+		group by region,create_time
+		order by create_time
 	</select>
 
 </mapper>